From ecf9cf0e34bebbd4000dd327ef90aae521556b5b Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:15:52 +0200 Subject: [PATCH 01/19] update module versioning to standard go format with /v8 suffix --- README.md | 2 +- .../duplicate_service_error_test.go | 2 +- .../duplicate_service_plan_error_test.go | 2 +- actor/actionerror/enrich_api_errors.go | 2 +- actor/actionerror/enrich_api_errors_test.go | 4 +- .../package_not_found_in_app_error_test.go | 2 +- .../actionerror/route_not_found_error_test.go | 2 +- ...security_group_not_bound_to_space_error.go | 2 +- .../service_instance_type_error.go | 2 +- .../service_not_found_error_test.go | 2 +- .../service_offering_name_ambiguity_error.go | 2 +- .../service_plan_not_found_error_test.go | 2 +- .../actionerror/space_not_found_error_test.go | 2 +- actor/actionerror/user_not_found.go | 2 +- .../fake_cloud_controller_client.go | 6 +- .../fake_networking_client.go | 2 +- .../cloud_controller_client.go | 4 +- actor/cfnetworkingaction/policy.go | 12 ++-- actor/cfnetworkingaction/policy_test.go | 14 ++-- actor/pluginaction/checksum.go | 2 +- actor/pluginaction/checksum_test.go | 4 +- actor/pluginaction/config.go | 2 +- actor/pluginaction/install.go | 8 +-- actor/pluginaction/install_test.go | 14 ++-- actor/pluginaction/install_unix_test.go | 6 +- actor/pluginaction/install_windows_test.go | 4 +- actor/pluginaction/list.go | 2 +- actor/pluginaction/list_test.go | 10 +-- actor/pluginaction/plugin_client.go | 2 +- actor/pluginaction/plugin_info.go | 6 +- actor/pluginaction/plugin_info_test.go | 10 +-- actor/pluginaction/plugin_repository.go | 4 +- actor/pluginaction/plugin_repository_test.go | 10 +-- .../pluginactionfakes/fake_command_list.go | 2 +- .../pluginactionfakes/fake_config.go | 4 +- .../pluginactionfakes/fake_plugin_client.go | 4 +- .../pluginactionfakes/fake_plugin_metadata.go | 4 +- .../fake_plugin_uninstaller.go | 2 +- actor/pluginaction/uninstall.go | 2 +- actor/pluginaction/uninstall_test.go | 8 +-- actor/sharedaction/auth_test.go | 4 +- actor/sharedaction/check_target.go | 2 +- actor/sharedaction/check_target_test.go | 6 +- actor/sharedaction/help.go | 4 +- actor/sharedaction/help_test.go | 6 +- actor/sharedaction/is_org_targeted_test.go | 4 +- actor/sharedaction/is_space_targeted_test.go | 4 +- actor/sharedaction/logging_test.go | 4 +- actor/sharedaction/resource.go | 4 +- actor/sharedaction/resource_darwin_test.go | 4 +- actor/sharedaction/resource_linux_test.go | 4 +- actor/sharedaction/resource_test.go | 8 +-- actor/sharedaction/resource_unix_test.go | 6 +- actor/sharedaction/resource_windows_test.go | 6 +- actor/sharedaction/secure_shell_client.go | 2 +- .../sharedactionfakes/fake_config.go | 2 +- .../fake_log_cache_client.go | 2 +- .../fake_secure_shell_client.go | 4 +- actor/sharedaction/ssh.go | 2 +- actor/sharedaction/ssh_test.go | 6 +- actor/v7action/actor.go | 6 +- actor/v7action/application.go | 16 ++--- actor/v7action/application_feature.go | 4 +- actor/v7action/application_feature_test.go | 8 +-- actor/v7action/application_manifest.go | 4 +- actor/v7action/application_manifest_test.go | 14 ++-- actor/v7action/application_summary.go | 10 +-- actor/v7action/application_summary_test.go | 16 ++--- actor/v7action/application_test.go | 18 +++--- actor/v7action/auth.go | 8 +-- actor/v7action/auth_test.go | 10 +-- actor/v7action/build.go | 10 +-- actor/v7action/build_test.go | 14 ++-- actor/v7action/buildpack.go | 10 +-- actor/v7action/buildpack_test.go | 16 ++--- actor/v7action/buildpack_unix_test.go | 4 +- actor/v7action/buildpack_windows_test.go | 4 +- actor/v7action/cloud_controller_client.go | 8 +-- actor/v7action/config.go | 2 +- actor/v7action/curl.go | 2 +- actor/v7action/curl_test.go | 6 +- actor/v7action/deployment.go | 8 +-- actor/v7action/deployment_test.go | 14 ++-- actor/v7action/domain.go | 8 +-- actor/v7action/domain_test.go | 12 ++-- actor/v7action/droplet.go | 8 +-- actor/v7action/droplet_test.go | 14 ++-- actor/v7action/environment_variable.go | 10 +-- actor/v7action/environment_variable_test.go | 14 ++-- actor/v7action/event.go | 4 +- actor/v7action/event_test.go | 8 +-- actor/v7action/feature_flag.go | 6 +- actor/v7action/feature_flag_test.go | 12 ++-- actor/v7action/info.go | 2 +- actor/v7action/info_test.go | 8 +-- actor/v7action/isolation_segment.go | 8 +-- actor/v7action/isolation_segment_test.go | 12 ++-- actor/v7action/job.go | 4 +- actor/v7action/job_test.go | 10 +-- actor/v7action/k8s_auth.go | 10 +-- actor/v7action/k8s_auth_test.go | 12 ++-- actor/v7action/label.go | 6 +- actor/v7action/label_test.go | 14 ++-- actor/v7action/logging.go | 2 +- actor/v7action/logging_test.go | 12 ++-- actor/v7action/marketplace.go | 2 +- actor/v7action/marketplace_test.go | 8 +-- actor/v7action/organization.go | 6 +- actor/v7action/organization_quota.go | 8 +-- actor/v7action/organization_quota_test.go | 12 ++-- actor/v7action/organization_summary.go | 2 +- actor/v7action/organization_summary_test.go | 8 +-- actor/v7action/organization_test.go | 10 +-- actor/v7action/package.go | 10 +-- actor/v7action/package_test.go | 14 ++-- actor/v7action/process.go | 8 +-- actor/v7action/process_health_check.go | 2 +- actor/v7action/process_health_check_test.go | 12 ++-- actor/v7action/process_instance.go | 8 +-- actor/v7action/process_instance_test.go | 12 ++-- actor/v7action/process_summary.go | 4 +- actor/v7action/process_summary_test.go | 6 +- actor/v7action/process_test.go | 16 ++--- actor/v7action/resource_match.go | 6 +- actor/v7action/resource_match_test.go | 12 ++-- actor/v7action/revisions.go | 10 +-- actor/v7action/revisions_test.go | 12 ++-- actor/v7action/role.go | 10 +-- actor/v7action/role_test.go | 14 ++-- actor/v7action/route.go | 20 +++--- actor/v7action/route_binding.go | 12 ++-- actor/v7action/route_binding_test.go | 18 +++--- actor/v7action/route_test.go | 16 ++--- actor/v7action/router_group.go | 6 +- actor/v7action/router_group_test.go | 10 +-- actor/v7action/routing_client.go | 2 +- actor/v7action/security_group.go | 14 ++-- actor/v7action/security_group_test.go | 16 ++--- actor/v7action/service_access.go | 6 +- actor/v7action/service_access_test.go | 12 ++-- actor/v7action/service_app_binding.go | 12 ++-- actor/v7action/service_app_binding_test.go | 16 ++--- actor/v7action/service_broker.go | 8 +-- actor/v7action/service_broker_test.go | 10 +-- actor/v7action/service_instance.go | 14 ++-- actor/v7action/service_instance_details.go | 12 ++-- .../v7action/service_instance_details_test.go | 14 ++-- actor/v7action/service_instance_list.go | 14 ++-- actor/v7action/service_instance_list_test.go | 12 ++-- actor/v7action/service_instance_sharing.go | 8 +-- .../v7action/service_instance_sharing_test.go | 14 ++-- actor/v7action/service_instance_test.go | 16 ++--- actor/v7action/service_key.go | 12 ++-- actor/v7action/service_key_test.go | 18 +++--- actor/v7action/service_offering.go | 8 +-- actor/v7action/service_offering_test.go | 12 ++-- actor/v7action/service_plan.go | 6 +- actor/v7action/service_plan_test.go | 10 +-- actor/v7action/shared_actor.go | 2 +- actor/v7action/space.go | 10 +-- actor/v7action/space_feature.go | 2 +- actor/v7action/space_feature_test.go | 10 +-- actor/v7action/space_manifest.go | 6 +- actor/v7action/space_manifest_test.go | 12 ++-- actor/v7action/space_quota.go | 6 +- actor/v7action/space_quota_test.go | 12 ++-- actor/v7action/space_test.go | 14 ++-- actor/v7action/ssh.go | 4 +- actor/v7action/ssh_actor.go | 2 +- actor/v7action/ssh_test.go | 12 ++-- actor/v7action/stack.go | 6 +- actor/v7action/stack_test.go | 10 +-- actor/v7action/target.go | 4 +- actor/v7action/target_test.go | 8 +-- actor/v7action/task.go | 10 +-- actor/v7action/task_test.go | 14 ++-- actor/v7action/token_test.go | 8 +-- actor/v7action/uaa_client.go | 4 +- actor/v7action/user.go | 8 +-- actor/v7action/user_test.go | 14 ++-- actor/v7action/v7action_suite_test.go | 4 +- .../fake_cloud_controller_client.go | 10 +-- actor/v7action/v7actionfakes/fake_config.go | 4 +- .../v7action/v7actionfakes/fake_downloader.go | 2 +- .../fake_kubernetes_config_getter.go | 2 +- .../v7actionfakes/fake_manifest_parser.go | 2 +- .../v7actionfakes/fake_routing_client.go | 4 +- .../v7actionfakes/fake_shared_actor.go | 4 +- .../v7actionfakes/fake_simple_progress_bar.go | 2 +- actor/v7action/v7actionfakes/fake_sshactor.go | 4 +- .../v7action/v7actionfakes/fake_uaaclient.go | 6 +- .../v7action/v7actionfakes/fake_who_am_ier.go | 6 +- actor/v7action/version_test.go | 4 +- actor/v7pushaction/actor_test.go | 4 +- actor/v7pushaction/actualize_test.go | 10 +-- .../create_bits_package_for_application.go | 10 +-- ...reate_bits_package_for_application_test.go | 16 ++--- .../create_deployment_for_push_plan.go | 4 +- .../create_deployment_for_push_plan_test.go | 10 +-- ...ate_docker_package_for_application_test.go | 10 +-- .../create_droplet_for_application.go | 6 +- .../create_droplet_for_application_test.go | 12 ++-- actor/v7pushaction/create_push_plans.go | 6 +- actor/v7pushaction/create_push_plans_test.go | 10 +-- .../v7pushaction/handle_app_name_override.go | 6 +- .../handle_app_name_override_test.go | 6 +- .../v7pushaction/handle_app_path_override.go | 4 +- .../handle_app_path_override_test.go | 8 +-- .../handle_buildpacks_override.go | 4 +- .../handle_buildpacks_override_test.go | 6 +- .../handle_cnb_credentials_override.go | 4 +- .../handle_cnb_credentials_override_test.go | 4 +- .../handle_default_route_override.go | 2 +- .../handle_default_route_override_test.go | 4 +- actor/v7pushaction/handle_disk_override.go | 4 +- .../v7pushaction/handle_disk_override_test.go | 6 +- .../handle_docker_image_override.go | 4 +- .../handle_docker_image_override_test.go | 6 +- .../handle_docker_username_override.go | 4 +- .../handle_docker_username_override_test.go | 6 +- .../handle_droplet_path_override.go | 4 +- .../handle_droplet_path_override_test.go | 6 +- .../v7pushaction/handle_flag_override_func.go | 2 +- actor/v7pushaction/handle_flag_overrides.go | 2 +- .../handle_flag_overrides_test.go | 4 +- .../handle_health_check_endpoint_override.go | 6 +- ...dle_health_check_endpoint_override_test.go | 6 +- .../handle_health_check_timeout_override.go | 4 +- ...ndle_health_check_timeout_override_test.go | 6 +- .../handle_health_check_type_override.go | 6 +- .../handle_health_check_type_override_test.go | 8 +-- .../v7pushaction/handle_instances_override.go | 4 +- .../handle_instances_override_test.go | 8 +-- .../v7pushaction/handle_lifecycle_override.go | 4 +- .../handle_log_rate_limit_override.go | 4 +- .../handle_log_rate_limit_override_test.go | 6 +- actor/v7pushaction/handle_memory_override.go | 4 +- .../handle_memory_override_test.go | 6 +- .../v7pushaction/handle_no_route_override.go | 4 +- .../handle_no_route_override_test.go | 6 +- .../handle_random_route_override.go | 4 +- .../handle_random_route_override_test.go | 6 +- actor/v7pushaction/handle_stack_override.go | 4 +- .../handle_stack_override_test.go | 6 +- .../handle_start_command_override.go | 4 +- .../handle_start_command_override_test.go | 8 +-- .../v7pushaction/handle_strategy_override.go | 4 +- .../handle_strategy_override_test.go | 8 +-- actor/v7pushaction/handle_task_override.go | 4 +- .../v7pushaction/handle_task_override_test.go | 6 +- actor/v7pushaction/push_plan.go | 10 +-- actor/v7pushaction/resource_match.go | 2 +- actor/v7pushaction/resource_match_test.go | 10 +-- .../v7pushaction/restart_application_test.go | 10 +-- actor/v7pushaction/sequence.go | 2 +- actor/v7pushaction/sequence_test.go | 10 +-- ...et_default_bits_path_for_push_plan_test.go | 4 +- .../set_droplet_for_application_test.go | 8 +-- .../setup_all_resources_for_push_plan.go | 4 +- .../setup_all_resources_for_push_plan_test.go | 8 +-- ...up_deployment_information_for_push_plan.go | 2 +- ...ployment_information_for_push_plan_test.go | 4 +- .../setup_droplet_path_for_push_plan_test.go | 2 +- .../setup_no_start_for_push_plan_test.go | 2 +- .../setup_no_wait_for_push_plan_test.go | 2 +- .../setup_task_app_for_push_plan_test.go | 2 +- actor/v7pushaction/shared_actor.go | 2 +- .../stage_package_for_application_test.go | 8 +-- actor/v7pushaction/stop_application.go | 2 +- actor/v7pushaction/stop_application_test.go | 10 +-- actor/v7pushaction/v7_actor.go | 6 +- actor/v7pushaction/v7pushaction_suite_test.go | 4 +- .../v7pushactionfakes/fake_progress_bar.go | 2 +- .../v7pushactionfakes/fake_shared_actor.go | 4 +- .../v7pushactionfakes/fake_v7actor.go | 8 +-- .../minimum_version_check_test.go | 2 +- .../ccerror/multi_error_test.go | 2 +- ...vice_offering_name_ambiguity_error_test.go | 2 +- .../service_offering_not_found_error_test.go | 2 +- api/cloudcontroller/ccerror/user_not_found.go | 2 +- .../v2_unexpected_response_error_test.go | 2 +- .../ccerror/v3_job_failed_error.go | 2 +- .../v3_unexpected_response_error_test.go | 2 +- api/cloudcontroller/ccv3/application.go | 6 +- .../ccv3/application_feature.go | 4 +- .../ccv3/application_feature_test.go | 6 +- api/cloudcontroller/ccv3/application_test.go | 14 ++-- api/cloudcontroller/ccv3/build.go | 4 +- api/cloudcontroller/ccv3/build_test.go | 8 +-- api/cloudcontroller/ccv3/buildpack.go | 6 +- api/cloudcontroller/ccv3/buildpack_test.go | 20 +++--- api/cloudcontroller/ccv3/ccv3_suite_test.go | 4 +- .../ccv3/ccv3fakes/fake_clock.go | 2 +- .../ccv3/ccv3fakes/fake_connection_wrapper.go | 4 +- .../ccv3/ccv3fakes/fake_requester.go | 4 +- api/cloudcontroller/ccv3/client.go | 2 +- api/cloudcontroller/ccv3/client_test.go | 4 +- .../ccv3/connection_wrapper.go | 2 +- api/cloudcontroller/ccv3/deployment.go | 4 +- api/cloudcontroller/ccv3/deployment_test.go | 8 +-- api/cloudcontroller/ccv3/domain.go | 6 +- api/cloudcontroller/ccv3/domain_test.go | 8 +-- api/cloudcontroller/ccv3/droplet.go | 8 +-- api/cloudcontroller/ccv3/droplet_test.go | 18 +++--- api/cloudcontroller/ccv3/environment.go | 10 +-- api/cloudcontroller/ccv3/environment_test.go | 4 +- .../ccv3/environment_variables.go | 6 +- .../ccv3/environment_variables_test.go | 8 +-- api/cloudcontroller/ccv3/errors.go | 6 +- api/cloudcontroller/ccv3/errors_test.go | 4 +- api/cloudcontroller/ccv3/event.go | 4 +- api/cloudcontroller/ccv3/event_test.go | 4 +- api/cloudcontroller/ccv3/feature_flag.go | 4 +- api/cloudcontroller/ccv3/feature_flag_test.go | 6 +- .../ccv3/included_resources.go | 2 +- api/cloudcontroller/ccv3/info.go | 6 +- api/cloudcontroller/ccv3/info_test.go | 4 +- .../ccv3/internal/routing_test.go | 2 +- api/cloudcontroller/ccv3/isolation_segment.go | 4 +- .../ccv3/isolation_segment_test.go | 6 +- api/cloudcontroller/ccv3/job.go | 4 +- api/cloudcontroller/ccv3/job_test.go | 8 +-- api/cloudcontroller/ccv3/job_url.go | 2 +- api/cloudcontroller/ccv3/job_url_test.go | 4 +- api/cloudcontroller/ccv3/manifest.go | 4 +- api/cloudcontroller/ccv3/manifest_test.go | 14 ++-- api/cloudcontroller/ccv3/metadata.go | 4 +- api/cloudcontroller/ccv3/metadata_test.go | 8 +-- api/cloudcontroller/ccv3/organization.go | 4 +- .../ccv3/organization_quota.go | 4 +- .../ccv3/organization_quota_test.go | 8 +-- api/cloudcontroller/ccv3/organization_test.go | 10 +-- api/cloudcontroller/ccv3/package.go | 10 +-- api/cloudcontroller/ccv3/package_test.go | 14 ++-- api/cloudcontroller/ccv3/paginate.go | 2 +- .../ccv3/paginated_resources_test.go | 8 +-- api/cloudcontroller/ccv3/process.go | 6 +- api/cloudcontroller/ccv3/process_instance.go | 8 +-- .../ccv3/process_instance_test.go | 8 +-- api/cloudcontroller/ccv3/process_test.go | 10 +-- api/cloudcontroller/ccv3/query_test.go | 2 +- api/cloudcontroller/ccv3/relationship.go | 4 +- api/cloudcontroller/ccv3/relationship_list.go | 4 +- .../ccv3/relationship_list_test.go | 6 +- api/cloudcontroller/ccv3/relationship_test.go | 6 +- api/cloudcontroller/ccv3/request.go | 4 +- api/cloudcontroller/ccv3/requester.go | 4 +- api/cloudcontroller/ccv3/requester_test.go | 14 ++-- api/cloudcontroller/ccv3/resource.go | 4 +- api/cloudcontroller/ccv3/resource_test.go | 4 +- api/cloudcontroller/ccv3/revisions.go | 4 +- api/cloudcontroller/ccv3/revisions_test.go | 10 +-- api/cloudcontroller/ccv3/role.go | 4 +- api/cloudcontroller/ccv3/role_test.go | 8 +-- api/cloudcontroller/ccv3/route.go | 4 +- api/cloudcontroller/ccv3/route_binding.go | 4 +- .../ccv3/route_binding_test.go | 10 +-- api/cloudcontroller/ccv3/route_test.go | 8 +-- api/cloudcontroller/ccv3/security_group.go | 4 +- .../ccv3/security_group_test.go | 10 +-- api/cloudcontroller/ccv3/service_broker.go | 4 +- .../ccv3/service_broker_test.go | 8 +-- .../ccv3/service_credential_binding.go | 6 +- .../ccv3/service_credential_binding_test.go | 12 ++-- api/cloudcontroller/ccv3/service_instance.go | 12 ++-- .../ccv3/service_instance_test.go | 12 ++-- api/cloudcontroller/ccv3/service_offering.go | 8 +-- .../ccv3/service_offering_test.go | 10 +-- api/cloudcontroller/ccv3/service_plan.go | 10 +-- api/cloudcontroller/ccv3/service_plan_test.go | 10 +-- .../ccv3/service_plan_visibility.go | 4 +- .../ccv3/service_plan_visibility_test.go | 6 +- api/cloudcontroller/ccv3/sidecar.go | 4 +- api/cloudcontroller/ccv3/sidecar_test.go | 8 +-- api/cloudcontroller/ccv3/space.go | 4 +- api/cloudcontroller/ccv3/space_feature.go | 4 +- .../ccv3/space_feature_test.go | 4 +- api/cloudcontroller/ccv3/space_quota.go | 4 +- api/cloudcontroller/ccv3/space_quota_test.go | 8 +-- api/cloudcontroller/ccv3/space_test.go | 12 ++-- api/cloudcontroller/ccv3/stack.go | 4 +- api/cloudcontroller/ccv3/stack_test.go | 6 +- api/cloudcontroller/ccv3/target_test.go | 6 +- api/cloudcontroller/ccv3/task.go | 4 +- api/cloudcontroller/ccv3/task_test.go | 8 +-- api/cloudcontroller/ccv3/user.go | 4 +- api/cloudcontroller/ccv3/user_test.go | 6 +- .../ccv3/v2_formatted_resource.go | 2 +- .../ccv3/v2_formatted_resource_test.go | 2 +- .../cloud_controller_connection.go | 4 +- .../cloud_controller_connection_test.go | 4 +- .../cloudcontrollerfakes/fake_connection.go | 2 +- api/cloudcontroller/pipebomb.go | 2 +- api/cloudcontroller/uploads/upload.go | 2 +- api/cloudcontroller/wrapper/custom_wrapper.go | 2 +- .../wrapper/kubernetes_authentication.go | 8 +-- .../wrapper/kubernetes_authentication_test.go | 12 ++-- api/cloudcontroller/wrapper/request_logger.go | 2 +- .../wrapper/request_logger_test.go | 8 +-- api/cloudcontroller/wrapper/retry_request.go | 4 +- .../wrapper/retry_request_test.go | 8 +-- .../wrapper/uaa_authentication.go | 4 +- .../wrapper/uaa_authentication_test.go | 14 ++-- .../fake_request_logger_output.go | 2 +- .../wrapper/wrapperfakes/fake_token_cache.go | 2 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 4 +- api/logcache/log_cache_client.go | 40 ++++++------ api/plugin/client_test.go | 4 +- api/plugin/download_plugin_test.go | 6 +- api/plugin/plugin_connection.go | 4 +- api/plugin/plugin_connection_test.go | 6 +- api/plugin/plugin_repository_test.go | 4 +- api/plugin/plugin_suite_test.go | 2 +- api/plugin/pluginfakes/fake_connection.go | 2 +- .../pluginfakes/fake_connection_wrapper.go | 2 +- api/plugin/pluginfakes/fake_proxy_reader.go | 2 +- api/plugin/wrapper/request_logger.go | 2 +- api/plugin/wrapper/request_logger_test.go | 8 +-- api/plugin/wrapper/retry_request.go | 2 +- api/plugin/wrapper/retry_request_test.go | 8 +-- .../fake_request_logger_output.go | 2 +- api/router/client.go | 2 +- api/router/router_connection.go | 6 +- api/router/router_group.go | 4 +- api/router/router_group_test.go | 6 +- api/router/router_suite_test.go | 2 +- api/router/routerfakes/fake_connection.go | 2 +- .../routerfakes/fake_connection_wrapper.go | 2 +- api/router/wrapper/error_wrapper.go | 4 +- api/router/wrapper/error_wrapper_test.go | 8 +-- api/router/wrapper/request_logger.go | 2 +- api/router/wrapper/request_logger_test.go | 8 +-- api/router/wrapper/uaa_authentication.go | 6 +- api/router/wrapper/uaa_authentication_test.go | 14 ++-- .../fake_request_logger_output.go | 2 +- .../wrapper/wrapperfakes/fake_token_cache.go | 2 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 4 +- api/shared/wrap_for_cf_on_k8s.go | 4 +- api/shared/wrap_for_cf_on_k8s_test.go | 10 +-- api/uaa/auth.go | 4 +- api/uaa/auth_test.go | 6 +- api/uaa/client.go | 11 +++- api/uaa/client_test.go | 4 +- api/uaa/error_converter_test.go | 4 +- api/uaa/info_test.go | 2 +- api/uaa/internal/routing_test.go | 2 +- .../noaabridgefakes/fake_token_cache.go | 2 +- .../noaabridgefakes/fake_uaaclient.go | 4 +- api/uaa/noaabridge/token_refresher.go | 2 +- api/uaa/noaabridge/token_refresher_test.go | 6 +- api/uaa/prompts_test.go | 6 +- api/uaa/refresh_token.go | 4 +- api/uaa/refresh_token_test.go | 6 +- api/uaa/request.go | 2 +- api/uaa/resources.go | 2 +- api/uaa/resources_test.go | 4 +- api/uaa/ssh.go | 2 +- api/uaa/ssh_test.go | 4 +- api/uaa/uaa_connection.go | 2 +- api/uaa/uaa_connection_test.go | 2 +- api/uaa/uaa_suite_test.go | 4 +- api/uaa/uaafakes/fake_config.go | 2 +- api/uaa/uaafakes/fake_connection.go | 2 +- api/uaa/uaafakes/fake_connection_wrapper.go | 2 +- api/uaa/user.go | 4 +- api/uaa/user_test.go | 6 +- api/uaa/version_test.go | 6 +- api/uaa/wrapper/request_logger.go | 2 +- api/uaa/wrapper/request_logger_test.go | 8 +-- api/uaa/wrapper/retry_request.go | 2 +- api/uaa/wrapper/retry_request_test.go | 6 +- api/uaa/wrapper/uaa_authentication.go | 2 +- api/uaa/wrapper/uaa_authentication_test.go | 10 +-- .../fake_request_logger_output.go | 2 +- .../wrapper/wrapperfakes/fake_token_cache.go | 2 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 4 +- cf/actors/actors_suite_test.go | 4 +- cf/actors/actorsfakes/fake_push_actor.go | 6 +- cf/actors/actorsfakes/fake_route_actor.go | 4 +- cf/actors/actorsfakes/fake_service_actor.go | 4 +- .../actorsfakes/fake_service_plan_actor.go | 2 +- cf/actors/brokerbuilder/broker_builder.go | 6 +- .../brokerbuilder/broker_builder_test.go | 8 +-- .../brokerbuilderfakes/fake_broker_builder.go | 4 +- cf/actors/planbuilder/plan_builder.go | 6 +- cf/actors/planbuilder/plan_builder_test.go | 8 +-- .../planbuilderfakes/fake_plan_builder.go | 4 +- .../plugininstaller/plugin_downloader.go | 6 +- cf/actors/plugininstaller/plugin_installer.go | 10 +-- .../plugin_installer_with_repo.go | 10 +-- .../plugin_installer_without_repo.go | 4 +- .../fake_plugin_installer.go | 2 +- cf/actors/pluginrepo/plugin_repo.go | 4 +- .../pluginrepo/plugin_repo_suite_test.go | 4 +- cf/actors/pluginrepo/plugin_repo_test.go | 6 +- .../pluginrepofakes/fake_plugin_repo.go | 6 +- cf/actors/push.go | 10 +-- cf/actors/push_test.go | 14 ++-- cf/actors/routes.go | 14 ++-- cf/actors/routes_test.go | 12 ++-- cf/actors/servicebuilder/service_builder.go | 6 +- .../servicebuilder/service_builder_test.go | 8 +-- .../fake_service_builder.go | 4 +- cf/actors/services.go | 8 +-- cf/actors/services_plans.go | 10 +-- cf/actors/services_plans_test.go | 16 ++--- cf/actors/services_test.go | 12 ++-- cf/actors/userprint/plugin.go | 4 +- cf/actors/userprint/ui.go | 6 +- .../userprintfakes/fake_user_printer.go | 2 +- cf/api/api_suite_test.go | 4 +- .../apifakes/fake_app_summary_repository.go | 4 +- .../fake_buildpack_bits_repository.go | 4 +- cf/api/apifakes/fake_buildpack_repository.go | 4 +- cf/api/apifakes/fake_client_repository.go | 2 +- cf/api/apifakes/fake_curl_repository.go | 2 +- cf/api/apifakes/fake_domain_repository.go | 4 +- cf/api/apifakes/fake_route_repository.go | 4 +- .../fake_route_service_binding_repository.go | 2 +- cf/api/apifakes/fake_routing_apirepository.go | 4 +- .../fake_service_auth_token_repository.go | 4 +- .../fake_service_binding_repository.go | 4 +- .../fake_service_broker_repository.go | 4 +- .../apifakes/fake_service_key_repository.go | 4 +- .../apifakes/fake_service_plan_repository.go | 4 +- ...fake_service_plan_visibility_repository.go | 4 +- cf/api/apifakes/fake_service_repository.go | 6 +- .../fake_service_summary_repository.go | 4 +- ...er_provided_service_instance_repository.go | 4 +- cf/api/apifakes/fake_user_repository.go | 4 +- cf/api/apifakes/old_fake_app_summary_repo.go | 4 +- cf/api/apifakes/old_fake_auth_token_repo.go | 2 +- .../apifakes/old_fake_buildpack_bits_repo.go | 4 +- cf/api/apifakes/old_fake_buildpack_repo.go | 4 +- cf/api/apifakes/old_fake_cc_request.go | 2 +- cf/api/apifakes/old_fake_password_repo.go | 2 +- cf/api/apifakes/old_fake_service_key_repo.go | 2 +- cf/api/apifakes/old_fake_service_plan_repo.go | 4 +- .../apifakes/old_fake_service_summary_repo.go | 2 +- cf/api/app_summary.go | 6 +- cf/api/app_summary_test.go | 16 ++--- cf/api/appevents/app_events.go | 8 +-- cf/api/appevents/app_events_suite_test.go | 4 +- cf/api/appevents/app_events_test.go | 16 ++--- .../fake_app_events_repository.go | 4 +- .../appeventsfakes/fake_repository.go | 4 +- cf/api/appfiles/app_files.go | 4 +- cf/api/appfiles/app_files_suite_test.go | 4 +- cf/api/appfiles/app_files_test.go | 16 ++--- .../fake_app_files_repository.go | 2 +- .../appfiles/appfilesfakes/fake_repository.go | 2 +- cf/api/appinstances/app_instances.go | 6 +- .../appinstances/app_instances_suite_test.go | 4 +- cf/api/appinstances/app_instances_test.go | 20 +++--- .../fake_app_instances_repository.go | 4 +- .../appinstancesfakes/fake_repository.go | 4 +- cf/api/applicationbits/application_bits.go | 8 +-- .../application_bits_suite_test.go | 4 +- .../applicationbits/application_bits_test.go | 20 +++--- .../fake_application_bits_repository.go | 4 +- .../applicationbitsfakes/fake_repository.go | 4 +- cf/api/applications/applications.go | 12 ++-- .../applications/applications_suite_test.go | 4 +- cf/api/applications/applications_test.go | 26 ++++---- .../applicationsfakes/fake_repository.go | 4 +- cf/api/authentication/authentication.go | 10 +-- .../authentication_suite_test.go | 4 +- cf/api/authentication/authentication_test.go | 18 +++--- .../authenticationfakes/fake_repository.go | 4 +- .../fake_token_refresher.go | 2 +- cf/api/buildpack_bits.go | 14 ++-- cf/api/buildpack_bits_test.go | 22 +++---- cf/api/buildpacks.go | 12 ++-- cf/api/buildpacks_test.go | 22 +++---- cf/api/clients.go | 10 +-- cf/api/clients_test.go | 14 ++-- .../copy_application_source.go | 4 +- .../copy_application_source_suite_test.go | 4 +- .../copy_application_source_test.go | 18 +++--- .../fake_repository.go | 2 +- cf/api/curl.go | 8 +-- cf/api/curl_test.go | 20 +++--- cf/api/domains.go | 12 ++-- cf/api/domains_test.go | 24 +++---- cf/api/endpoints.go | 4 +- cf/api/endpoints_test.go | 16 ++--- .../environment_variable_groups.go | 6 +- .../environment_variable_groups_suite_test.go | 4 +- .../environment_variable_groups_test.go | 14 ++-- .../fake_repository.go | 4 +- cf/api/featureflags/feature_flags.go | 6 +- .../featureflags/feature_flags_suite_test.go | 4 +- cf/api/featureflags/feature_flags_test.go | 20 +++--- .../fake_feature_flag_repository.go | 4 +- cf/api/logs/log_cache_message.go | 2 +- cf/api/logs/log_cache_message_test.go | 6 +- cf/api/logs/log_cache_repository.go | 4 +- cf/api/logs/log_cache_repository_test.go | 6 +- cf/api/logs/logsfakes/fake_color_logger.go | 2 +- cf/api/logs/logsfakes/fake_loggable.go | 2 +- cf/api/logs/logsfakes/fake_repository.go | 2 +- cf/api/organizations/organizations.go | 10 +-- .../organizations/organizations_suite_test.go | 4 +- cf/api/organizations/organizations_test.go | 22 +++---- .../fake_organization_repository.go | 4 +- cf/api/password/password.go | 8 +-- cf/api/password/password_suite_test.go | 4 +- cf/api/password/password_test.go | 16 ++--- .../password/passwordfakes/fake_repository.go | 2 +- cf/api/quotas/quotas.go | 10 +-- cf/api/quotas/quotas_suite_test.go | 4 +- cf/api/quotas/quotas_test.go | 14 ++-- .../quotasfakes/fake_quota_repository.go | 4 +- cf/api/repository_locator.go | 56 ++++++++-------- cf/api/resources/applications.go | 2 +- cf/api/resources/applications_test.go | 4 +- cf/api/resources/auth_tokens.go | 2 +- cf/api/resources/buildpacks.go | 2 +- cf/api/resources/domains.go | 2 +- cf/api/resources/events.go | 6 +- cf/api/resources/events_test.go | 2 +- cf/api/resources/feature_flags.go | 2 +- cf/api/resources/organizations.go | 2 +- cf/api/resources/quotas.go | 2 +- cf/api/resources/quotas_test.go | 4 +- cf/api/resources/resources_test.go | 4 +- cf/api/resources/routes.go | 2 +- cf/api/resources/security_groups.go | 2 +- cf/api/resources/service_bindings.go | 2 +- cf/api/resources/service_brokers.go | 2 +- cf/api/resources/service_instances.go | 2 +- cf/api/resources/service_instances_test.go | 2 +- cf/api/resources/service_keys.go | 2 +- cf/api/resources/service_keys_test.go | 2 +- cf/api/resources/service_offerings.go | 2 +- cf/api/resources/service_plan_visibility.go | 2 +- cf/api/resources/service_plans.go | 2 +- cf/api/resources/space_quotas.go | 2 +- cf/api/resources/spaces.go | 2 +- cf/api/resources/stacks.go | 2 +- cf/api/resources/users.go | 2 +- cf/api/route_service_binding_repository.go | 4 +- .../route_service_binding_repository_test.go | 14 ++-- cf/api/routes.go | 10 +-- cf/api/routes_test.go | 24 +++---- cf/api/routing_api.go | 6 +- cf/api/routing_api_test.go | 16 ++--- cf/api/securitygroups/defaults/defaults.go | 8 +-- .../defaults/running/running.go | 8 +-- .../defaults/running/running_suite_test.go | 4 +- .../defaults/running/running_test.go | 22 +++---- .../runningfakes/fake_security_groups_repo.go | 4 +- .../defaults/staging/staging.go | 8 +-- .../defaults/staging/staging_suite_test.go | 4 +- .../defaults/staging/staging_test.go | 22 +++---- .../stagingfakes/fake_security_groups_repo.go | 4 +- cf/api/securitygroups/security_groups.go | 10 +-- .../security_groups_suite_test.go | 4 +- cf/api/securitygroups/security_groups_test.go | 22 +++---- .../fake_security_group_repo.go | 4 +- cf/api/securitygroups/spaces/space_binder.go | 6 +- .../spaces/space_binder_test.go | 18 +++--- .../fake_security_group_space_binder.go | 2 +- cf/api/securitygroups/spaces/suite_test.go | 4 +- cf/api/service_auth_tokens.go | 10 +-- cf/api/service_auth_tokens_test.go | 24 +++---- cf/api/service_bindings.go | 8 +-- cf/api/service_bindings_test.go | 18 +++--- cf/api/service_brokers.go | 10 +-- cf/api/service_brokers_test.go | 22 +++---- cf/api/service_keys.go | 10 +-- cf/api/service_keys_test.go | 18 +++--- cf/api/service_plan.go | 8 +-- cf/api/service_plan_test.go | 20 +++--- cf/api/service_plan_visibility.go | 8 +-- cf/api/service_plan_visibility_test.go | 20 +++--- cf/api/service_summary.go | 6 +- cf/api/service_summary_test.go | 16 ++--- cf/api/services.go | 10 +-- cf/api/services_test.go | 26 ++++---- cf/api/spacequotas/space_quotas.go | 10 +-- cf/api/spacequotas/space_quotas_suite_test.go | 4 +- cf/api/spacequotas/space_quotas_test.go | 16 ++--- .../fake_space_quota_repository.go | 4 +- cf/api/spaces/spaces.go | 10 +-- cf/api/spaces/spaces_suite_test.go | 4 +- cf/api/spaces/spaces_test.go | 22 +++---- .../spacesfakes/fake_space_repository.go | 4 +- cf/api/stacks/stacks.go | 12 ++-- cf/api/stacks/stacks_suite_test.go | 4 +- cf/api/stacks/stacks_test.go | 16 ++--- .../stacksfakes/fake_stack_repository.go | 4 +- cf/api/user_provided_service_instances.go | 6 +- .../user_provided_service_instances_test.go | 20 +++--- cf/api/users.go | 16 ++--- cf/api/users_test.go | 18 +++--- cf/appfiles/app_files.go | 2 +- cf/appfiles/app_files_suite_test.go | 4 +- cf/appfiles/app_files_test.go | 4 +- cf/appfiles/appfilesfakes/fake_app_files.go | 4 +- cf/appfiles/appfilesfakes/fake_cf_ignore.go | 2 +- cf/appfiles/appfilesfakes/fake_zipper.go | 2 +- cf/appfiles/cf_ignore.go | 2 +- cf/appfiles/cf_ignore_test.go | 2 +- cf/appfiles/zipper.go | 2 +- cf/appfiles/zipper_test.go | 2 +- cf/cmd/cmd.go | 42 ++++++------ cf/commandregistry/command.go | 6 +- .../commandregistryfakes/fake_command.go | 6 +- .../fake_random_word_generator.go | 2 +- cf/commandregistry/dependency.go | 38 +++++------ cf/commandregistry/dependency_test.go | 4 +- .../fakecommand/fake_command1.go | 6 +- .../fakecommand/fake_command2.go | 6 +- .../fake_command_max_length_name.go | 6 +- cf/commandregistry/registry.go | 12 ++-- cf/commandregistry/registry_test.go | 8 +-- cf/commands/api.go | 16 ++--- cf/commands/api_test.go | 22 +++---- cf/commands/application/app.go | 30 ++++----- cf/commands/application/app_test.go | 42 ++++++------ .../application/application_suite_test.go | 4 +- .../applicationfakes/fake_app_displayer.go | 8 +-- .../applicationfakes/fake_displayer.go | 4 +- .../applicationfakes/fake_restarter.go | 10 +-- .../applicationfakes/fake_staging_watcher.go | 4 +- .../applicationfakes/fake_starter.go | 10 +-- .../applicationfakes/fake_stopper.go | 10 +-- cf/commands/application/apps.go | 24 +++---- cf/commands/application/apps_test.go | 28 ++++---- cf/commands/application/copy_source.go | 26 ++++---- cf/commands/application/copy_source_test.go | 42 ++++++------ cf/commands/application/delete.go | 18 +++--- cf/commands/application/delete_test.go | 24 +++---- cf/commands/application/disable_ssh.go | 16 ++--- cf/commands/application/disable_ssh_test.go | 22 +++---- cf/commands/application/enable_ssh.go | 16 ++--- cf/commands/application/enable_ssh_test.go | 22 +++---- cf/commands/application/env.go | 18 +++--- cf/commands/application/env_test.go | 24 +++---- cf/commands/application/events.go | 14 ++-- cf/commands/application/events_test.go | 26 ++++---- cf/commands/application/files.go | 14 ++-- cf/commands/application/files_test.go | 26 ++++---- cf/commands/application/get_health_check.go | 14 ++-- .../application/get_health_check_test.go | 22 +++---- cf/commands/application/logs.go | 18 +++--- cf/commands/application/logs_test.go | 26 ++++---- cf/commands/application/push.go | 44 ++++++------- cf/commands/application/push_test.go | 58 ++++++++--------- cf/commands/application/rename.go | 16 ++--- cf/commands/application/rename_test.go | 20 +++--- cf/commands/application/restage.go | 20 +++--- cf/commands/application/restage_test.go | 28 ++++---- cf/commands/application/restart.go | 18 +++--- .../application/restart_app_instance.go | 14 ++-- .../application/restart_app_instance_test.go | 22 +++---- cf/commands/application/restart_test.go | 30 ++++----- cf/commands/application/scale.go | 20 +++--- cf/commands/application/scale_test.go | 28 ++++---- cf/commands/application/set_env.go | 18 +++--- cf/commands/application/set_env_test.go | 22 +++---- cf/commands/application/set_health_check.go | 18 +++--- .../application/set_health_check_test.go | 22 +++---- cf/commands/application/ssh.go | 26 ++++---- cf/commands/application/ssh_enabled.go | 12 ++-- cf/commands/application/ssh_enabled_test.go | 20 +++--- cf/commands/application/ssh_test.go | 40 ++++++------ cf/commands/application/start.go | 24 +++---- cf/commands/application/start_test.go | 48 +++++++------- cf/commands/application/stop.go | 18 +++--- cf/commands/application/stop_test.go | 24 +++---- cf/commands/application/unset_env.go | 18 +++--- cf/commands/application/unset_env_test.go | 22 +++---- cf/commands/auth.go | 16 ++--- cf/commands/auth_test.go | 22 +++---- cf/commands/buildpack/buildpack_suite_test.go | 4 +- cf/commands/buildpack/buildpacks.go | 14 ++-- cf/commands/buildpack/buildpacks_test.go | 22 +++---- cf/commands/buildpack/create_buildpack.go | 20 +++--- .../buildpack/create_buildpack_test.go | 20 +++--- cf/commands/buildpack/delete_buildpack.go | 18 +++--- .../buildpack/delete_buildpack_test.go | 18 +++--- cf/commands/buildpack/rename_buildpack.go | 12 ++-- .../buildpack/rename_buildpack_test.go | 18 +++--- cf/commands/buildpack/update_buildpack.go | 12 ++-- .../buildpack/update_buildpack_test.go | 18 +++--- cf/commands/commands_suite_test.go | 6 +- .../commandsfakes/fake_sshcode_getter.go | 8 +-- cf/commands/config.go | 12 ++-- cf/commands/config_test.go | 16 ++--- cf/commands/create_app_manifest.go | 26 ++++---- cf/commands/create_app_manifest_test.go | 28 ++++---- cf/commands/curl.go | 22 +++---- cf/commands/curl_test.go | 22 +++---- cf/commands/domain/create_domain.go | 14 ++-- cf/commands/domain/create_domain_test.go | 20 +++--- cf/commands/domain/create_shared_domain.go | 16 ++--- .../domain/create_shared_domain_test.go | 22 +++---- cf/commands/domain/delete_domain.go | 16 ++--- cf/commands/domain/delete_domain_test.go | 22 +++---- cf/commands/domain/delete_shared_domain.go | 16 ++--- .../domain/delete_shared_domain_test.go | 24 +++---- cf/commands/domain/domain_suite_test.go | 4 +- cf/commands/domain/domains.go | 16 ++--- cf/commands/domain/domains_test.go | 24 +++---- .../environmentvariablegroup_suite_test.go | 4 +- .../running_environment_variable_group.go | 16 ++--- ...running_environment_variable_group_test.go | 24 +++---- .../set_running_environment_variable_group.go | 16 ++--- ...running_environment_variable_group_test.go | 20 +++--- .../set_staging_environment_variable_group.go | 16 ++--- ...staging_environment_variable_group_test.go | 20 +++--- .../staging_environment_variable_group.go | 16 ++--- ...staging_environment_variable_group_test.go | 24 +++---- .../featureflag/disable_feature_flag.go | 14 ++-- .../featureflag/disable_feature_flag_test.go | 18 +++--- .../featureflag/enable_feature_flag.go | 14 ++-- .../featureflag/enable_feature_flag_test.go | 18 +++--- cf/commands/featureflag/feature_flag.go | 14 ++-- cf/commands/featureflag/feature_flag_test.go | 20 +++--- cf/commands/featureflag/feature_flags.go | 14 ++-- cf/commands/featureflag/feature_flags_test.go | 24 +++---- .../featureflag/featureflag_suite_test.go | 4 +- cf/commands/help.go | 20 +++--- cf/commands/help_test.go | 20 +++--- cf/commands/login.go | 28 ++++---- cf/commands/login_test.go | 24 +++---- cf/commands/logout.go | 12 ++-- cf/commands/logout_test.go | 12 ++-- cf/commands/oauth_token.go | 16 ++--- cf/commands/oauth_token_test.go | 22 +++---- cf/commands/organization/create_org.go | 28 ++++---- cf/commands/organization/create_org_test.go | 38 +++++------ cf/commands/organization/delete_org.go | 18 +++--- cf/commands/organization/delete_org_test.go | 26 ++++---- cf/commands/organization/org.go | 20 +++--- cf/commands/organization/org_test.go | 24 +++---- .../organization/organization_suite_test.go | 4 +- cf/commands/organization/orgs.go | 18 +++--- cf/commands/organization/orgs_test.go | 28 ++++---- cf/commands/organization/rename_org.go | 14 ++-- cf/commands/organization/rename_org_test.go | 20 +++--- cf/commands/organization/set_quota.go | 14 ++-- cf/commands/organization/set_quota_test.go | 22 +++---- .../organization/share_private_domain.go | 16 ++--- .../organization/unshare_private_domain.go | 16 ++--- cf/commands/passwd.go | 16 ++--- cf/commands/passwd_test.go | 20 +++--- cf/commands/plugin/install_plugin.go | 38 +++++------ cf/commands/plugin/install_plugin_test.go | 38 +++++------ cf/commands/plugin/plugin_suite_test.go | 8 +-- cf/commands/plugin/plugins.go | 16 ++--- cf/commands/plugin/plugins_test.go | 20 +++--- cf/commands/plugin/uninstall_plugin.go | 20 +++--- cf/commands/plugin/uninstall_plugin_test.go | 16 ++--- cf/commands/pluginrepo/add_plugin_repo.go | 14 ++-- .../pluginrepo/add_plugin_repo_test.go | 18 +++--- cf/commands/pluginrepo/list_plugin_repos.go | 12 ++-- .../pluginrepo/list_plugin_repos_test.go | 16 ++--- .../pluginrepo/plugin_repo_suite_test.go | 6 +- cf/commands/pluginrepo/remove_plugin_repo.go | 12 ++-- .../pluginrepo/remove_plugin_repo_test.go | 16 ++--- cf/commands/pluginrepo/repo_plugins.go | 16 ++--- cf/commands/pluginrepo/repo_plugins_test.go | 20 +++--- cf/commands/quota/create_quota.go | 22 +++---- cf/commands/quota/create_quota_test.go | 26 ++++---- cf/commands/quota/delete_quota.go | 16 ++--- cf/commands/quota/delete_quota_test.go | 24 +++---- cf/commands/quota/quota.go | 20 +++--- cf/commands/quota/quota_suite_test.go | 4 +- cf/commands/quota/quota_test.go | 22 +++---- cf/commands/quota/quotas.go | 20 +++--- cf/commands/quota/quotas_test.go | 30 ++++----- cf/commands/quota/update_quota.go | 16 ++--- cf/commands/quota/update_quota_test.go | 28 ++++---- cf/commands/route/check_route.go | 14 ++-- cf/commands/route/check_route_test.go | 22 +++---- cf/commands/route/create_route.go | 16 ++--- cf/commands/route/create_route_test.go | 20 +++--- cf/commands/route/delete_orphaned_routes.go | 16 ++--- .../route/delete_orphaned_routes_test.go | 26 ++++---- cf/commands/route/delete_route.go | 18 +++--- cf/commands/route/delete_route_test.go | 24 +++---- cf/commands/route/map_route.go | 16 ++--- cf/commands/route/map_route_test.go | 24 +++---- cf/commands/route/route_suite_test.go | 4 +- cf/commands/route/routefakes/fake_creator.go | 4 +- .../routefakes/old_fake_route_creator.go | 10 +-- cf/commands/route/routes.go | 18 +++--- cf/commands/route/routes_test.go | 26 ++++---- cf/commands/route/unmap_route.go | 14 ++-- cf/commands/route/unmap_route_test.go | 22 +++---- cf/commands/routergroups/router_groups.go | 16 ++--- .../routergroups/router_groups_test.go | 24 +++---- .../routergroups/routergroups_suite_test.go | 4 +- .../bind_running_security_group.go | 16 ++--- .../bind_running_security_group_test.go | 24 +++---- .../securitygroup/bind_security_group.go | 22 +++---- .../securitygroup/bind_security_group_test.go | 30 ++++----- .../bind_staging_security_group.go | 16 ++--- .../bind_staging_security_group_test.go | 24 +++---- .../securitygroup/create_security_group.go | 20 +++--- .../create_security_group_test.go | 22 +++---- .../securitygroup/delete_security_group.go | 16 ++--- .../delete_security_group_test.go | 24 +++---- .../securitygroup/running_security_groups.go | 14 ++-- .../running_security_groups_test.go | 22 +++---- cf/commands/securitygroup/security_group.go | 16 ++--- .../securitygroup/security_group_test.go | 24 +++---- cf/commands/securitygroup/security_groups.go | 18 +++--- .../securitygroup/security_groups_test.go | 28 ++++---- .../securitygroup/staging_security_groups.go | 14 ++-- .../staging_security_groups_test.go | 22 +++---- cf/commands/securitygroup/suite_test.go | 4 +- .../unbind_running_security_group.go | 18 +++--- .../unbind_running_security_group_test.go | 26 ++++---- .../securitygroup/unbind_security_group.go | 20 +++--- .../unbind_security_group_test.go | 28 ++++---- .../unbind_staging_security_group.go | 18 +++--- .../unbind_staging_security_group_test.go | 26 ++++---- .../securitygroup/update_security_group.go | 16 ++--- .../update_security_group_test.go | 24 +++---- cf/commands/service/bind_route_service.go | 18 +++--- .../service/bind_route_service_test.go | 28 ++++---- cf/commands/service/bind_service.go | 22 +++---- cf/commands/service/bind_service_test.go | 22 +++---- cf/commands/service/create_service.go | 24 +++---- cf/commands/service/create_service_test.go | 24 +++---- .../service/create_user_provided_service.go | 20 +++--- .../create_user_provided_service_test.go | 20 +++--- cf/commands/service/delete_service.go | 16 ++--- cf/commands/service/delete_service_test.go | 22 +++---- cf/commands/service/marketplace.go | 18 +++--- cf/commands/service/marketplace_test.go | 24 +++---- .../service/migrate_service_instances.go | 22 +++---- .../service/migrate_service_instances_test.go | 22 +++---- cf/commands/service/purge_service_instance.go | 14 ++-- .../service/purge_service_instance_test.go | 24 +++---- cf/commands/service/purge_service_offering.go | 18 +++--- .../service/purge_service_offering_test.go | 28 ++++---- cf/commands/service/rename_service.go | 18 +++--- cf/commands/service/rename_service_test.go | 22 +++---- cf/commands/service/service.go | 16 ++--- cf/commands/service/service_suite_test.go | 4 +- cf/commands/service/service_test.go | 22 +++---- .../service/servicefakes/fake_app_binder.go | 8 +-- .../service/servicefakes/fake_binder.go | 4 +- .../fake_route_service_unbinder.go | 4 +- cf/commands/service/services.go | 18 +++--- cf/commands/service/services_test.go | 34 +++++----- cf/commands/service/unbind_route_service.go | 18 +++--- .../service/unbind_route_service_test.go | 28 ++++---- cf/commands/service/unbind_service.go | 14 ++-- cf/commands/service/unbind_service_test.go | 20 +++--- cf/commands/service/update_service.go | 22 +++---- cf/commands/service/update_service_test.go | 22 +++---- .../service/update_user_provided_service.go | 22 +++---- .../update_user_provided_service_test.go | 22 +++---- .../serviceaccess/disable_service_access.go | 16 ++--- .../disable_service_access_test.go | 20 +++--- .../serviceaccess/enable_service_access.go | 18 +++--- .../enable_service_access_test.go | 22 +++---- cf/commands/serviceaccess/service_access.go | 18 +++--- .../serviceaccess/service_access_test.go | 28 ++++---- .../serviceaccess/serviceaccess_suite_test.go | 4 +- .../create_service_auth_token.go | 18 +++--- .../create_service_auth_token_test.go | 20 +++--- .../delete_service_auth_token.go | 20 +++--- .../delete_service_auth_token_test.go | 22 +++---- .../serviceauthtoken/service_auth_tokens.go | 16 ++--- .../service_auth_tokens_test.go | 26 ++++---- .../serviceauthtoken_suite_test.go | 4 +- .../update_service_auth_token.go | 16 ++--- .../update_service_auth_token_test.go | 20 +++--- .../servicebroker/create_service_broker.go | 14 ++-- .../create_service_broker_test.go | 24 +++---- .../servicebroker/delete_service_broker.go | 16 ++--- .../delete_service_broker_test.go | 22 +++---- .../servicebroker/rename_service_broker.go | 14 ++-- .../rename_service_broker_test.go | 20 +++--- cf/commands/servicebroker/service_brokers.go | 16 ++--- .../servicebroker/service_brokers_test.go | 24 +++---- .../servicebroker/servicebroker_suite_test.go | 4 +- .../servicebroker/update_service_broker.go | 14 ++-- .../update_service_broker_test.go | 20 +++--- cf/commands/servicekey/create_service_key.go | 20 +++--- .../servicekey/create_service_key_test.go | 26 ++++---- cf/commands/servicekey/delete_service_key.go | 18 +++--- .../servicekey/delete_service_key_test.go | 26 ++++---- cf/commands/servicekey/service_key.go | 18 +++--- cf/commands/servicekey/service_key_test.go | 26 ++++---- cf/commands/servicekey/service_keys.go | 16 ++--- cf/commands/servicekey/service_keys_test.go | 20 +++--- .../servicekey/servicekey_suite_test.go | 4 +- cf/commands/space/allow_space_ssh.go | 14 ++-- cf/commands/space/allow_space_ssh_test.go | 22 +++---- cf/commands/space/create_space.go | 30 ++++----- cf/commands/space/create_space_test.go | 38 +++++------ cf/commands/space/delete_space.go | 20 +++--- cf/commands/space/delete_space_test.go | 22 +++---- cf/commands/space/disallow_space_ssh.go | 14 ++-- cf/commands/space/disallow_space_ssh_test.go | 22 +++---- cf/commands/space/rename_space.go | 14 ++-- cf/commands/space/rename_space_test.go | 20 +++--- cf/commands/space/space.go | 22 +++---- cf/commands/space/space_ssh_allowed.go | 14 ++-- cf/commands/space/space_ssh_allowed_test.go | 14 ++-- cf/commands/space/space_suite_test.go | 4 +- cf/commands/space/space_test.go | 24 +++---- cf/commands/space/spaces.go | 18 +++--- cf/commands/space/spaces_test.go | 30 ++++----- cf/commands/spacequota/create_space_quota.go | 22 +++---- .../spacequota/create_space_quota_test.go | 30 ++++----- cf/commands/spacequota/delete_space_quota.go | 18 +++--- .../spacequota/delete_space_quota_test.go | 26 ++++---- cf/commands/spacequota/set_space_quota.go | 16 ++--- .../spacequota/set_space_quota_test.go | 26 ++++---- cf/commands/spacequota/space_quota.go | 16 ++--- cf/commands/spacequota/space_quota_test.go | 24 +++---- cf/commands/spacequota/space_quotas.go | 16 ++--- cf/commands/spacequota/space_quotas_test.go | 28 ++++---- .../spacequota/spacequota_suite_test.go | 4 +- cf/commands/spacequota/unset_space_quota.go | 16 ++--- .../spacequota/unset_space_quota_test.go | 24 +++---- cf/commands/spacequota/update_space_quota.go | 16 ++--- .../spacequota/update_space_quota_test.go | 22 +++---- cf/commands/ssh_code.go | 16 ++--- cf/commands/ssh_code_test.go | 26 ++++---- cf/commands/stack.go | 14 ++-- cf/commands/stack_test.go | 20 +++--- cf/commands/stacks.go | 14 ++-- cf/commands/stacks_test.go | 24 +++---- cf/commands/target.go | 20 +++--- cf/commands/target_test.go | 28 ++++---- cf/commands/user/create_user.go | 18 +++--- cf/commands/user/create_user_test.go | 20 +++--- cf/commands/user/delete_user.go | 16 ++--- cf/commands/user/delete_user_test.go | 22 +++---- cf/commands/user/org_users.go | 20 +++--- cf/commands/user/org_users_test.go | 24 +++---- cf/commands/user/set_org_role.go | 18 +++--- cf/commands/user/set_org_role_test.go | 28 ++++---- cf/commands/user/set_space_role.go | 22 +++---- cf/commands/user/set_space_role_test.go | 30 ++++----- cf/commands/user/space_users.go | 22 +++---- cf/commands/user/space_users_test.go | 26 ++++---- cf/commands/user/unset_org_role.go | 18 +++--- cf/commands/user/unset_org_role_test.go | 28 ++++---- cf/commands/user/unset_space_role.go | 20 +++--- cf/commands/user/unset_space_role_test.go | 30 ++++----- cf/commands/user/user_suite_test.go | 4 +- .../user/userfakes/fake_org_role_setter.go | 10 +-- .../user/userfakes/fake_space_role_setter.go | 10 +-- cf/commands/version.go | 14 ++-- cf/commands/version_test.go | 10 +-- cf/commandsloader/commands_loader.go | 42 ++++++------ cf/commandsloader/commands_loader_test.go | 4 +- .../config_disk_persistor_test.go | 2 +- .../configurationfakes/fake_data_interface.go | 2 +- .../configurationfakes/fake_persistor.go | 2 +- .../coreconfig/access_token_test.go | 2 +- .../coreconfig/api_config_refresher.go | 2 +- .../coreconfig/api_config_refresher_test.go | 8 +-- cf/configuration/coreconfig/config_data.go | 4 +- .../coreconfig/config_data_test.go | 4 +- .../coreconfig/config_repository.go | 8 +-- .../coreconfig/config_repository_test.go | 10 +-- .../fake_endpoint_repository.go | 2 +- .../coreconfigfakes/fake_read_writer.go | 4 +- .../coreconfigfakes/fake_repository.go | 4 +- .../pluginconfig/plugin_config.go | 4 +- .../pluginconfig/plugin_config_test.go | 10 +-- cf/configuration/pluginconfig/plugin_data.go | 2 +- .../fake_plugin_configuration.go | 2 +- cf/errors/access_denied_error.go | 2 +- cf/errors/ambiguous_model_error.go | 2 +- cf/errors/curl_http_error.go | 2 +- cf/errors/empty_dir_error.go | 2 +- cf/errors/errorsfakes/fake_httperror.go | 2 +- cf/errors/gateway_error.go | 2 +- cf/errors/http_error.go | 2 +- cf/errors/invalid_ssl_cert_error.go | 2 +- cf/errors/invalid_token_error.go | 2 +- cf/errors/model_already_exists_error.go | 2 +- cf/errors/model_not_found_error.go | 2 +- cf/errors/not_authorized_error.go | 2 +- cf/errors/service_association_error.go | 2 +- cf/errors/unbindable_service_error.go | 2 +- cf/flagcontext/flag_content_helper_test.go | 2 +- cf/flags/flag_constructor_test.go | 2 +- cf/flags/flags_test.go | 2 +- cf/flags/flags_usage_test.go | 2 +- cf/formatters/bools.go | 2 +- cf/formatters/bools_test.go | 2 +- cf/formatters/bytes.go | 2 +- cf/formatters/bytes_test.go | 2 +- cf/formatters/formatters_suite_test.go | 4 +- cf/formatters/memoryLimit_test.go | 2 +- cf/help/help.go | 16 ++--- cf/help/help_suite_test.go | 2 +- cf/help/help_test.go | 8 +-- cf/help/template.go | 2 +- cf/i18n/i18n.go | 2 +- cf/i18n/locale.go | 4 +- cf/i18n/locale_test.go | 2 +- cf/manifest/generate_manifest.go | 4 +- cf/manifest/generate_manifest_test.go | 2 +- cf/manifest/manifest.go | 10 +-- cf/manifest/manifest_disk_repository.go | 6 +- cf/manifest/manifest_disk_repository_test.go | 2 +- cf/manifest/manifest_suite_test.go | 4 +- cf/manifest/manifest_test.go | 6 +- cf/manifest/manifestfakes/fake_app.go | 4 +- cf/manifest/manifestfakes/fake_repository.go | 2 +- cf/models/application_test.go | 2 +- cf/models/domain_test.go | 2 +- cf/models/route_summary_test.go | 2 +- cf/models/route_test.go | 2 +- cf/models/service_instance_test.go | 2 +- cf/models/service_plan_test.go | 2 +- cf/models/space_quota.go | 6 +- cf/net/cloud_controller_gateway.go | 8 +-- cf/net/cloud_controller_gateway_test.go | 12 ++-- cf/net/gateway.go | 14 ++-- cf/net/gateway_test.go | 20 +++--- cf/net/http_client.go | 4 +- cf/net/http_client_test.go | 6 +- cf/net/net_suite_test.go | 4 +- cf/net/netfakes/fake_httpclient_interface.go | 2 +- .../netfakes/fake_request_dumper_interface.go | 2 +- cf/net/netfakes/fake_warning_producer.go | 2 +- cf/net/progress_reader.go | 8 +-- cf/net/progress_reader_test.go | 4 +- cf/net/request_dumper.go | 8 +-- cf/net/request_dumper_test.go | 4 +- cf/net/routing_api_gateway.go | 8 +-- cf/net/routing_api_gateway_test.go | 12 ++-- cf/net/uaa_gateway.go | 8 +-- cf/net/uaa_gateway_test.go | 12 ++-- cf/net/warnings_collector.go | 2 +- cf/net/warnings_collector_test.go | 6 +- cf/requirements/api_endpoint.go | 8 +-- cf/requirements/api_endpoint_test.go | 6 +- cf/requirements/application.go | 4 +- cf/requirements/application_test.go | 8 +-- cf/requirements/buildpack.go | 4 +- cf/requirements/buildpack_test.go | 6 +- .../config_refreshing_requirement.go | 2 +- .../config_refreshing_requirement_test.go | 4 +- cf/requirements/dea_application.go | 8 +-- cf/requirements/dea_application_test.go | 6 +- cf/requirements/domain.go | 6 +- cf/requirements/domain_test.go | 12 ++-- cf/requirements/factory.go | 4 +- cf/requirements/login.go | 4 +- cf/requirements/login_test.go | 6 +- cf/requirements/max_api_version.go | 4 +- cf/requirements/max_api_version_test.go | 6 +- cf/requirements/min_api_version.go | 4 +- cf/requirements/min_api_version_test.go | 6 +- cf/requirements/number_arguments.go | 2 +- cf/requirements/number_arguments_test.go | 2 +- cf/requirements/organization.go | 4 +- cf/requirements/organization_test.go | 6 +- cf/requirements/requirements_suite_test.go | 4 +- cf/requirements/requirements_test.go | 4 +- .../fake_application_requirement.go | 4 +- .../fake_buildpack_requirement.go | 4 +- .../fake_config_refresher.go | 4 +- .../fake_deaapplication_requirement.go | 4 +- .../fake_domain_requirement.go | 4 +- .../requirementsfakes/fake_factory.go | 2 +- .../fake_organization_requirement.go | 4 +- .../requirementsfakes/fake_requirement.go | 2 +- .../fake_service_instance_requirement.go | 4 +- .../fake_space_requirement.go | 4 +- .../fake_targeted_org_requirement.go | 4 +- .../fake_user_requirement.go | 4 +- cf/requirements/service_instance.go | 4 +- cf/requirements/service_instance_test.go | 8 +-- cf/requirements/space.go | 4 +- cf/requirements/space_test.go | 6 +- cf/requirements/targeted_organization.go | 10 +-- cf/requirements/targeted_organization_test.go | 8 +-- cf/requirements/targeted_space.go | 8 +-- cf/requirements/targeted_space_test.go | 8 +-- cf/requirements/unsupported_legacy_flag.go | 2 +- .../unsupported_legacy_flag_test.go | 2 +- cf/requirements/usage_requirement.go | 2 +- cf/requirements/usage_requirement_test.go | 2 +- cf/requirements/user.go | 4 +- cf/requirements/user_test.go | 6 +- cf/ssh/options/ssh_options.go | 2 +- cf/ssh/options/ssh_options_test.go | 4 +- cf/ssh/ssh.go | 8 +-- cf/ssh/ssh_test.go | 12 ++-- cf/ssh/sshfakes/fake_listener_factory.go | 2 +- cf/ssh/sshfakes/fake_secure_client.go | 2 +- cf/ssh/sshfakes/fake_secure_dialer.go | 2 +- cf/ssh/sshfakes/fake_secure_session.go | 2 +- cf/ssh/sshfakes/fake_secure_shell.go | 4 +- cf/ssh/terminal/helper_test.go | 2 +- .../terminalfakes/fake_terminal_helper.go | 2 +- cf/terminal/color_test.go | 2 +- cf/terminal/table_test.go | 4 +- cf/terminal/tee_printer_test.go | 4 +- cf/terminal/terminal_suite_test.go | 4 +- cf/terminal/terminalfakes/fake_ui.go | 4 +- cf/terminal/ui.go | 8 +-- cf/terminal/ui_test.go | 24 +++---- cf/terminal/ui_unix.go | 2 +- cf/trace/combined_printer_test.go | 4 +- cf/trace/logger_provider.go | 2 +- cf/trace/logger_provider_test.go | 2 +- cf/trace/trace.go | 2 +- cf/trace/trace_suite_test.go | 4 +- cf/trace/trace_test.go | 2 +- cf/trace/tracefakes/fake_printer.go | 2 +- cf/uihelpers/tags_parser_test.go | 2 +- cf/uihelpers/ui.go | 6 +- cf/util/downloader/file_download.go | 4 +- cf/util/downloader/file_download_test.go | 2 +- cf/util/json/json_parser_test.go | 2 +- cf/util/spellcheck/spellcheck_test.go | 2 +- cf/util/testhelpers/commands/requirements.go | 2 +- cf/util/testhelpers/commands/runner.go | 8 +-- .../testhelpers/configuration/access_token.go | 2 +- .../configuration/fake_config_persistance.go | 4 +- .../testhelpers/configuration/test_config.go | 4 +- cf/util/testhelpers/io/io_test.go | 2 +- .../matchers/all_requests_called_matcher.go | 2 +- .../matchers/be_in_display_order.go | 8 +-- .../matchers/be_in_display_order_test.go | 2 +- .../matchers/contain_element_times_test.go | 2 +- .../contain_elements_in_order_test.go | 2 +- .../matchers/contain_substrings.go | 2 +- .../testhelpers/matchers/have_succeeded.go | 2 +- .../testhelpers/matchers/have_type_of_test.go | 2 +- .../matchers/match_func_name_test.go | 2 +- .../testhelpers/matchers/match_path_test.go | 2 +- .../matchers/passed_requirements.go | 2 +- .../rpcserver/rpcserverfakes/fake_handlers.go | 6 +- cf/util/testhelpers/rpcserver/server.go | 4 +- cf/util/testhelpers/terminal/ui.go | 4 +- cf/util/utilfakes/fake_sha1checksum.go | 2 +- command/api_version_warning.go | 4 +- command/api_version_warning_test.go | 10 +-- command/commandfakes/fake_config.go | 4 +- command/commandfakes/fake_shared_actor.go | 2 +- command/commandfakes/fake_ui.go | 4 +- command/common/command_list_v7.go | 4 +- command/common/command_list_v7_test.go | 2 +- command/common/commonfakes/fake_help_actor.go | 4 +- .../commonfakes/fake_install_plugin_actor.go | 8 +-- command/common/help_command.go | 12 ++-- command/common/install_plugin_command.go | 20 +++--- command/common/install_plugin_command_test.go | 18 +++--- .../install_plugin_from_repo_command_test.go | 24 +++---- .../common/internal/help_all_display_test.go | 4 +- command/common/internal/help_display.go | 6 +- command/common/version_command.go | 2 +- command/common/version_command_test.go | 6 +- command/config.go | 2 +- command/flag/app_type_test.go | 2 +- command/flag/binding_name_test.go | 2 +- command/flag/buildpack.go | 2 +- command/flag/buildpack_test.go | 2 +- command/flag/bytes_with_unlimited.go | 2 +- command/flag/bytes_with_unlimited_test.go | 2 +- command/flag/color_test.go | 2 +- command/flag/command.go | 2 +- command/flag/command_test.go | 2 +- command/flag/credentials_or_json.go | 2 +- command/flag/credentials_or_json_test.go | 2 +- command/flag/deployment_strategy.go | 2 +- command/flag/deployment_strategy_test.go | 4 +- command/flag/docker_test.go | 2 +- command/flag/droplet_test.go | 2 +- command/flag/environment_variable_test.go | 2 +- command/flag/health_check_type.go | 2 +- command/flag/health_check_type_test.go | 4 +- ...h_check_type_with_deprecated_value_test.go | 2 +- command/flag/instances.go | 2 +- command/flag/instances_test.go | 4 +- command/flag/integer_limit.go | 2 +- command/flag/integer_limit_test.go | 2 +- command/flag/locale.go | 2 +- command/flag/locale_test.go | 2 +- command/flag/megabytes.go | 2 +- command/flag/megabytes_test.go | 2 +- command/flag/megabytes_with_unlimited.go | 2 +- command/flag/megabytes_with_unlimited_test.go | 2 +- command/flag/network_port_test.go | 2 +- command/flag/network_protocol_test.go | 2 +- command/flag/optional_string.go | 2 +- command/flag/optional_string_test.go | 2 +- command/flag/org_role_test.go | 2 +- command/flag/path.go | 4 +- command/flag/path_test.go | 4 +- command/flag/port.go | 2 +- command/flag/port_test.go | 4 +- command/flag/positive_integer_test.go | 2 +- command/flag/revision.go | 2 +- command/flag/revision_test.go | 4 +- command/flag/route_path_test.go | 2 +- command/flag/security_group_lifecycle_test.go | 2 +- command/flag/space_role_test.go | 2 +- command/flag/ssh_port_forwarding_test.go | 2 +- command/flag/tags.go | 2 +- command/flag/tags_test.go | 2 +- command/flag/timeout.go | 2 +- command/flag/timeout_test.go | 2 +- command/flag/trimmed_string_test.go | 2 +- command/minimum_version_check.go | 2 +- command/minimum_version_check_test.go | 6 +- command/plugin/add_plugin_repo_command.go | 10 +-- .../plugin/add_plugin_repo_command_test.go | 10 +-- command/plugin/list_plugin_repos_command.go | 4 +- .../pluginfakes/fake_add_plugin_repo_actor.go | 2 +- .../plugin/pluginfakes/fake_plugins_actor.go | 4 +- .../fake_uninstall_plugin_actor.go | 4 +- command/plugin/plugins_command.go | 12 ++-- command/plugin/plugins_command_test.go | 16 ++--- command/plugin/remove_plugin_repo_command.go | 6 +- command/plugin/repo_plugins_command.go | 4 +- command/plugin/shared/new_client.go | 6 +- command/plugin/shared/rpc.go | 8 +-- command/plugin/uninstall_plugin_command.go | 12 ++-- .../plugin/uninstall_plugin_command_test.go | 14 ++-- .../convert_to_translatable_error.go | 14 ++-- .../convert_to_translatable_error_test.go | 16 ++--- ...nimum_cf_api_version_not_met_error_test.go | 2 +- .../minimum_cli_version_not_met_error_test.go | 2 +- ...imum_uaa_api_version_not_met_error_test.go | 2 +- .../missing_credential_error_test.go | 2 +- ...rvice_instance_not_shareable_error_test.go | 2 +- .../service_plan_not_found_error_test.go | 2 +- .../staging_timeout_error_test.go | 2 +- .../tip_decorator_error_test.go | 4 +- .../fake_translatable_error.go | 2 +- command/translatableerror/translate_test.go | 2 +- .../unauthorized_error_test.go | 2 +- command/ui.go | 2 +- command/v7/actor.go | 18 +++--- command/v7/add_network_policy_command.go | 14 ++-- command/v7/add_network_policy_command_test.go | 22 +++---- command/v7/allow_space_ssh_command.go | 4 +- command/v7/allow_space_ssh_command_test.go | 14 ++-- command/v7/api_command.go | 8 +-- command/v7/api_command_test.go | 12 ++-- command/v7/app_command.go | 4 +- command/v7/app_command_test.go | 22 +++---- command/v7/apply_manifest_command.go | 14 ++-- command/v7/apply_manifest_command_test.go | 24 +++---- command/v7/apps_command.go | 4 +- command/v7/apps_command_test.go | 20 +++--- command/v7/auth_command.go | 12 ++-- command/v7/auth_command_test.go | 20 +++--- command/v7/base_command.go | 12 ++-- command/v7/bind_route_service_command.go | 10 +-- command/v7/bind_route_service_command_test.go | 16 ++--- .../v7/bind_running_security_group_command.go | 4 +- ...ind_running_security_group_command_test.go | 16 ++--- command/v7/bind_security_group_command.go | 8 +-- .../v7/bind_security_group_command_test.go | 22 +++---- command/v7/bind_service_command.go | 10 +-- command/v7/bind_service_command_test.go | 16 ++--- .../v7/bind_staging_security_group_command.go | 4 +- ...ind_staging_security_group_command_test.go | 16 ++--- command/v7/buildpacks_command.go | 4 +- command/v7/buildpacks_command_test.go | 22 +++---- command/v7/cancel_deployment_command.go | 2 +- command/v7/cancel_deployment_command_test.go | 18 +++--- command/v7/check_route_command.go | 2 +- command/v7/check_route_command_test.go | 18 +++--- command/v7/config_command.go | 6 +- command/v7/config_command_test.go | 14 ++-- command/v7/continue_deployment_command.go | 4 +- .../v7/continue_deployment_command_test.go | 18 +++--- command/v7/copy_source_command.go | 16 ++--- command/v7/copy_source_command_test.go | 24 +++---- command/v7/create_app_command.go | 8 +-- command/v7/create_app_command_test.go | 22 +++---- command/v7/create_app_manifest_command.go | 6 +- .../v7/create_app_manifest_command_test.go | 16 ++--- command/v7/create_buildpack_command.go | 16 ++--- command/v7/create_buildpack_command_test.go | 26 ++++---- .../v7/create_isolation_segment_command.go | 6 +- .../create_isolation_segment_command_test.go | 16 ++--- command/v7/create_org_command.go | 4 +- command/v7/create_org_command_test.go | 22 +++---- command/v7/create_org_quota_command.go | 8 +-- command/v7/create_org_quota_command_test.go | 18 +++--- command/v7/create_package_command.go | 12 ++-- command/v7/create_package_command_test.go | 22 +++---- command/v7/create_private_domain_command.go | 4 +- .../v7/create_private_domain_command_test.go | 16 ++--- command/v7/create_route_command.go | 4 +- command/v7/create_route_command_test.go | 18 +++--- command/v7/create_security_group_command.go | 6 +- .../v7/create_security_group_command_test.go | 18 +++--- command/v7/create_service_broker_command.go | 10 +-- .../v7/create_service_broker_command_test.go | 16 ++--- command/v7/create_service_command.go | 10 +-- command/v7/create_service_command_test.go | 18 +++--- command/v7/create_service_key_command.go | 10 +-- command/v7/create_service_key_command_test.go | 16 ++--- command/v7/create_shared_domain_command.go | 2 +- .../v7/create_shared_domain_command_test.go | 16 ++--- command/v7/create_space_command.go | 10 +-- command/v7/create_space_command_test.go | 20 +++--- command/v7/create_space_quota_command.go | 6 +- command/v7/create_space_quota_command_test.go | 20 +++--- command/v7/create_user_command.go | 8 +-- command/v7/create_user_command_test.go | 20 +++--- .../create_user_provided_service_command.go | 8 +-- ...eate_user_provided_service_command_test.go | 20 +++--- command/v7/curl_command.go | 4 +- command/v7/curl_command_test.go | 10 +-- command/v7/delete_buildpack_command.go | 4 +- command/v7/delete_buildpack_command_test.go | 12 ++-- command/v7/delete_command.go | 4 +- command/v7/delete_command_test.go | 16 ++--- .../v7/delete_isolation_segment_command.go | 4 +- .../delete_isolation_segment_command_test.go | 14 ++-- command/v7/delete_org_command.go | 4 +- command/v7/delete_org_command_test.go | 14 ++-- command/v7/delete_org_quota_command.go | 4 +- command/v7/delete_org_quota_command_test.go | 16 ++--- .../v7/delete_orphaned_routes_command_test.go | 14 ++-- command/v7/delete_private_domain_command.go | 4 +- .../v7/delete_private_domain_command_test.go | 20 +++--- command/v7/delete_route_command.go | 4 +- command/v7/delete_route_command_test.go | 16 ++--- command/v7/delete_security_group_command.go | 4 +- .../v7/delete_security_group_command_test.go | 14 ++-- command/v7/delete_service_broker_command.go | 4 +- .../v7/delete_service_broker_command_test.go | 16 ++--- command/v7/delete_service_command.go | 6 +- command/v7/delete_service_command_test.go | 14 ++-- command/v7/delete_service_key_command.go | 8 +-- command/v7/delete_service_key_command_test.go | 18 +++--- command/v7/delete_shared_domain_command.go | 6 +- .../v7/delete_shared_domain_command_test.go | 22 +++---- command/v7/delete_space_command.go | 4 +- command/v7/delete_space_command_test.go | 14 ++-- command/v7/delete_space_quota_command.go | 4 +- command/v7/delete_space_quota_command_test.go | 16 ++--- command/v7/delete_user_command.go | 4 +- command/v7/delete_user_command_test.go | 18 +++--- command/v7/disable_feature_flag_command.go | 2 +- .../v7/disable_feature_flag_command_test.go | 14 ++-- command/v7/disable_org_isolation_command.go | 2 +- .../v7/disable_org_isolation_command_test.go | 14 ++-- command/v7/disable_service_access_command.go | 2 +- .../v7/disable_service_access_command_test.go | 12 ++-- command/v7/disable_ssh_command.go | 2 +- command/v7/disable_ssh_command_test.go | 16 ++--- command/v7/disallow_space_ssh_command.go | 4 +- command/v7/disallow_space_ssh_command_test.go | 14 ++-- command/v7/docker_password_getter_test.go | 6 +- command/v7/domains_command.go | 6 +- command/v7/domains_command_test.go | 20 +++--- command/v7/download_droplet_command.go | 8 +-- command/v7/download_droplet_command_test.go | 16 ++--- command/v7/droplets_command.go | 4 +- command/v7/droplets_command_test.go | 22 +++---- command/v7/enable_feature_flag_command.go | 2 +- .../v7/enable_feature_flag_command_test.go | 14 ++-- command/v7/enable_org_isolation_command.go | 2 +- .../v7/enable_org_isolation_command_test.go | 14 ++-- command/v7/enable_service_access_command.go | 6 +- .../v7/enable_service_access_command_test.go | 12 ++-- command/v7/enable_ssh_command.go | 2 +- command/v7/enable_ssh_command_test.go | 18 +++--- command/v7/env_command.go | 2 +- command/v7/env_command_test.go | 14 ++-- command/v7/events_command.go | 4 +- command/v7/events_command_test.go | 20 +++--- command/v7/feature_flag_command.go | 8 +-- command/v7/feature_flag_command_test.go | 16 ++--- command/v7/feature_flags_command.go | 6 +- command/v7/feature_flags_command_test.go | 16 ++--- command/v7/get_health_check_command.go | 6 +- command/v7/get_health_check_command_test.go | 18 +++--- command/v7/isolation_segments_command.go | 2 +- command/v7/isolation_segments_command_test.go | 14 ++-- command/v7/label_updater.go | 10 +-- command/v7/label_updater_test.go | 16 ++--- command/v7/labels_command.go | 10 +-- command/v7/labels_command_test.go | 18 +++--- command/v7/login_command.go | 22 +++---- command/v7/login_command_test.go | 26 ++++---- command/v7/logout_command.go | 8 +-- command/v7/logout_command_test.go | 12 ++-- command/v7/logs_command.go | 12 ++-- command/v7/logs_command_test.go | 20 +++--- command/v7/map_route_command.go | 4 +- command/v7/map_route_command_test.go | 18 +++--- command/v7/marketplace_command.go | 8 +-- command/v7/marketplace_command_test.go | 16 ++--- command/v7/move_route_command.go | 4 +- command/v7/move_route_command_test.go | 20 +++--- command/v7/network_policies_command.go | 8 +-- command/v7/network_policies_command_test.go | 14 ++-- command/v7/oauth_token_command.go | 2 +- command/v7/oauth_token_command_test.go | 10 +-- command/v7/org_command.go | 2 +- command/v7/org_command_test.go | 16 ++--- command/v7/org_quota_command.go | 6 +- command/v7/org_quota_command_test.go | 18 +++--- command/v7/org_quotas_command.go | 4 +- command/v7/org_quotas_command_test.go | 18 +++--- command/v7/org_users_command.go | 8 +-- command/v7/org_users_command_test.go | 18 +++--- command/v7/orgs_command.go | 4 +- command/v7/orgs_command_test.go | 16 ++--- command/v7/packages_command.go | 4 +- command/v7/packages_command_test.go | 22 +++---- command/v7/passwd_command.go | 2 +- command/v7/passwd_command_test.go | 12 ++-- command/v7/purge_service_instance_command.go | 4 +- .../v7/purge_service_instance_command_test.go | 14 ++-- command/v7/purge_service_offering_command.go | 4 +- .../v7/purge_service_offering_command_test.go | 12 ++-- command/v7/push_command.go | 32 +++++----- command/v7/push_command_test.go | 34 +++++----- command/v7/remove_network_policy_command.go | 12 ++-- .../v7/remove_network_policy_command_test.go | 22 +++---- command/v7/rename_command.go | 2 +- command/v7/rename_command_test.go | 14 ++-- command/v7/rename_org_command.go | 2 +- command/v7/rename_org_command_test.go | 14 ++-- command/v7/rename_service_broker_command.go | 4 +- .../v7/rename_service_broker_command_test.go | 16 ++--- command/v7/rename_service_command.go | 6 +- command/v7/rename_service_command_test.go | 16 ++--- command/v7/rename_space_command.go | 2 +- command/v7/rename_space_command_test.go | 16 ++--- ...t_org_default_isolation_segment_command.go | 2 +- ..._default_isolation_segment_command_test.go | 16 ++--- .../reset_space_isolation_segment_command.go | 2 +- ...et_space_isolation_segment_command_test.go | 16 ++--- command/v7/restage_command.go | 16 ++--- command/v7/restage_command_test.go | 24 +++---- command/v7/restart_app_instance_command.go | 2 +- .../v7/restart_app_instance_command_test.go | 16 ++--- command/v7/restart_command.go | 14 ++-- command/v7/restart_command_test.go | 24 +++---- command/v7/revision_command.go | 4 +- command/v7/revision_command_test.go | 8 +-- command/v7/revisions_command.go | 8 +-- command/v7/revisions_command_test.go | 20 +++--- command/v7/rollback_command.go | 14 ++-- command/v7/rollback_command_test.go | 26 ++++---- command/v7/route_command.go | 4 +- command/v7/route_command_test.go | 20 +++--- command/v7/router_groups_command.go | 4 +- command/v7/router_groups_command_test.go | 14 ++-- command/v7/routes_command.go | 6 +- command/v7/routes_command_test.go | 16 ++--- command/v7/run_task_command.go | 4 +- command/v7/run_task_command_test.go | 22 +++---- ...ning_environment_variable_group_command.go | 4 +- ...environment_variable_group_command_test.go | 14 ++-- command/v7/running_security_groups_command.go | 2 +- .../running_security_groups_command_test.go | 16 ++--- command/v7/scale_command.go | 14 ++-- command/v7/scale_command_test.go | 24 +++---- command/v7/security_group_command.go | 4 +- command/v7/security_group_command_test.go | 18 +++--- command/v7/security_groups_command.go | 2 +- command/v7/security_groups_command_test.go | 18 +++--- command/v7/service_access_command.go | 6 +- command/v7/service_access_command_test.go | 14 ++-- command/v7/service_brokers_command.go | 4 +- command/v7/service_brokers_command_test.go | 16 ++--- command/v7/service_command.go | 8 +-- command/v7/service_command_test.go | 16 ++--- command/v7/service_key_command.go | 2 +- command/v7/service_key_command_test.go | 14 ++-- command/v7/service_keys_command.go | 6 +- command/v7/service_keys_command_test.go | 14 ++-- command/v7/services_command.go | 8 +-- command/v7/services_command_test.go | 18 +++--- command/v7/set_droplet_command.go | 2 +- command/v7/set_droplet_command_test.go | 16 ++--- command/v7/set_env_command.go | 4 +- command/v7/set_env_command_test.go | 14 ++-- command/v7/set_health_check_command.go | 2 +- command/v7/set_health_check_command_test.go | 20 +++--- command/v7/set_label_command.go | 6 +- command/v7/set_label_command_test.go | 8 +-- ...t_org_default_isolation_segment_command.go | 2 +- ..._default_isolation_segment_command_test.go | 18 +++--- command/v7/set_org_quota_command.go | 2 +- command/v7/set_org_quota_command_test.go | 20 +++--- command/v7/set_org_role_command.go | 10 +-- command/v7/set_org_role_command_test.go | 26 ++++---- ...ning_environment_variable_group_command.go | 8 +-- ...environment_variable_group_command_test.go | 20 +++--- .../v7/set_space_isolation_segment_command.go | 2 +- ...et_space_isolation_segment_command_test.go | 16 ++--- command/v7/set_space_quota_command.go | 2 +- command/v7/set_space_quota_command_test.go | 22 +++---- command/v7/set_space_role_command.go | 10 +-- command/v7/set_space_role_command_test.go | 26 ++++---- ...ging_environment_variable_group_command.go | 8 +-- ...environment_variable_group_command_test.go | 20 +++--- command/v7/share_private_domain_command.go | 2 +- .../v7/share_private_domain_command_test.go | 18 +++--- command/v7/share_route_command.go | 4 +- command/v7/share_route_command_test.go | 20 +++--- command/v7/share_service_command.go | 8 +-- command/v7/share_service_command_test.go | 18 +++--- command/v7/shared/app_stager.go | 12 ++-- command/v7/shared/app_stager_test.go | 22 +++---- command/v7/shared/app_summary_displayer.go | 10 +-- .../v7/shared/app_summary_displayer_test.go | 14 ++-- command/v7/shared/manifest_diff_displayer.go | 4 +- .../v7/shared/manifest_diff_displayer_test.go | 6 +- command/v7/shared/new_clients.go | 18 +++--- command/v7/shared/new_clients_test.go | 8 +-- command/v7/shared/new_networking_client.go | 8 +-- .../v7/shared/new_networking_client_test.go | 8 +-- command/v7/shared/package_displayer.go | 2 +- command/v7/shared/quota_displayer.go | 8 +-- command/v7/shared/result_waiter.go | 4 +- .../v7/shared/sharedfakes/fake_app_stager.go | 6 +- command/v7/shared/v3_poll_stage.go | 10 +-- command/v7/shared/v3_poll_stage_test.go | 12 ++-- command/v7/shared/version_checker.go | 2 +- command/v7/shared/version_checker_test.go | 2 +- command/v7/space_command.go | 8 +-- command/v7/space_command_test.go | 20 +++--- command/v7/space_quota_command.go | 6 +- command/v7/space_quota_command_test.go | 18 +++--- command/v7/space_quotas_command.go | 4 +- command/v7/space_quotas_command_test.go | 18 +++--- command/v7/space_ssh_allowed_command.go | 4 +- command/v7/space_ssh_allowed_command_test.go | 16 ++--- command/v7/space_users_command.go | 8 +-- command/v7/space_users_command_test.go | 18 +++--- command/v7/spaces_command.go | 4 +- command/v7/spaces_command_test.go | 16 ++--- command/v7/ssh_code_command_test.go | 12 ++-- command/v7/ssh_command.go | 10 +-- command/v7/ssh_command_test.go | 20 +++--- command/v7/ssh_enabled_command.go | 2 +- command/v7/ssh_enabled_command_test.go | 14 ++-- command/v7/stack_command.go | 4 +- command/v7/stack_command_test.go | 18 +++--- command/v7/stacks_command.go | 6 +- command/v7/stacks_command_test.go | 16 ++--- command/v7/stage_package_command.go | 14 ++-- command/v7/stage_package_command_test.go | 24 +++---- ...ging_environment_variable_group_command.go | 6 +- ...environment_variable_group_command_test.go | 14 ++-- command/v7/staging_security_groups_command.go | 2 +- .../staging_security_groups_command_test.go | 16 ++--- command/v7/start_command.go | 14 ++-- command/v7/start_command_test.go | 24 +++---- command/v7/stop_command.go | 2 +- command/v7/stop_command_test.go | 20 +++--- command/v7/target_command.go | 4 +- command/v7/target_command_test.go | 20 +++--- command/v7/tasks_command.go | 6 +- command/v7/tasks_command_test.go | 20 +++--- command/v7/terminate_task_command.go | 4 +- command/v7/terminate_task_command_test.go | 20 +++--- command/v7/unbind_route_service_command.go | 8 +-- .../v7/unbind_route_service_command_test.go | 16 ++--- .../v7/unbind_running_group_command_test.go | 14 ++-- .../unbind_running_security_group_command.go | 6 +- command/v7/unbind_security_group.go | 8 +-- command/v7/unbind_security_group_test.go | 16 ++--- command/v7/unbind_service_command.go | 8 +-- command/v7/unbind_service_command_test.go | 14 ++-- .../unbind_staging_security_group_command.go | 6 +- ...ind_staging_security_group_command_test.go | 14 ++-- command/v7/unmap_route_command.go | 4 +- command/v7/unmap_route_command_test.go | 18 +++--- command/v7/unset_env_command.go | 4 +- command/v7/unset_env_command_test.go | 14 ++-- command/v7/unset_label_command.go | 6 +- command/v7/unset_label_command_test.go | 8 +-- command/v7/unset_org_role_command.go | 4 +- command/v7/unset_org_role_command_test.go | 24 +++---- command/v7/unset_space_quota_command.go | 2 +- command/v7/unset_space_quota_command_test.go | 18 +++--- command/v7/unset_space_role_command.go | 4 +- command/v7/unset_space_role_command_test.go | 24 +++---- command/v7/unshare_private_domain_command.go | 2 +- .../v7/unshare_private_domain_command_test.go | 18 +++--- command/v7/unshare_route_command.go | 4 +- command/v7/unshare_route_command_test.go | 18 +++--- command/v7/unshare_service_command.go | 6 +- command/v7/unshare_service_command_test.go | 16 ++--- command/v7/update_buildpack_command.go | 20 +++--- command/v7/update_buildpack_command_test.go | 28 ++++---- command/v7/update_destination_command.go | 4 +- command/v7/update_destination_command_test.go | 20 +++--- command/v7/update_org_quota_command.go | 6 +- command/v7/update_org_quota_command_test.go | 20 +++--- command/v7/update_security_group_command.go | 4 +- .../v7/update_security_group_command_test.go | 16 ++--- command/v7/update_service_broker_command.go | 6 +- .../v7/update_service_broker_command_test.go | 18 +++--- command/v7/update_service_command.go | 10 +-- command/v7/update_service_command_test.go | 18 +++--- command/v7/update_space_quota_command.go | 6 +- command/v7/update_space_quota_command_test.go | 20 +++--- .../update_user_provided_service_command.go | 10 +-- ...date_user_provided_service_command_test.go | 26 ++++---- command/v7/upgrade_service_command.go | 8 +-- command/v7/upgrade_service_command_test.go | 16 ++--- command/v7/v7fakes/fake_actor.go | 20 +++--- command/v7/v7fakes/fake_actor_reloader.go | 4 +- command/v7/v7fakes/fake_diff_displayer.go | 4 +- command/v7/v7fakes/fake_label_setter.go | 4 +- command/v7/v7fakes/fake_label_unsetter.go | 4 +- command/v7/v7fakes/fake_manifest_locator.go | 2 +- command/v7/v7fakes/fake_manifest_parser.go | 4 +- .../v7/v7fakes/fake_network_policies_actor.go | 4 +- command/v7/v7fakes/fake_networking_actor.go | 4 +- command/v7/v7fakes/fake_progress_bar.go | 2 +- command/v7/v7fakes/fake_push_actor.go | 8 +-- .../fake_remove_network_policy_actor.go | 4 +- command/v7/v7fakes/fake_revisions_actor.go | 6 +- command/v7/v7fakes/fake_set_label_actor.go | 8 +-- command/v7/v7fakes/fake_shared_sshactor.go | 4 +- command/v7/v7fakes/fake_v7actor_for_push.go | 8 +-- fixtures/plugins/alias_conflicts.go | 2 +- fixtures/plugins/call_core_cmd.go | 2 +- fixtures/plugins/empty_plugin.go | 2 +- fixtures/plugins/input.go | 2 +- fixtures/plugins/my_say.go | 2 +- fixtures/plugins/panics.go | 2 +- fixtures/plugins/test_1.go | 2 +- fixtures/plugins/test_2.go | 2 +- fixtures/plugins/test_with_help.go | 2 +- fixtures/plugins/test_with_orgs.go | 2 +- fixtures/plugins/test_with_orgs_short_name.go | 2 +- fixtures/plugins/test_with_push.go | 2 +- fixtures/plugins/test_with_push_short_name.go | 2 +- go.mod | 3 +- go.sum | 2 + .../assets/configurable_plugin/test_plugin.go | 2 +- .../test_plugin_fails_uninstall.go | 2 +- integration/assets/hydrabroker/app/app.go | 2 +- integration/assets/hydrabroker/app/broker.go | 6 +- integration/assets/hydrabroker/app/config.go | 4 +- integration/assets/hydrabroker/app/helpers.go | 2 +- .../hydrabroker/database/database_test.go | 2 +- .../integrationtest/integrationtest_test.go | 6 +- integration/assets/hydrabroker/main.go | 2 +- .../assets/hydrabroker/store/bindings.go | 4 +- .../assets/hydrabroker/store/bindings_test.go | 6 +- .../assets/hydrabroker/store/brokers.go | 4 +- .../assets/hydrabroker/store/brokers_test.go | 4 +- .../assets/hydrabroker/store/instances.go | 6 +- .../hydrabroker/store/instances_test.go | 6 +- integration/assets/hydrabroker/store/store.go | 2 +- integration/assets/test_plugin/test_plugin.go | 2 +- .../test_plugin_fails_metadata/test_plugin.go | 2 +- .../test_plugin.go | 2 +- .../test_plugin_with_panic/test_plugin.go | 2 +- .../helpers/app_instance_table_test.go | 2 +- integration/helpers/app_test.go | 2 +- .../commonisolated/common_isolated_setup.go | 4 +- integration/helpers/config.go | 2 +- integration/helpers/plugin.go | 2 +- integration/helpers/plugin_repo.go | 4 +- integration/helpers/route.go | 2 +- integration/helpers/security_group.go | 2 +- integration/helpers/servicebrokerstub/api.go | 4 +- .../helpers/servicebrokerstub/app_config.go | 4 +- .../helpers/servicebrokerstub/app_deploy.go | 2 +- integration/helpers/servicebrokerstub/cf.go | 2 +- integration/helpers/version.go | 2 +- .../experimental/experimental_suite_test.go | 2 +- .../shared/global/global_suite_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../shared/isolated/apps_command_test.go | 2 +- integration/shared/isolated/config_test.go | 2 +- .../shared/isolated/error_handling_test.go | 2 +- .../isolated/internationalization_test.go | 2 +- .../shared/isolated/isolated_suite_test.go | 2 +- .../shared/isolated/logs_command_test.go | 2 +- .../restart_app_instance_command_test.go | 2 +- .../shared/isolated/spaces_command_test.go | 2 +- .../shared/isolated/version_command_test.go | 2 +- .../performance/performance_suite_test.go | 2 +- .../shared/plugin/add_plugin_repo_test.go | 2 +- integration/shared/plugin/api_test.go | 4 +- integration/shared/plugin/help_test.go | 2 +- .../plugin/install_plugin_command_test.go | 10 +-- .../install_plugin_command_unix_test.go | 2 +- .../install_plugin_from_repo_command_test.go | 4 +- integration/shared/plugin/logs_test.go | 2 +- .../shared/plugin/plugin_suite_test.go | 8 +-- .../shared/plugin/plugins_command_test.go | 4 +- integration/shared/plugin/runner_test.go | 2 +- .../plugin/uninstall_plugin_command_test.go | 4 +- .../uninstall_plugin_command_unix_test.go | 4 +- ...ind_running_security_group_command_test.go | 4 +- .../bind_security_group_command_test.go | 4 +- ...ind_staging_security_group_command_test.go | 4 +- .../global/create_buildpack_command_test.go | 2 +- .../create_security_group_command_test.go | 4 +- .../global/delete_buildpack_command_test.go | 2 +- .../disable_feature_flag_command_test.go | 2 +- .../enable_feature_flag_command_test.go | 2 +- integration/v7/global/env_command_test.go | 2 +- integration/v7/global/global_suite_test.go | 2 +- .../v7/global/org_quota_command_test.go | 2 +- .../v7/global/org_quotas_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../running_security_groups_command_test.go | 4 +- .../v7/global/security_group_command_test.go | 4 +- .../v7/global/set_org_role_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../v7/global/set_space_role_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../staging_security_groups_command_test.go | 4 +- ...ind_running_security_group_command_test.go | 4 +- .../unbind_security_group_command_test.go | 2 +- ...ind_staging_security_group_command_test.go | 4 +- .../global/update_buildpack_command_test.go | 2 +- .../update_security_group_command_test.go | 4 +- .../add_network_policy_command_test.go | 2 +- .../isolated/allow_space_ssh_command_test.go | 4 +- integration/v7/isolated/api_command_test.go | 4 +- integration/v7/isolated/app_command_test.go | 4 +- .../isolated/apply_manifest_command_test.go | 4 +- integration/v7/isolated/apps_command_test.go | 4 +- integration/v7/isolated/auth_command_test.go | 6 +- .../bind_route_service_command_test.go | 6 +- .../v7/isolated/bind_service_command_test.go | 6 +- .../v7/isolated/buildpacks_command_test.go | 4 +- .../v7/isolated/cancel_deployment_test.go | 4 +- .../v7/isolated/check_route_command_test.go | 4 +- .../v7/isolated/config_command_test.go | 2 +- integration/v7/isolated/config_test.go | 4 +- .../v7/isolated/continue_deployment_test.go | 4 +- .../v7/isolated/copy_source_command_test.go | 4 +- .../v7/isolated/create_app_command_test.go | 4 +- .../create_app_manifest_command_test.go | 4 +- .../create_isolation_segment_command_test.go | 2 +- .../v7/isolated/create_org_command_test.go | 4 +- .../isolated/create_org_quota_command_test.go | 6 +- .../isolated/create_package_cfignore_test.go | 2 +- .../isolated/create_package_command_test.go | 4 +- .../v7/isolated/create_private_domain_test.go | 4 +- .../v7/isolated/create_route_command_test.go | 4 +- .../create_service_broker_command_test.go | 6 +- .../isolated/create_service_command_test.go | 4 +- .../create_service_key_command_test.go | 6 +- .../v7/isolated/create_shared_domain_test.go | 4 +- .../v7/isolated/create_space_command_test.go | 4 +- .../create_space_quota_command_test.go | 6 +- .../v7/isolated/create_user_command_test.go | 2 +- ...eate_user_provided_service_command_test.go | 2 +- integration/v7/isolated/curl_command_test.go | 4 +- .../v7/isolated/delete_command_test.go | 4 +- .../delete_isolation_segment_command_test.go | 2 +- .../v7/isolated/delete_org_command_test.go | 4 +- .../isolated/delete_org_quota_command_test.go | 2 +- .../delete_orphaned_routes_command_test.go | 4 +- .../delete_private_domain_command_test.go | 4 +- .../v7/isolated/delete_route_command_test.go | 4 +- .../delete_security_group_command_test.go | 4 +- .../delete_service_broker_command_test.go | 6 +- .../isolated/delete_service_command_test.go | 4 +- .../delete_service_key_command_test.go | 4 +- .../delete_shared_domain_command_test.go | 4 +- .../v7/isolated/delete_space_command_test.go | 2 +- .../delete_space_quota_command_test.go | 2 +- .../v7/isolated/delete_user_command_test.go | 2 +- .../disable_org_isolation_command_test.go | 2 +- .../disable_service_access_command_test.go | 4 +- .../v7/isolated/disable_ssh_command_test.go | 4 +- .../disallow_space_ssh_command_test.go | 4 +- .../v7/isolated/domains_command_test.go | 4 +- .../isolated/download_droplet_command_test.go | 4 +- .../v7/isolated/droplets_command_test.go | 4 +- .../enable_org_isolation_command_test.go | 2 +- .../enable_service_access_command_test.go | 4 +- .../v7/isolated/enable_ssh_command_test.go | 4 +- .../isolated/error_on_extra_arguments_test.go | 2 +- .../v7/isolated/events_command_test.go | 4 +- .../v7/isolated/feature_flag_command_test.go | 4 +- .../v7/isolated/feature_flags_command_test.go | 4 +- .../isolated/get_health_check_command_test.go | 4 +- integration/v7/isolated/help_command_test.go | 4 +- .../v7/isolated/isolated_suite_test.go | 2 +- .../isolation_segments_command_test.go | 2 +- .../v7/isolated/labels_command_test.go | 6 +- integration/v7/isolated/login_command_test.go | 4 +- .../v7/isolated/logout_command_test.go | 4 +- integration/v7/isolated/logs_command_test.go | 4 +- .../v7/isolated/map_route_command_test.go | 6 +- .../v7/isolated/marketplace_command_test.go | 10 +-- .../v7/isolated/move_route_command_test.go | 6 +- .../isolated/network_policies_command_test.go | 2 +- integration/v7/isolated/oauth_client_test.go | 4 +- .../v7/isolated/oauth_token_command_test.go | 4 +- integration/v7/isolated/org_command_test.go | 2 +- .../v7/isolated/org_users_command_test.go | 2 +- integration/v7/isolated/orgs_command_test.go | 2 +- .../v7/isolated/packages_command_test.go | 4 +- .../v7/isolated/passwd_command_test.go | 4 +- .../v7/isolated/proxy_connection_test.go | 2 +- .../purge_service_instance_command_test.go | 4 +- .../purge_service_offering_command_test.go | 4 +- .../remove_network_policy_command_test.go | 2 +- .../v7/isolated/rename_command_test.go | 4 +- .../v7/isolated/rename_org_command_test.go | 4 +- .../rename_service_broker_command_test.go | 4 +- .../isolated/rename_service_command_test.go | 4 +- .../v7/isolated/rename_space_command_test.go | 4 +- ..._default_isolation_segment_command_test.go | 2 +- .../reset_space_isolation_segment_test.go | 2 +- .../v7/isolated/restage_command_test.go | 2 +- .../restart_app_instance_command_test.go | 6 +- .../v7/isolated/restart_command_test.go | 4 +- .../v7/isolated/revision_command_test.go | 4 +- .../v7/isolated/revisions_command_test.go | 4 +- .../v7/isolated/rollback_command_test.go | 4 +- integration/v7/isolated/route_command_test.go | 6 +- .../v7/isolated/router_groups_command_test.go | 2 +- .../v7/isolated/routes_command_test.go | 6 +- .../v7/isolated/run_task_command_test.go | 4 +- integration/v7/isolated/scale_command_test.go | 10 +-- .../isolated/security_groups_command_test.go | 4 +- .../isolated/service_access_command_test.go | 4 +- .../isolated/service_brokers_command_test.go | 4 +- .../v7/isolated/service_command_test.go | 6 +- .../v7/isolated/service_key_command_test.go | 4 +- .../v7/isolated/service_keys_command_test.go | 4 +- .../v7/isolated/services_command_test.go | 6 +- .../v7/isolated/set_droplet_command_test.go | 4 +- .../v7/isolated/set_env_command_test.go | 4 +- .../isolated/set_health_check_command_test.go | 4 +- .../v7/isolated/set_label_command_test.go | 6 +- ..._default_isolation_segment_command_test.go | 2 +- .../v7/isolated/set_org_quota_command_test.go | 4 +- .../v7/isolated/set_org_role_command_test.go | 4 +- ...et_space_isolation_segment_command_test.go | 2 +- .../isolated/set_space_quota_command_test.go | 4 +- .../isolated/set_space_role_command_test.go | 2 +- .../v7/isolated/share_private_domain_test.go | 4 +- .../v7/isolated/share_route_command_test.go | 6 +- .../v7/isolated/share_service_command_test.go | 4 +- integration/v7/isolated/space_command_test.go | 6 +- .../v7/isolated/space_quota_command_test.go | 2 +- .../v7/isolated/space_quotas_command_test.go | 2 +- .../space_ssh_allowed_command_test.go | 2 +- .../v7/isolated/space_users_command_test.go | 4 +- .../v7/isolated/spaces_command_test.go | 2 +- .../v7/isolated/ssh_code_command_test.go | 2 +- integration/v7/isolated/ssh_command_test.go | 4 +- .../v7/isolated/ssh_enabled_command_test.go | 4 +- integration/v7/isolated/stack_command_test.go | 4 +- .../v7/isolated/stacks_command_test.go | 4 +- .../v7/isolated/stage_package_command_test.go | 4 +- integration/v7/isolated/start_command_test.go | 4 +- integration/v7/isolated/stop_command_test.go | 4 +- .../v7/isolated/table_alignment_test.go | 2 +- .../v7/isolated/target_command_test.go | 6 +- integration/v7/isolated/tasks_command_test.go | 2 +- .../isolated/terminate_task_command_test.go | 2 +- integration/v7/isolated/token_refresh_test.go | 4 +- .../unbind_route_service_command_test.go | 6 +- .../isolated/unbind_service_command_test.go | 6 +- .../v7/isolated/unmap_route_command_test.go | 4 +- .../v7/isolated/unset_env_command_test.go | 4 +- .../v7/isolated/unset_label_command_test.go | 6 +- .../isolated/unset_org_role_command_test.go | 2 +- .../unset_space_quota_command_test.go | 4 +- .../isolated/unset_space_role_command_test.go | 2 +- .../isolated/unshare_private_domain_test.go | 4 +- .../v7/isolated/unshare_route_command_test.go | 6 +- .../isolated/unshare_service_command_test.go | 4 +- .../update_destination_command_test.go | 6 +- .../isolated/update_org_quota_command_test.go | 4 +- .../update_service_broker_command_test.go | 4 +- .../isolated/update_service_command_test.go | 4 +- .../update_space_quota_command_test.go | 4 +- ...date_user_provided_service_command_test.go | 2 +- .../isolated/upgrade_service_command_test.go | 6 +- integration/v7/isolated/verbose_flag_test.go | 6 +- .../v7/push/app_start_timeout_flag_test.go | 2 +- integration/v7/push/buildpacks_test.go | 2 +- integration/v7/push/canary_push_test.go | 2 +- integration/v7/push/cfignore_test.go | 2 +- .../combination_manifest_and_flag_test.go | 2 +- integration/v7/push/disk_flag_test.go | 2 +- integration/v7/push/docker_test.go | 2 +- integration/v7/push/droplet_flag_test.go | 2 +- integration/v7/push/health_check_test.go | 4 +- integration/v7/push/help_test.go | 2 +- integration/v7/push/ignore_app_files_test.go | 2 +- integration/v7/push/input_errors_test.go | 2 +- integration/v7/push/instances_flag_test.go | 2 +- .../v7/push/log_rate_limit_flag_test.go | 4 +- integration/v7/push/manifest_diff_test.go | 2 +- integration/v7/push/manifest_location_test.go | 2 +- ...st_with_app_name_and_no_route_flag_test.go | 2 +- .../v7/push/manifest_with_app_name_test.go | 2 +- integration/v7/push/memory_flag_test.go | 2 +- integration/v7/push/name_only_test.go | 2 +- integration/v7/push/no_route_test.go | 2 +- integration/v7/push/no_start_test.go | 2 +- integration/v7/push/no_wait_test.go | 2 +- integration/v7/push/path_test.go | 2 +- integration/v7/push/push_output_test.go | 2 +- integration/v7/push/push_suite_test.go | 2 +- integration/v7/push/random_route_test.go | 2 +- integration/v7/push/resource_matching_test.go | 2 +- integration/v7/push/rolling_push_test.go | 2 +- .../v7/push/simple_manifest_only_test.go | 2 +- integration/v7/push/stacks_test.go | 2 +- integration/v7/push/start_command_test.go | 2 +- integration/v7/push/symlink_resources_test.go | 2 +- integration/v7/push/symlink_test.go | 2 +- integration/v7/push/targeting_test.go | 2 +- integration/v7/push/tasks_test.go | 2 +- .../v7/selfcontained/api_command_test.go | 8 +-- .../create_space_command_test.go | 6 +- .../selfcontained/kubernetes_auth_log_test.go | 6 +- .../v7/selfcontained/kubernetes_auth_test.go | 8 +-- .../v7/selfcontained/login_command_test.go | 10 +-- .../v7/selfcontained/logout_command_test.go | 6 +- .../selfcontained/selfcontained_suite_test.go | 6 +- main.go | 16 ++--- plugin/cli_connection.go | 4 +- plugin/plugin.go | 4 +- plugin/plugin_examples/basic_plugin.go | 6 +- plugin/plugin_examples/echo.go | 2 +- plugin/plugin_examples/interactive.go | 2 +- plugin/plugin_examples/multiple_commands.go | 2 +- .../test_rpc_server_example.go | 4 +- .../test_rpc_server_example_suite_test.go | 2 +- .../test_rpc_server_example_test.go | 14 ++-- plugin/plugin_shim_test.go | 6 +- plugin/plugin_suite_test.go | 2 +- plugin/pluginfakes/fake_cli_connection.go | 4 +- plugin/rpc/call_command_registry.go | 6 +- plugin/rpc/call_command_registry_test.go | 16 ++--- plugin/rpc/cli_rpc_server.go | 64 +++++++++---------- plugin/rpc/cli_rpc_server_test.go | 40 ++++++------ plugin/rpc/fakecommand/fake_command1.go | 8 +-- plugin/rpc/fakecommand/fake_command2.go | 8 +-- plugin/rpc/fakecommand/fake_command3.go | 6 +- plugin/rpc/fakecommand/fake_command4.go | 6 +- plugin/rpc/rpc_suite_test.go | 2 +- plugin/rpc/rpcfakes/fake_command_runner.go | 4 +- plugin/rpc/rpcfakes/fake_output_capture.go | 2 +- .../rpcfakes/fake_terminal_output_switch.go | 2 +- plugin/rpc/run_plugin.go | 2 +- plugin/transition/run_plugin_legacy.go | 6 +- resources/application_resource.go | 4 +- resources/build_resource.go | 4 +- resources/buildpack_resource.go | 4 +- resources/deployment_resource.go | 4 +- resources/domain_resource.go | 2 +- resources/droplet_resource.go | 4 +- resources/environment_variables_resource.go | 4 +- resources/last_operation_resource_test.go | 2 +- resources/metadata_resource.go | 2 +- resources/package_resource.go | 4 +- resources/process_resource.go | 6 +- resources/process_resource_test.go | 6 +- resources/quota_resource.go | 2 +- resources/quota_resource_test.go | 2 +- resources/relationship_resource.go | 4 +- resources/role_resource.go | 4 +- resources/route_binding.go | 2 +- resources/route_binding_test.go | 2 +- resources/route_resource.go | 2 +- resources/security_group_resource_test.go | 2 +- resources/service_broker_resource_test.go | 4 +- .../service_credential_binding_resource.go | 2 +- ...ervice_credential_binding_resource_test.go | 4 +- resources/service_instance_resource.go | 2 +- resources/service_instance_resource_test.go | 4 +- ...ce_instance_usage_summary_resource_test.go | 2 +- resources/service_offering_resource.go | 2 +- resources/service_offering_resource_test.go | 4 +- resources/service_plan_resource_test.go | 4 +- .../service_plan_visibility_resource_test.go | 2 +- resources/shared_to_spaces_resource_test.go | 4 +- resources/sidecar_resource.go | 2 +- resources/task_resource.go | 2 +- types/filtered_interface_test.go | 2 +- types/filtered_string_test.go | 2 +- types/json_object_test.go | 2 +- types/null_bool_test.go | 2 +- types/null_bytesize_in_mb_test.go | 2 +- types/null_int_test.go | 2 +- types/null_string_test.go | 2 +- types/null_uint64_test.go | 2 +- types/optional_boolean_test.go | 2 +- types/optional_object_test.go | 2 +- types/optional_string_slice_test.go | 2 +- types/optional_string_test.go | 2 +- util/batcher/batcher.go | 2 +- util/batcher/batcher_test.go | 6 +- util/checksum_test.go | 2 +- .../clisshfakes/fake_listener_factory.go | 2 +- util/clissh/clisshfakes/fake_secure_client.go | 2 +- util/clissh/clisshfakes/fake_secure_dialer.go | 2 +- .../clissh/clisshfakes/fake_secure_session.go | 2 +- .../clisshfakes/fake_terminal_helper.go | 2 +- util/clissh/ssh.go | 4 +- util/clissh/ssh_test.go | 6 +- util/command_parser/command_parser.go | 16 ++--- util/command_parser/command_parser_test.go | 8 +-- util/command_parser/prevent_extra_args_v7.go | 2 +- util/command_parser/unknown_command_error.go | 4 +- util/configv3/color_test.go | 2 +- util/configv3/config.go | 2 +- util/configv3/config_suite_test.go | 2 +- util/configv3/config_test.go | 2 +- util/configv3/config_unix_test.go | 2 +- util/configv3/config_windows_test.go | 2 +- .../configv3fakes/fake_user_config.go | 2 +- util/configv3/default_user_config_test.go | 2 +- util/configv3/dynamic_user_config_test.go | 4 +- util/configv3/env_test.go | 2 +- util/configv3/json_config_test.go | 4 +- util/configv3/k8s_test.go | 2 +- util/configv3/kubernetes_user_config_test.go | 2 +- util/configv3/load_config.go | 2 +- util/configv3/load_config_test.go | 8 +-- util/configv3/locale_test.go | 2 +- util/configv3/plugin_repository_test.go | 2 +- util/configv3/plugins_config.go | 2 +- util/configv3/plugins_config_test.go | 2 +- util/configv3/write_config_test.go | 2 +- util/download/downloader.go | 2 +- util/download/downloader_test.go | 4 +- .../download/downloadfakes/fake_httpclient.go | 2 +- .../downloadfakes/fake_progress_bar.go | 2 +- util/extract/extract.go | 2 +- util/extract/extract_test.go | 2 +- util/generic/architecture_test.go | 2 +- util/generic/executable_filename_unix_test.go | 2 +- .../executable_filename_windows_test.go | 2 +- util/generic/map_test.go | 2 +- util/generic/slice_test.go | 2 +- util/lookuptable/name_from_guid_test.go | 2 +- util/lookuptable/resource_from_guid.go | 2 +- util/manifest/application.go | 2 +- util/manifest/manifest_test.go | 4 +- util/manifest/manifest_unix_test.go | 2 +- util/manifest/manifest_windows_test.go | 2 +- util/manifestparser/application.go | 2 +- util/manifestparser/application_test.go | 2 +- util/manifestparser/locator_test.go | 2 +- util/manifestparser/manifest_test.go | 2 +- util/manifestparser/parser_test.go | 2 +- util/manifestparser/process.go | 2 +- util/manifestparser/process_test.go | 2 +- util/panichandler/handler.go | 2 +- util/plugin/plugin.go | 10 +-- util/railway/railway.go | 2 +- util/railway/railway_test.go | 4 +- util/randomword/generator_test.go | 2 +- util/sorting/alphabetic_test.go | 2 +- util/tls_test.go | 2 +- util/ui/config.go | 2 +- util/ui/i18n.go | 2 +- util/ui/i18n_test.go | 4 +- util/ui/log_message_test.go | 6 +- util/ui/prompt_test.go | 6 +- util/ui/request_logger_file_writer_test.go | 2 +- .../request_logger_terminal_display_test.go | 2 +- util/ui/sanitize_json_test.go | 2 +- util/ui/table_test.go | 6 +- util/ui/ui.go | 4 +- util/ui/ui_for_app_test.go | 6 +- util/ui/ui_for_push.go | 2 +- util/ui/ui_for_push_test.go | 8 +-- util/ui/ui_test.go | 8 +-- util/ui/ui_v7_test.go | 6 +- util/ui/uifakes/fake_config.go | 4 +- util/ui/uifakes/fake_exiter.go | 2 +- util/ui/uifakes/fake_interactor.go | 2 +- util/ui/uifakes/fake_log_message.go | 2 +- util/ui/uifakes/fake_resolver.go | 2 +- util/unique/string_slice_test.go | 2 +- util/url_test.go | 2 +- util/utilfakes/fake_sha1checksum.go | 2 +- version/version_test.go | 2 +- 2199 files changed, 9453 insertions(+), 9441 deletions(-) diff --git a/README.md b/README.md index 0d8708b7bf..4643ff318c 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,6 @@ information follow: * [The CF CLI plugin development guide](https://github.com/cloudfoundry/cli/tree/main/plugin/plugin_examples) * [The official plugins repository](https://plugins.cloudfoundry.org/) -When importing the plugin code use `import "code.cloudfoundry.org/cli/plugin"`. +When importing the plugin code use `import "code.cloudfoundry.org/cli/v8/plugin"`. Older plugins that import `github.com/cloudfoundry/cli/plugin` will still work as long they vendor the plugins directory. diff --git a/actor/actionerror/duplicate_service_error_test.go b/actor/actionerror/duplicate_service_error_test.go index b20248eabf..2d430af90a 100644 --- a/actor/actionerror/duplicate_service_error_test.go +++ b/actor/actionerror/duplicate_service_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "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 5064f30a29..6aa63c5345 100644 --- a/actor/actionerror/duplicate_service_plan_error_test.go +++ b/actor/actionerror/duplicate_service_plan_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/enrich_api_errors.go b/actor/actionerror/enrich_api_errors.go index d372f41221..b86d06ca68 100644 --- a/actor/actionerror/enrich_api_errors.go +++ b/actor/actionerror/enrich_api_errors.go @@ -1,6 +1,6 @@ package actionerror -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" +import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" func EnrichAPIErrors(e error) error { switch err := e.(type) { diff --git a/actor/actionerror/enrich_api_errors_test.go b/actor/actionerror/enrich_api_errors_test.go index d579b5179e..d8102e46e6 100644 --- a/actor/actionerror/enrich_api_errors_test.go +++ b/actor/actionerror/enrich_api_errors_test.go @@ -3,9 +3,9 @@ package actionerror_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "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 a6bef9120b..1fec5ecd1b 100644 --- a/actor/actionerror/package_not_found_in_app_error_test.go +++ b/actor/actionerror/package_not_found_in_app_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "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 e6dedb1a80..83b694cceb 100644 --- a/actor/actionerror/route_not_found_error_test.go +++ b/actor/actionerror/route_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/security_group_not_bound_to_space_error.go b/actor/actionerror/security_group_not_bound_to_space_error.go index 7714874d62..29ed14b9af 100644 --- a/actor/actionerror/security_group_not_bound_to_space_error.go +++ b/actor/actionerror/security_group_not_bound_to_space_error.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // SecurityGroupNotBoundToSpaceError is returned when a requested security group is diff --git a/actor/actionerror/service_instance_type_error.go b/actor/actionerror/service_instance_type_error.go index 9021fcd059..48843d2894 100644 --- a/actor/actionerror/service_instance_type_error.go +++ b/actor/actionerror/service_instance_type_error.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/resources" ) type ServiceInstanceTypeError struct { diff --git a/actor/actionerror/service_not_found_error_test.go b/actor/actionerror/service_not_found_error_test.go index 5062830a5c..b5b7c97b5e 100644 --- a/actor/actionerror/service_not_found_error_test.go +++ b/actor/actionerror/service_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/service_offering_name_ambiguity_error.go b/actor/actionerror/service_offering_name_ambiguity_error.go index b7ec535195..b45e548bbb 100644 --- a/actor/actionerror/service_offering_name_ambiguity_error.go +++ b/actor/actionerror/service_offering_name_ambiguity_error.go @@ -1,6 +1,6 @@ package actionerror -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" +import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" type ServiceOfferingNameAmbiguityError struct { ccerror.ServiceOfferingNameAmbiguityError diff --git a/actor/actionerror/service_plan_not_found_error_test.go b/actor/actionerror/service_plan_not_found_error_test.go index 4ea762f5ad..d9cbee3bcd 100644 --- a/actor/actionerror/service_plan_not_found_error_test.go +++ b/actor/actionerror/service_plan_not_found_error_test.go @@ -3,7 +3,7 @@ package actionerror_test import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "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 ad8647e803..0708268b43 100644 --- a/actor/actionerror/space_not_found_error_test.go +++ b/actor/actionerror/space_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/user_not_found.go b/actor/actionerror/user_not_found.go index 57f50c8ee1..5c024a420e 100644 --- a/actor/actionerror/user_not_found.go +++ b/actor/actionerror/user_not_found.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // UserNotFoundError is an error wrapper that represents the case diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go index f83e102f68..d246095540 100644 --- a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go +++ b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go @@ -4,9 +4,9 @@ package cfnetworkingactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) type FakeCloudControllerClient struct { diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go index ce5fc06a3e..3462f5aecd 100644 --- a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go +++ b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go @@ -5,7 +5,7 @@ import ( "sync" "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" ) type FakeNetworkingClient struct { diff --git a/actor/cfnetworkingaction/cloud_controller_client.go b/actor/cfnetworkingaction/cloud_controller_client.go index c5d6c48c91..be262f0e52 100644 --- a/actor/cfnetworkingaction/cloud_controller_client.go +++ b/actor/cfnetworkingaction/cloud_controller_client.go @@ -1,8 +1,8 @@ package cfnetworkingaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/cfnetworkingaction/policy.go b/actor/cfnetworkingaction/policy.go index a0e44b246e..5313aa5349 100644 --- a/actor/cfnetworkingaction/policy.go +++ b/actor/cfnetworkingaction/policy.go @@ -2,12 +2,12 @@ package cfnetworkingaction import ( "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v8/util/lookuptable" ) type Policy struct { diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go index 539a7aab42..beaf6585ea 100644 --- a/actor/cfnetworkingaction/policy_test.go +++ b/actor/cfnetworkingaction/policy_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/batcher" "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction/cfnetworkingactionfakes" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction/cfnetworkingactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/checksum.go b/actor/pluginaction/checksum.go index 0d0a0f9e07..8a223bb25b 100644 --- a/actor/pluginaction/checksum.go +++ b/actor/pluginaction/checksum.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/util/configv3" +import "code.cloudfoundry.org/cli/v8/util/configv3" func (actor Actor) ValidateFileChecksum(path string, checksum string) bool { plugin := configv3.Plugin{Location: path} diff --git a/actor/pluginaction/checksum_test.go b/actor/pluginaction/checksum_test.go index c3e4f0fdd8..c17519b3f6 100644 --- a/actor/pluginaction/checksum_test.go +++ b/actor/pluginaction/checksum_test.go @@ -3,8 +3,8 @@ package pluginaction_test import ( "os" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/config.go b/actor/pluginaction/config.go index 74410faa41..307aefcdff 100644 --- a/actor/pluginaction/config.go +++ b/actor/pluginaction/config.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/util/configv3" +import "code.cloudfoundry.org/cli/v8/util/configv3" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/pluginaction/install.go b/actor/pluginaction/install.go index a548e9ef0f..12e95772ab 100644 --- a/actor/pluginaction/install.go +++ b/actor/pluginaction/install.go @@ -8,10 +8,10 @@ import ( "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/generic" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/actor/pluginaction/install_test.go b/actor/pluginaction/install_test.go index 4b66ef1cb9..01861983e0 100644 --- a/actor/pluginaction/install_test.go +++ b/actor/pluginaction/install_test.go @@ -5,13 +5,13 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/generic" . "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 5f0fa9b611..d1cdb380f4 100644 --- a/actor/pluginaction/install_unix_test.go +++ b/actor/pluginaction/install_unix_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v8/util/configv3" . "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 b62c3da5d8..04a1c11ccf 100644 --- a/actor/pluginaction/install_windows_test.go +++ b/actor/pluginaction/install_windows_test.go @@ -6,8 +6,8 @@ package pluginaction_test import ( "os" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/list.go b/actor/pluginaction/list.go index 0ea20b8a87..23a76e2a05 100644 --- a/actor/pluginaction/list.go +++ b/actor/pluginaction/list.go @@ -1,7 +1,7 @@ package pluginaction import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" "github.com/blang/semver/v4" ) diff --git a/actor/pluginaction/list_test.go b/actor/pluginaction/list_test.go index 55ba1158bb..d2c8caffff 100644 --- a/actor/pluginaction/list_test.go +++ b/actor/pluginaction/list_test.go @@ -3,11 +3,11 @@ package pluginaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/plugin_client.go b/actor/pluginaction/plugin_client.go index b7cb807171..6c992a243f 100644 --- a/actor/pluginaction/plugin_client.go +++ b/actor/pluginaction/plugin_client.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/api/plugin" +import "code.cloudfoundry.org/cli/v8/api/plugin" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginClient diff --git a/actor/pluginaction/plugin_info.go b/actor/pluginaction/plugin_info.go index 8ca0133f28..c0bb3ddec5 100644 --- a/actor/pluginaction/plugin_info.go +++ b/actor/pluginaction/plugin_info.go @@ -3,9 +3,9 @@ package pluginaction import ( "runtime" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/generic" ) type PluginInfo struct { diff --git a/actor/pluginaction/plugin_info_test.go b/actor/pluginaction/plugin_info_test.go index 2ec6c6d3e1..eefeb1ec0c 100644 --- a/actor/pluginaction/plugin_info_test.go +++ b/actor/pluginaction/plugin_info_test.go @@ -3,11 +3,11 @@ package pluginaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/plugin_repository.go b/actor/pluginaction/plugin_repository.go index 600ba67a91..777a5000ce 100644 --- a/actor/pluginaction/plugin_repository.go +++ b/actor/pluginaction/plugin_repository.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/util/configv3" ) func (actor Actor) AddPluginRepository(repoName string, repoURL string) error { diff --git a/actor/pluginaction/plugin_repository_test.go b/actor/pluginaction/plugin_repository_test.go index 468e18ea73..de99fdf097 100644 --- a/actor/pluginaction/plugin_repository_test.go +++ b/actor/pluginaction/plugin_repository_test.go @@ -4,11 +4,11 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/pluginactionfakes/fake_command_list.go b/actor/pluginaction/pluginactionfakes/fake_command_list.go index 8d72e43488..fb8bf73330 100644 --- a/actor/pluginaction/pluginactionfakes/fake_command_list.go +++ b/actor/pluginaction/pluginactionfakes/fake_command_list.go @@ -4,7 +4,7 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" ) type FakeCommandList struct { diff --git a/actor/pluginaction/pluginactionfakes/fake_config.go b/actor/pluginaction/pluginactionfakes/fake_config.go index 4d2581800e..3186786ce6 100644 --- a/actor/pluginaction/pluginactionfakes/fake_config.go +++ b/actor/pluginaction/pluginactionfakes/fake_config.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type FakeConfig struct { diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_client.go b/actor/pluginaction/pluginactionfakes/fake_plugin_client.go index 4cd201cd61..59aa8cc9c7 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_client.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_client.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/api/plugin" ) type FakePluginClient struct { diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go b/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go index 47d16dc403..1d830e1cbc 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type FakePluginMetadata struct { diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go b/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go index 060fa43875..c56b7f339f 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go @@ -4,7 +4,7 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" ) type FakePluginUninstaller struct { diff --git a/actor/pluginaction/uninstall.go b/actor/pluginaction/uninstall.go index 4359d903a4..a5b3e90b98 100644 --- a/actor/pluginaction/uninstall.go +++ b/actor/pluginaction/uninstall.go @@ -5,7 +5,7 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginUninstaller diff --git a/actor/pluginaction/uninstall_test.go b/actor/pluginaction/uninstall_test.go index 944ee5c507..8bb04794d2 100644 --- a/actor/pluginaction/uninstall_test.go +++ b/actor/pluginaction/uninstall_test.go @@ -6,10 +6,10 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/auth_test.go b/actor/sharedaction/auth_test.go index c1271a7f8f..dc2e219517 100644 --- a/actor/sharedaction/auth_test.go +++ b/actor/sharedaction/auth_test.go @@ -3,8 +3,8 @@ package sharedaction_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/check_target.go b/actor/sharedaction/check_target.go index 5621e84505..a852ed87de 100644 --- a/actor/sharedaction/check_target.go +++ b/actor/sharedaction/check_target.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/actor/actionerror" +import "code.cloudfoundry.org/cli/v8/actor/actionerror" // CheckTarget confirms that the user is logged in. Optionally it will also // check if an organization and space are targeted. diff --git a/actor/sharedaction/check_target_test.go b/actor/sharedaction/check_target_test.go index d59d7e0994..0030cef620 100644 --- a/actor/sharedaction/check_target_test.go +++ b/actor/sharedaction/check_target_test.go @@ -3,9 +3,9 @@ package sharedaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/help.go b/actor/sharedaction/help.go index a1120cd3ed..20667b7e71 100644 --- a/actor/sharedaction/help.go +++ b/actor/sharedaction/help.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/util/sorting" ) const ( diff --git a/actor/sharedaction/help_test.go b/actor/sharedaction/help_test.go index 26f5676bcc..d0f3baf37f 100644 --- a/actor/sharedaction/help_test.go +++ b/actor/sharedaction/help_test.go @@ -1,9 +1,9 @@ package sharedaction_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" . "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 0006bcdd59..465eebe771 100644 --- a/actor/sharedaction/is_org_targeted_test.go +++ b/actor/sharedaction/is_org_targeted_test.go @@ -1,8 +1,8 @@ package sharedaction_test import ( - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" . "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 981f0a992a..775c282d49 100644 --- a/actor/sharedaction/is_space_targeted_test.go +++ b/actor/sharedaction/is_space_targeted_test.go @@ -1,8 +1,8 @@ package sharedaction_test import ( - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/logging_test.go b/actor/sharedaction/logging_test.go index ad32d23f92..736582c75e 100644 --- a/actor/sharedaction/logging_test.go +++ b/actor/sharedaction/logging_test.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" . "github.com/onsi/ginkgo/v2" diff --git a/actor/sharedaction/resource.go b/actor/sharedaction/resource.go index 1a98ef1676..2a69476cfe 100644 --- a/actor/sharedaction/resource.go +++ b/actor/sharedaction/resource.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" "code.cloudfoundry.org/ykk" ignore "github.com/sabhiram/go-gitignore" log "github.com/sirupsen/logrus" diff --git a/actor/sharedaction/resource_darwin_test.go b/actor/sharedaction/resource_darwin_test.go index 107b564bc7..1c710ad5cc 100644 --- a/actor/sharedaction/resource_darwin_test.go +++ b/actor/sharedaction/resource_darwin_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" . "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 1f717317f6..f85f748566 100644 --- a/actor/sharedaction/resource_linux_test.go +++ b/actor/sharedaction/resource_linux_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_test.go b/actor/sharedaction/resource_test.go index 1bfadd2309..d57ea238ab 100644 --- a/actor/sharedaction/resource_test.go +++ b/actor/sharedaction/resource_test.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "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 1f19be1308..ad52c86ecf 100644 --- a/actor/sharedaction/resource_unix_test.go +++ b/actor/sharedaction/resource_unix_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "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 b29cf9858c..27329679ee 100644 --- a/actor/sharedaction/resource_windows_test.go +++ b/actor/sharedaction/resource_windows_test.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/sharedaction/secure_shell_client.go b/actor/sharedaction/secure_shell_client.go index af276009b0..a9f959decd 100644 --- a/actor/sharedaction/secure_shell_client.go +++ b/actor/sharedaction/secure_shell_client.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/util/clissh" +import "code.cloudfoundry.org/cli/v8/util/clissh" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecureShellClient diff --git a/actor/sharedaction/sharedactionfakes/fake_config.go b/actor/sharedaction/sharedactionfakes/fake_config.go index 9bad4b6fb7..cf6dbd9169 100644 --- a/actor/sharedaction/sharedactionfakes/fake_config.go +++ b/actor/sharedaction/sharedactionfakes/fake_config.go @@ -4,7 +4,7 @@ package sharedactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" ) type FakeConfig struct { diff --git a/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go b/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go index c1ea84c096..12468304ee 100644 --- a/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go +++ b/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" client "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" ) diff --git a/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go b/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go index a9fa609a87..36015e6bae 100644 --- a/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go +++ b/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go @@ -4,8 +4,8 @@ package sharedactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/util/clissh" ) type FakeSecureShellClient struct { diff --git a/actor/sharedaction/ssh.go b/actor/sharedaction/ssh.go index 600d4cc3ec..601da7e231 100644 --- a/actor/sharedaction/ssh.go +++ b/actor/sharedaction/ssh.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/util/clissh" +import "code.cloudfoundry.org/cli/v8/util/clissh" type TTYOption clissh.TTYRequest diff --git a/actor/sharedaction/ssh_test.go b/actor/sharedaction/ssh_test.go index 9a6519f965..fb939d820d 100644 --- a/actor/sharedaction/ssh_test.go +++ b/actor/sharedaction/ssh_test.go @@ -3,9 +3,9 @@ package sharedaction_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/util/clissh" + . "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/util/clissh" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/actor.go b/actor/v7action/actor.go index 6fb6cbe0a3..b42793d27d 100644 --- a/actor/v7action/actor.go +++ b/actor/v7action/actor.go @@ -2,9 +2,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/util/configv3" "code.cloudfoundry.org/clock" ) diff --git a/actor/v7action/application.go b/actor/v7action/application.go index e86ca01c34..7c45b6ff09 100644 --- a/actor/v7action/application.go +++ b/actor/v7action/application.go @@ -5,13 +5,13 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/unique" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v8/util/unique" ) func (actor Actor) DeleteApplicationByNameAndSpace(name, spaceGUID string, deleteRoutes bool) (Warnings, error) { @@ -382,7 +382,7 @@ func (actor Actor) PollProcesses(processes []resources.Process, handleInstanceDe return true, allWarnings, actionerror.AllInstancesCrashedError{} } - //precondition: !instances.Empty() && no instances are running + // precondition: !instances.Empty() && no instances are running // do not increment numStableProcesses return false, allWarnings, nil } diff --git a/actor/v7action/application_feature.go b/actor/v7action/application_feature.go index 24c00e7e0d..0c7576d5ad 100644 --- a/actor/v7action/application_feature.go +++ b/actor/v7action/application_feature.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) GetAppFeature(appGUID string, featureName string) (resources.ApplicationFeature, Warnings, error) { diff --git a/actor/v7action/application_feature_test.go b/actor/v7action/application_feature_test.go index 24990daead..1254fc3972 100644 --- a/actor/v7action/application_feature_test.go +++ b/actor/v7action/application_feature_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/application_manifest.go b/actor/v7action/application_manifest.go index 9e23a1ee87..46382bc1d4 100644 --- a/actor/v7action/application_manifest.go +++ b/actor/v7action/application_manifest.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ManifestParser diff --git a/actor/v7action/application_manifest_test.go b/actor/v7action/application_manifest_test.go index a6c3d1da16..f71cd25855 100644 --- a/actor/v7action/application_manifest_test.go +++ b/actor/v7action/application_manifest_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" @@ -303,7 +303,7 @@ var _ = Describe("Application Manifest Actions", func() { It("returns the error and warnings", func() { Expect(executeErr).To(Equal(expectedErr)) Expect(warnings).To(ConsistOf("get-application-warning")) - _ = manifestBytes //TODO DELETE ME + _ = manifestBytes // TODO DELETE ME }) }) }) diff --git a/actor/v7action/application_summary.go b/actor/v7action/application_summary.go index 783720538a..c989c54ac6 100644 --- a/actor/v7action/application_summary.go +++ b/actor/v7action/application_summary.go @@ -3,11 +3,11 @@ package v7action import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/batcher" ) type ApplicationSummary struct { diff --git a/actor/v7action/application_summary_test.go b/actor/v7action/application_summary_test.go index 7caf75b3da..966188421d 100644 --- a/actor/v7action/application_summary_test.go +++ b/actor/v7action/application_summary_test.go @@ -4,16 +4,16 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/application_test.go b/actor/v7action/application_test.go index 06c79bb8f6..3eeb2dd03a 100644 --- a/actor/v7action/application_test.go +++ b/actor/v7action/application_test.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/batcher" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/auth.go b/actor/v7action/auth.go index aef734c2c6..b5d461e7c6 100644 --- a/actor/v7action/auth.go +++ b/actor/v7action/auth.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type defaultAuthActor struct { diff --git a/actor/v7action/auth_test.go b/actor/v7action/auth_test.go index 98ec4c3547..53a7b7374c 100644 --- a/actor/v7action/auth_test.go +++ b/actor/v7action/auth_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/build.go b/actor/v7action/build.go index 1517acfdde..b496c9e6ac 100644 --- a/actor/v7action/build.go +++ b/actor/v7action/build.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" log "github.com/sirupsen/logrus" ) @@ -90,7 +90,7 @@ func (actor Actor) StagePackage(packageGUID, appName, spaceGUID string) (<-chan timer.Reset(actor.Config.PollingInterval()) default: - //TODO: uncomment after #150569020 + // TODO: uncomment after #150569020 // droplet, warnings, err := actor.CloudControllerClient.GetDroplet(build.DropletGUID) // warningsStream <- Warnings(warnings) // if err != nil { diff --git a/actor/v7action/build_test.go b/actor/v7action/build_test.go index 28e6b1129f..426cf0915c 100644 --- a/actor/v7action/build_test.go +++ b/actor/v7action/build_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -138,7 +138,7 @@ var _ = Describe("Build Actions", func() { fakeCloudControllerClient.GetBuildReturnsOnCall(1, resources.Build{CreatedAt: "some-time", GUID: buildGUID, State: constant.BuildStaged, DropletGUID: "some-droplet-guid"}, ccv3.Warnings{"get-warnings-3", "get-warnings-4"}, nil) }) - //TODO: uncommend after #150569020 + // TODO: uncommend after #150569020 // FWhen("looking up the droplet fails", func() { // BeforeEach(func() { // fakeCloudControllerClient.GetDropletReturns(resources.Droplet{}, ccv3.Warnings{"droplet-warnings-1", "droplet-warnings-2"}, errors.New("some-droplet-error")) diff --git a/actor/v7action/buildpack.go b/actor/v7action/buildpack.go index 0fc3eab27c..87782c9f5d 100644 --- a/actor/v7action/buildpack.go +++ b/actor/v7action/buildpack.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util" ) type JobURL ccv3.JobURL diff --git a/actor/v7action/buildpack_test.go b/actor/v7action/buildpack_test.go index 8af4b5078e..09991f2e96 100644 --- a/actor/v7action/buildpack_test.go +++ b/actor/v7action/buildpack_test.go @@ -7,13 +7,13 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -607,7 +607,7 @@ var _ = Describe("Buildpack", func() { }) Describe("Zipit", func() { - //tested in buildpack_linux_test.go and buildpack_windows_test.go + // tested in buildpack_linux_test.go and buildpack_windows_test.go var ( source string target string diff --git a/actor/v7action/buildpack_unix_test.go b/actor/v7action/buildpack_unix_test.go index 96e2bc52f1..3bf553a0b2 100644 --- a/actor/v7action/buildpack_unix_test.go +++ b/actor/v7action/buildpack_unix_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v7action/buildpack_windows_test.go b/actor/v7action/buildpack_windows_test.go index 7c28ae4280..969e380f01 100644 --- a/actor/v7action/buildpack_windows_test.go +++ b/actor/v7action/buildpack_windows_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v7action/cloud_controller_client.go b/actor/v7action/cloud_controller_client.go index e8810085e4..bac2e932b5 100644 --- a/actor/v7action/cloud_controller_client.go +++ b/actor/v7action/cloud_controller_client.go @@ -4,10 +4,10 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/v7action/config.go b/actor/v7action/config.go index 8c4eb01020..5b52080167 100644 --- a/actor/v7action/config.go +++ b/actor/v7action/config.go @@ -3,7 +3,7 @@ package v7action import ( "time" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/v7action/curl.go b/actor/v7action/curl.go index dfae0ede22..cd38802510 100644 --- a/actor/v7action/curl.go +++ b/actor/v7action/curl.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) func (actor Actor) MakeCurlRequest( diff --git a/actor/v7action/curl_test.go b/actor/v7action/curl_test.go index 6380e07d1e..4f6120b425 100644 --- a/actor/v7action/curl_test.go +++ b/actor/v7action/curl_test.go @@ -5,9 +5,9 @@ import ( "net/http" "os" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/deployment.go b/actor/v7action/deployment.go index e21873d8f4..71836f1443 100644 --- a/actor/v7action/deployment.go +++ b/actor/v7action/deployment.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) CreateDeployment(dep resources.Deployment) (string, Warnings, error) { diff --git a/actor/v7action/deployment_test.go b/actor/v7action/deployment_test.go index 33afe3c331..9f0f90f410 100644 --- a/actor/v7action/deployment_test.go +++ b/actor/v7action/deployment_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/domain.go b/actor/v7action/domain.go index c2d2fef2c9..28a36c53c8 100644 --- a/actor/v7action/domain.go +++ b/actor/v7action/domain.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) type SharedOrgs ccv3.SharedOrgs diff --git a/actor/v7action/domain_test.go b/actor/v7action/domain_test.go index de8f7d2c7e..66f6b5bba7 100644 --- a/actor/v7action/domain_test.go +++ b/actor/v7action/domain_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/droplet.go b/actor/v7action/droplet.go index 920599045b..313562501e 100644 --- a/actor/v7action/droplet.go +++ b/actor/v7action/droplet.go @@ -3,10 +3,10 @@ package v7action import ( "io" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateApplicationDroplet creates a new droplet without a package for the app with diff --git a/actor/v7action/droplet_test.go b/actor/v7action/droplet_test.go index b120d55dcd..641cbbfb16 100644 --- a/actor/v7action/droplet_test.go +++ b/actor/v7action/droplet_test.go @@ -5,13 +5,13 @@ import ( "io" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/environment_variable.go b/actor/v7action/environment_variable.go index a5588b5a5d..1f9dae8b96 100644 --- a/actor/v7action/environment_variable.go +++ b/actor/v7action/environment_variable.go @@ -1,11 +1,11 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) // EnvironmentVariableGroups represents all environment variables for application diff --git a/actor/v7action/environment_variable_test.go b/actor/v7action/environment_variable_test.go index c83493c4d2..66e4d55ddf 100644 --- a/actor/v7action/environment_variable_test.go +++ b/actor/v7action/environment_variable_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/event.go b/actor/v7action/event.go index addf22250d..33676b9f07 100644 --- a/actor/v7action/event.go +++ b/actor/v7action/event.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/util/generic" ) type Event struct { diff --git a/actor/v7action/event_test.go b/actor/v7action/event_test.go index 96e58ad320..2ed5405e82 100644 --- a/actor/v7action/event_test.go +++ b/actor/v7action/event_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/feature_flag.go b/actor/v7action/feature_flag.go index 00b97402fb..983f85165c 100644 --- a/actor/v7action/feature_flag.go +++ b/actor/v7action/feature_flag.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/resources" ) // GetFeatureFlagByName returns a featureFlag with the provided name. diff --git a/actor/v7action/feature_flag_test.go b/actor/v7action/feature_flag_test.go index 9bee3c3f21..ee2dbd3623 100644 --- a/actor/v7action/feature_flag_test.go +++ b/actor/v7action/feature_flag_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/info.go b/actor/v7action/info.go index 723c1b5852..fa3c8f2e72 100644 --- a/actor/v7action/info.go +++ b/actor/v7action/info.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" type Info ccv3.Info diff --git a/actor/v7action/info_test.go b/actor/v7action/info_test.go index ed4324db5c..a8c0f9261d 100644 --- a/actor/v7action/info_test.go +++ b/actor/v7action/info_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/isolation_segment.go b/actor/v7action/isolation_segment.go index 72c0e0d590..a0fa3ae946 100644 --- a/actor/v7action/isolation_segment.go +++ b/actor/v7action/isolation_segment.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) type IsolationSegmentSummary struct { diff --git a/actor/v7action/isolation_segment_test.go b/actor/v7action/isolation_segment_test.go index 9c2fcfbf3a..f1569e8349 100644 --- a/actor/v7action/isolation_segment_test.go +++ b/actor/v7action/isolation_segment_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/job.go b/actor/v7action/job.go index 03244778eb..d9558f9e18 100644 --- a/actor/v7action/job.go +++ b/actor/v7action/job.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) type JobState constant.JobState diff --git a/actor/v7action/job_test.go b/actor/v7action/job_test.go index 004b8b6057..bfe10768e8 100644 --- a/actor/v7action/job_test.go +++ b/actor/v7action/job_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/k8s_auth.go b/actor/v7action/k8s_auth.go index bbbfadb905..aac1e2be75 100644 --- a/actor/v7action/k8s_auth.go +++ b/actor/v7action/k8s_auth.go @@ -5,11 +5,11 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/actor/v7action/k8s_auth_test.go b/actor/v7action/k8s_auth_test.go index c404752490..f2db96bcc4 100644 --- a/actor/v7action/k8s_auth_test.go +++ b/actor/v7action/k8s_auth_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/actor/v7action/label.go b/actor/v7action/label.go index 5ed9845e86..4d6a0a00e6 100644 --- a/actor/v7action/label.go +++ b/actor/v7action/label.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) func (actor *Actor) GetApplicationLabels(appName string, spaceGUID string) (map[string]types.NullString, Warnings, error) { diff --git a/actor/v7action/label_test.go b/actor/v7action/label_test.go index bb5b8471b0..42fa796c7c 100644 --- a/actor/v7action/label_test.go +++ b/actor/v7action/label_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/logging.go b/actor/v7action/logging.go index 5c77b2d159..ac05671394 100644 --- a/actor/v7action/logging.go +++ b/actor/v7action/logging.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" "github.com/SermoDigital/jose/jws" ) diff --git a/actor/v7action/logging_test.go b/actor/v7action/logging_test.go index 2ce49da8f4..68fd8ab4ab 100644 --- a/actor/v7action/logging_test.go +++ b/actor/v7action/logging_test.go @@ -5,12 +5,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" . "github.com/onsi/ginkgo/v2" diff --git a/actor/v7action/marketplace.go b/actor/v7action/marketplace.go index cc6f3a3ffb..bf4830dfec 100644 --- a/actor/v7action/marketplace.go +++ b/actor/v7action/marketplace.go @@ -1,7 +1,7 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" ) type ServiceOfferingWithPlans ccv3.ServiceOfferingWithPlans diff --git a/actor/v7action/marketplace_test.go b/actor/v7action/marketplace_test.go index d74282ad50..cee3fd1600 100644 --- a/actor/v7action/marketplace_test.go +++ b/actor/v7action/marketplace_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization.go b/actor/v7action/organization.go index ef320f53c4..1ebed1b9d0 100644 --- a/actor/v7action/organization.go +++ b/actor/v7action/organization.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) GetOrganizations(labelSelector string) ([]resources.Organization, Warnings, error) { diff --git a/actor/v7action/organization_quota.go b/actor/v7action/organization_quota.go index 0384e25cbe..b76e4cdd03 100644 --- a/actor/v7action/organization_quota.go +++ b/actor/v7action/organization_quota.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) type QuotaLimits struct { diff --git a/actor/v7action/organization_quota_test.go b/actor/v7action/organization_quota_test.go index 6b8e5defba..5552a41b2a 100644 --- a/actor/v7action/organization_quota_test.go +++ b/actor/v7action/organization_quota_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization_summary.go b/actor/v7action/organization_summary.go index 2fdc28c4a0..5553acf96b 100644 --- a/actor/v7action/organization_summary.go +++ b/actor/v7action/organization_summary.go @@ -3,7 +3,7 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/resources" ) type OrganizationSummary struct { diff --git a/actor/v7action/organization_summary_test.go b/actor/v7action/organization_summary_test.go index 9ee72781a0..8445d9b40b 100644 --- a/actor/v7action/organization_summary_test.go +++ b/actor/v7action/organization_summary_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" diff --git a/actor/v7action/organization_test.go b/actor/v7action/organization_test.go index f3175ba2e4..efeb65de65 100644 --- a/actor/v7action/organization_test.go +++ b/actor/v7action/organization_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/package.go b/actor/v7action/package.go index 8a0ff9aef1..d0ef95550c 100644 --- a/actor/v7action/package.go +++ b/actor/v7action/package.go @@ -5,11 +5,11 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/package_test.go b/actor/v7action/package_test.go index e4612e3992..80afcb9783 100644 --- a/actor/v7action/package_test.go +++ b/actor/v7action/package_test.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/process.go b/actor/v7action/process.go index c25884e94c..b9fbd90ecd 100644 --- a/actor/v7action/process.go +++ b/actor/v7action/process.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) GetProcess(processGUID string) (resources.Process, Warnings, error) { diff --git a/actor/v7action/process_health_check.go b/actor/v7action/process_health_check.go index 51f2edb57f..90e25b4a9c 100644 --- a/actor/v7action/process_health_check.go +++ b/actor/v7action/process_health_check.go @@ -3,7 +3,7 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) type ProcessHealthCheck struct { diff --git a/actor/v7action/process_health_check_test.go b/actor/v7action/process_health_check_test.go index 3ba1df8deb..97e15d08f1 100644 --- a/actor/v7action/process_health_check_test.go +++ b/actor/v7action/process_health_check_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_instance.go b/actor/v7action/process_instance.go index 53938990a2..cefa44757c 100644 --- a/actor/v7action/process_instance.go +++ b/actor/v7action/process_instance.go @@ -3,11 +3,11 @@ package v7action import ( "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) type ProcessInstance ccv3.ProcessInstance diff --git a/actor/v7action/process_instance_test.go b/actor/v7action/process_instance_test.go index f884c2a33c..52b27cf7f0 100644 --- a/actor/v7action/process_instance_test.go +++ b/actor/v7action/process_instance_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_summary.go b/actor/v7action/process_summary.go index 72f1e9aa66..1ed1b49234 100644 --- a/actor/v7action/process_summary.go +++ b/actor/v7action/process_summary.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/process_summary_test.go b/actor/v7action/process_summary_test.go index f34a5ec281..31b6c20f32 100644 --- a/actor/v7action/process_summary_test.go +++ b/actor/v7action/process_summary_test.go @@ -1,9 +1,9 @@ package v7action_test import ( - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/process_test.go b/actor/v7action/process_test.go index 256dbf33a2..32f5172a73 100644 --- a/actor/v7action/process_test.go +++ b/actor/v7action/process_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v7action/resource_match.go b/actor/v7action/resource_match.go index dc5db1c342..7251d33c30 100644 --- a/actor/v7action/resource_match.go +++ b/actor/v7action/resource_match.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/resource_match_test.go b/actor/v7action/resource_match_test.go index 688cf38790..f508dde21b 100644 --- a/actor/v7action/resource_match_test.go +++ b/actor/v7action/resource_match_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/revisions.go b/actor/v7action/revisions.go index c2109c8f95..f533227003 100644 --- a/actor/v7action/revisions.go +++ b/actor/v7action/revisions.go @@ -3,11 +3,11 @@ package v7action import ( "strconv" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/versioncheck" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/versioncheck" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" ) const MinimumCCAPIVersionForDeployable = "3.86.0" diff --git a/actor/v7action/revisions_test.go b/actor/v7action/revisions_test.go index 61e8b96eab..fad63c8ad1 100644 --- a/actor/v7action/revisions_test.go +++ b/actor/v7action/revisions_test.go @@ -4,12 +4,12 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/role.go b/actor/v7action/role.go index 316f1bb531..9fe786cfa7 100644 --- a/actor/v7action/role.go +++ b/actor/v7action/role.go @@ -1,11 +1,11 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) CreateOrgRole(roleType constant.RoleType, orgGUID string, userNameOrGUID string, userOrigin string, isClient bool) (Warnings, error) { diff --git a/actor/v7action/role_test.go b/actor/v7action/role_test.go index ed55668919..85bad2b4e0 100644 --- a/actor/v7action/role_test.go +++ b/actor/v7action/role_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/route.go b/actor/v7action/route.go index 7bccf6bdb3..6f2ac4e288 100644 --- a/actor/v7action/route.go +++ b/actor/v7action/route.go @@ -5,16 +5,16 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/extract" - "code.cloudfoundry.org/cli/util/lookuptable" - "code.cloudfoundry.org/cli/util/railway" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v8/util/extract" + "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v8/util/sorting" ) type RouteSummary struct { diff --git a/actor/v7action/route_binding.go b/actor/v7action/route_binding.go index b5e5c3b9cd..ed471d34ac 100644 --- a/actor/v7action/route_binding.go +++ b/actor/v7action/route_binding.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/railway" ) type CreateRouteBindingParams struct { diff --git a/actor/v7action/route_binding_test.go b/actor/v7action/route_binding_test.go index c8e32c68aa..ef926c0a00 100644 --- a/actor/v7action/route_binding_test.go +++ b/actor/v7action/route_binding_test.go @@ -1,15 +1,15 @@ package v7action_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/route_test.go b/actor/v7action/route_test.go index 1143b1c128..e323487b6a 100644 --- a/actor/v7action/route_test.go +++ b/actor/v7action/route_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/router_group.go b/actor/v7action/router_group.go index 2be81f31ae..0a19c612d6 100644 --- a/actor/v7action/router_group.go +++ b/actor/v7action/router_group.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/api/router/routererror" ) type RouterGroup router.RouterGroup diff --git a/actor/v7action/router_group_test.go b/actor/v7action/router_group_test.go index 6892bad5b7..8301dd2a66 100644 --- a/actor/v7action/router_group_test.go +++ b/actor/v7action/router_group_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/api/router/routererror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/routing_client.go b/actor/v7action/routing_client.go index 2922959161..37019d9637 100644 --- a/actor/v7action/routing_client.go +++ b/actor/v7action/routing_client.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/api/router" +import "code.cloudfoundry.org/cli/v8/api/router" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RoutingClient diff --git a/actor/v7action/security_group.go b/actor/v7action/security_group.go index fa09b9fa43..825146f028 100644 --- a/actor/v7action/security_group.go +++ b/actor/v7action/security_group.go @@ -5,13 +5,13 @@ import ( "io" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v8/util/lookuptable" ) type SecurityGroupSummary struct { diff --git a/actor/v7action/security_group_test.go b/actor/v7action/security_group_test.go index f27e20434e..73cbd5cfed 100644 --- a/actor/v7action/security_group_test.go +++ b/actor/v7action/security_group_test.go @@ -6,14 +6,14 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_access.go b/actor/v7action/service_access.go index 7f32b7736c..e1bc5b1b44 100644 --- a/actor/v7action/service_access.go +++ b/actor/v7action/service_access.go @@ -5,9 +5,9 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) type ServicePlanWithSpaceAndOrganization ccv3.ServicePlanWithSpaceAndOrganization diff --git a/actor/v7action/service_access_test.go b/actor/v7action/service_access_test.go index c3f11c0090..da7025651b 100644 --- a/actor/v7action/service_access_test.go +++ b/actor/v7action/service_access_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_app_binding.go b/actor/v7action/service_app_binding.go index ac108f7f39..7ff7f47102 100644 --- a/actor/v7action/service_app_binding.go +++ b/actor/v7action/service_app_binding.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/railway" ) type CreateServiceAppBindingParams struct { diff --git a/actor/v7action/service_app_binding_test.go b/actor/v7action/service_app_binding_test.go index 16ad716199..cf0c79083a 100644 --- a/actor/v7action/service_app_binding_test.go +++ b/actor/v7action/service_app_binding_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_broker.go b/actor/v7action/service_broker.go index 2d607d143e..6b6da0f637 100644 --- a/actor/v7action/service_broker.go +++ b/actor/v7action/service_broker.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/railway" ) func (actor Actor) GetServiceBrokers() ([]resources.ServiceBroker, Warnings, error) { diff --git a/actor/v7action/service_broker_test.go b/actor/v7action/service_broker_test.go index b5b0d08bc6..3db82caba1 100644 --- a/actor/v7action/service_broker_test.go +++ b/actor/v7action/service_broker_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance.go b/actor/v7action/service_instance.go index 616becf7a6..f7766e38d5 100644 --- a/actor/v7action/service_instance.go +++ b/actor/v7action/service_instance.go @@ -1,13 +1,13 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/railway" ) type UpdateManagedServiceInstanceParams struct { diff --git a/actor/v7action/service_instance_details.go b/actor/v7action/service_instance_details.go index 80597c0fc4..b73ce83d60 100644 --- a/actor/v7action/service_instance_details.go +++ b/actor/v7action/service_instance_details.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/extract" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/extract" + "code.cloudfoundry.org/cli/v8/util/railway" ) const featureFlagServiceInstanceSharing string = "service_instance_sharing" diff --git a/actor/v7action/service_instance_details_test.go b/actor/v7action/service_instance_details_test.go index 95c57ef3c0..d5f6192055 100644 --- a/actor/v7action/service_instance_details_test.go +++ b/actor/v7action/service_instance_details_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance_list.go b/actor/v7action/service_instance_list.go index d090b6ba5f..3f1a17d5a0 100644 --- a/actor/v7action/service_instance_list.go +++ b/actor/v7action/service_instance_list.go @@ -3,13 +3,13 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/batcher" - "code.cloudfoundry.org/cli/util/extract" - "code.cloudfoundry.org/cli/util/lookuptable" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v8/util/extract" + "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v8/util/railway" ) type ServiceInstance struct { diff --git a/actor/v7action/service_instance_list_test.go b/actor/v7action/service_instance_list_test.go index 9e922d49bb..1503d0d909 100644 --- a/actor/v7action/service_instance_list_test.go +++ b/actor/v7action/service_instance_list_test.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/batcher" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance_sharing.go b/actor/v7action/service_instance_sharing.go index d02118579d..ade1b0db83 100644 --- a/actor/v7action/service_instance_sharing.go +++ b/actor/v7action/service_instance_sharing.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/railway" ) type ServiceInstanceSharingParams struct { diff --git a/actor/v7action/service_instance_sharing_test.go b/actor/v7action/service_instance_sharing_test.go index 8a36e430ae..baff552e42 100644 --- a/actor/v7action/service_instance_sharing_test.go +++ b/actor/v7action/service_instance_sharing_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "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 20e439e1c9..dbb52e32db 100644 --- a/actor/v7action/service_instance_test.go +++ b/actor/v7action/service_instance_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_key.go b/actor/v7action/service_key.go index 7c6989000b..0940cbbd80 100644 --- a/actor/v7action/service_key.go +++ b/actor/v7action/service_key.go @@ -3,12 +3,12 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/railway" ) type CreateServiceKeyParams struct { diff --git a/actor/v7action/service_key_test.go b/actor/v7action/service_key_test.go index f30d764bdd..c1b82221a2 100644 --- a/actor/v7action/service_key_test.go +++ b/actor/v7action/service_key_test.go @@ -1,15 +1,15 @@ package v7action_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_offering.go b/actor/v7action/service_offering.go index 0b61ec4b14..7a04c17f2a 100644 --- a/actor/v7action/service_offering.go +++ b/actor/v7action/service_offering.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/railway" ) func (actor Actor) PurgeServiceOfferingByNameAndBroker(serviceOfferingName, serviceBrokerName string) (Warnings, error) { diff --git a/actor/v7action/service_offering_test.go b/actor/v7action/service_offering_test.go index add0f64e30..0d9c7ff3c9 100644 --- a/actor/v7action/service_offering_test.go +++ b/actor/v7action/service_offering_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/service_plan.go b/actor/v7action/service_plan.go index 0fcd237348..27ca44562d 100644 --- a/actor/v7action/service_plan.go +++ b/actor/v7action/service_plan.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) GetServicePlanByNameOfferingAndBroker(servicePlanName, serviceOfferingName, serviceBrokerName string) (resources.ServicePlan, Warnings, error) { diff --git a/actor/v7action/service_plan_test.go b/actor/v7action/service_plan_test.go index 8c58f426fd..2366797b78 100644 --- a/actor/v7action/service_plan_test.go +++ b/actor/v7action/service_plan_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/shared_actor.go b/actor/v7action/shared_actor.go index 95dab5aea2..ecc441a4a1 100644 --- a/actor/v7action/shared_actor.go +++ b/actor/v7action/shared_actor.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/actor/sharedaction" +import "code.cloudfoundry.org/cli/v8/actor/sharedaction" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedActor diff --git a/actor/v7action/space.go b/actor/v7action/space.go index 3f38c0a911..e788fc6abc 100644 --- a/actor/v7action/space.go +++ b/actor/v7action/space.go @@ -4,11 +4,11 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" ) type SpaceSummary struct { diff --git a/actor/v7action/space_feature.go b/actor/v7action/space_feature.go index d60a8d8a10..a67c838c6a 100644 --- a/actor/v7action/space_feature.go +++ b/actor/v7action/space_feature.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/actor/actionerror" +import "code.cloudfoundry.org/cli/v8/actor/actionerror" func (actor Actor) UpdateSpaceFeature(spaceName string, orgGUID string, enabled bool, feature string) (Warnings, error) { var allWarnings Warnings diff --git a/actor/v7action/space_feature_test.go b/actor/v7action/space_feature_test.go index 9d1b1ad8ca..1895f40ae0 100644 --- a/actor/v7action/space_feature_test.go +++ b/actor/v7action/space_feature_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/resources" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_manifest.go b/actor/v7action/space_manifest.go index 763ccfc12f..9c6c163679 100644 --- a/actor/v7action/space_manifest.go +++ b/actor/v7action/space_manifest.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) DiffSpaceManifest(spaceGUID string, rawManifest []byte) (resources.ManifestDiff, Warnings, error) { diff --git a/actor/v7action/space_manifest_test.go b/actor/v7action/space_manifest_test.go index bb83846c73..22321120ee 100644 --- a/actor/v7action/space_manifest_test.go +++ b/actor/v7action/space_manifest_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/space_quota.go b/actor/v7action/space_quota.go index 59d351aaf5..3590d4a278 100644 --- a/actor/v7action/space_quota.go +++ b/actor/v7action/space_quota.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) ApplySpaceQuotaByName(quotaName, spaceGUID, orgGUID string) (Warnings, error) { diff --git a/actor/v7action/space_quota_test.go b/actor/v7action/space_quota_test.go index 90eb40bc1a..18e249bee6 100644 --- a/actor/v7action/space_quota_test.go +++ b/actor/v7action/space_quota_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_test.go b/actor/v7action/space_test.go index fe87240e72..358ecb9308 100644 --- a/actor/v7action/space_test.go +++ b/actor/v7action/space_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/ssh.go b/actor/v7action/ssh.go index 30fcc6ff9e..6516db2a28 100644 --- a/actor/v7action/ssh.go +++ b/actor/v7action/ssh.go @@ -3,8 +3,8 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/resources" ) type SSHAuthentication struct { diff --git a/actor/v7action/ssh_actor.go b/actor/v7action/ssh_actor.go index 84fd26091e..82db1ae4ff 100644 --- a/actor/v7action/ssh_actor.go +++ b/actor/v7action/ssh_actor.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/actor/sharedaction" +import "code.cloudfoundry.org/cli/v8/actor/sharedaction" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHActor diff --git a/actor/v7action/ssh_test.go b/actor/v7action/ssh_test.go index e41dd38fd5..14eed7e020 100644 --- a/actor/v7action/ssh_test.go +++ b/actor/v7action/ssh_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/stack.go b/actor/v7action/stack.go index e27ef3ae26..d0b9889ff2 100644 --- a/actor/v7action/stack.go +++ b/actor/v7action/stack.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor *Actor) GetStackByName(stackName string) (resources.Stack, Warnings, error) { diff --git a/actor/v7action/stack_test.go b/actor/v7action/stack_test.go index d92989ecbb..92e6abdc8b 100644 --- a/actor/v7action/stack_test.go +++ b/actor/v7action/stack_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/target.go b/actor/v7action/target.go index a63a02711c..89b8a1f15e 100644 --- a/actor/v7action/target.go +++ b/actor/v7action/target.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type TargetSettings ccv3.TargetSettings diff --git a/actor/v7action/target_test.go b/actor/v7action/target_test.go index 0d036efc8e..4e0e67dd4c 100644 --- a/actor/v7action/target_test.go +++ b/actor/v7action/target_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/task.go b/actor/v7action/task.go index cdebf7d7c7..6355c5649a 100644 --- a/actor/v7action/task.go +++ b/actor/v7action/task.go @@ -5,11 +5,11 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/task_test.go b/actor/v7action/task_test.go index a8df6f2eba..67d7dda72f 100644 --- a/actor/v7action/task_test.go +++ b/actor/v7action/task_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/token_test.go b/actor/v7action/token_test.go index 22dc83a055..5e12794a0c 100644 --- a/actor/v7action/token_test.go +++ b/actor/v7action/token_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/uaa_client.go b/actor/v7action/uaa_client.go index e11903e8d3..8ff711b18e 100644 --- a/actor/v7action/uaa_client.go +++ b/actor/v7action/uaa_client.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/actor/v7action/user.go b/actor/v7action/user.go index ceee43a9d9..eb3db0feed 100644 --- a/actor/v7action/user.go +++ b/actor/v7action/user.go @@ -3,10 +3,10 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateUser creates a new user in UAA and registers it with cloud controller. diff --git a/actor/v7action/user_test.go b/actor/v7action/user_test.go index 9e1aebec33..6b4ac0f38a 100644 --- a/actor/v7action/user_test.go +++ b/actor/v7action/user_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/resources" . "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 10e8c89310..0c2b1872a9 100644 --- a/actor/v7action/v7action_suite_test.go +++ b/actor/v7action/v7action_suite_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go index 942728edbd..73b8debea2 100644 --- a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go +++ b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go @@ -6,11 +6,11 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) type FakeCloudControllerClient struct { diff --git a/actor/v7action/v7actionfakes/fake_config.go b/actor/v7action/v7actionfakes/fake_config.go index 9bbf83bc71..d6b03550f0 100644 --- a/actor/v7action/v7actionfakes/fake_config.go +++ b/actor/v7action/v7actionfakes/fake_config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type FakeConfig struct { diff --git a/actor/v7action/v7actionfakes/fake_downloader.go b/actor/v7action/v7actionfakes/fake_downloader.go index f0cb1f7590..862f6b3a5b 100644 --- a/actor/v7action/v7actionfakes/fake_downloader.go +++ b/actor/v7action/v7actionfakes/fake_downloader.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action" ) type FakeDownloader struct { diff --git a/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go b/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go index f22933d1bb..c2cadd17a0 100644 --- a/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go +++ b/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action" "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/actor/v7action/v7actionfakes/fake_manifest_parser.go b/actor/v7action/v7actionfakes/fake_manifest_parser.go index 6f0275be7b..9fbc49ea50 100644 --- a/actor/v7action/v7actionfakes/fake_manifest_parser.go +++ b/actor/v7action/v7actionfakes/fake_manifest_parser.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action" ) type FakeManifestParser struct { diff --git a/actor/v7action/v7actionfakes/fake_routing_client.go b/actor/v7action/v7actionfakes/fake_routing_client.go index 873d4834a3..23da578b2f 100644 --- a/actor/v7action/v7actionfakes/fake_routing_client.go +++ b/actor/v7action/v7actionfakes/fake_routing_client.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/router" ) type FakeRoutingClient struct { diff --git a/actor/v7action/v7actionfakes/fake_shared_actor.go b/actor/v7action/v7actionfakes/fake_shared_actor.go index 5a2ff877ab..db3cad3249 100644 --- a/actor/v7action/v7actionfakes/fake_shared_actor.go +++ b/actor/v7action/v7actionfakes/fake_shared_actor.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" ) type FakeSharedActor struct { diff --git a/actor/v7action/v7actionfakes/fake_simple_progress_bar.go b/actor/v7action/v7actionfakes/fake_simple_progress_bar.go index 41cf5a49c6..8de838e234 100644 --- a/actor/v7action/v7actionfakes/fake_simple_progress_bar.go +++ b/actor/v7action/v7actionfakes/fake_simple_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action" ) type FakeSimpleProgressBar struct { diff --git a/actor/v7action/v7actionfakes/fake_sshactor.go b/actor/v7action/v7actionfakes/fake_sshactor.go index c3179aa0a0..35336514d8 100644 --- a/actor/v7action/v7actionfakes/fake_sshactor.go +++ b/actor/v7action/v7actionfakes/fake_sshactor.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" ) type FakeSSHActor struct { diff --git a/actor/v7action/v7actionfakes/fake_uaaclient.go b/actor/v7action/v7actionfakes/fake_uaaclient.go index 2924db8515..06cea0793f 100644 --- a/actor/v7action/v7actionfakes/fake_uaaclient.go +++ b/actor/v7action/v7actionfakes/fake_uaaclient.go @@ -4,9 +4,9 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" ) type FakeUAAClient struct { diff --git a/actor/v7action/v7actionfakes/fake_who_am_ier.go b/actor/v7action/v7actionfakes/fake_who_am_ier.go index 0d1eb42bac..2ebcfe961d 100644 --- a/actor/v7action/v7actionfakes/fake_who_am_ier.go +++ b/actor/v7action/v7actionfakes/fake_who_am_ier.go @@ -4,9 +4,9 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" ) type FakeWhoAmIer struct { diff --git a/actor/v7action/version_test.go b/actor/v7action/version_test.go index 86226e25ed..2d6f8a5d1d 100644 --- a/actor/v7action/version_test.go +++ b/actor/v7action/version_test.go @@ -1,8 +1,8 @@ package v7action_test import ( - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" + . "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/actor_test.go b/actor/v7pushaction/actor_test.go index 32f314564a..680147be2a 100644 --- a/actor/v7pushaction/actor_test.go +++ b/actor/v7pushaction/actor_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/actualize_test.go b/actor/v7pushaction/actualize_test.go index b1e91a08c4..434a6d01b6 100644 --- a/actor/v7pushaction/actualize_test.go +++ b/actor/v7pushaction/actualize_test.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_bits_package_for_application.go b/actor/v7pushaction/create_bits_package_for_application.go index bc40f05f58..811d56888e 100644 --- a/actor/v7pushaction/create_bits_package_for_application.go +++ b/actor/v7pushaction/create_bits_package_for_application.go @@ -3,11 +3,11 @@ package v7pushaction import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7pushaction/create_bits_package_for_application_test.go b/actor/v7pushaction/create_bits_package_for_application_test.go index 40e96523c4..946636434f 100644 --- a/actor/v7pushaction/create_bits_package_for_application_test.go +++ b/actor/v7pushaction/create_bits_package_for_application_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_deployment_for_push_plan.go b/actor/v7pushaction/create_deployment_for_push_plan.go index 5b23178c3a..029cdc68c3 100644 --- a/actor/v7pushaction/create_deployment_for_push_plan.go +++ b/actor/v7pushaction/create_deployment_for_push_plan.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" ) func (actor Actor) CreateDeploymentForApplication(pushPlan PushPlan, eventStream chan<- *PushEvent, progressBar ProgressBar) (PushPlan, Warnings, error) { diff --git a/actor/v7pushaction/create_deployment_for_push_plan_test.go b/actor/v7pushaction/create_deployment_for_push_plan_test.go index 46031d80dc..1191c433f2 100644 --- a/actor/v7pushaction/create_deployment_for_push_plan_test.go +++ b/actor/v7pushaction/create_deployment_for_push_plan_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "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 29c8674573..9870378cf7 100644 --- a/actor/v7pushaction/create_docker_package_for_application_test.go +++ b/actor/v7pushaction/create_docker_package_for_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v7pushaction/create_droplet_for_application.go b/actor/v7pushaction/create_droplet_for_application.go index 705d8227cc..a2186883d9 100644 --- a/actor/v7pushaction/create_droplet_for_application.go +++ b/actor/v7pushaction/create_droplet_for_application.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" ) const UploadRetries = 3 diff --git a/actor/v7pushaction/create_droplet_for_application_test.go b/actor/v7pushaction/create_droplet_for_application_test.go index c13603276a..af1d259364 100644 --- a/actor/v7pushaction/create_droplet_for_application_test.go +++ b/actor/v7pushaction/create_droplet_for_application_test.go @@ -4,12 +4,12 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_push_plans.go b/actor/v7pushaction/create_push_plans.go index 7c656d0506..9158dfea7f 100644 --- a/actor/v7pushaction/create_push_plans.go +++ b/actor/v7pushaction/create_push_plans.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) // CreatePushPlans returns a set of PushPlan objects based off the inputs diff --git a/actor/v7pushaction/create_push_plans_test.go b/actor/v7pushaction/create_push_plans_test.go index 9b8040935a..a64668f742 100644 --- a/actor/v7pushaction/create_push_plans_test.go +++ b/actor/v7pushaction/create_push_plans_test.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_app_name_override.go b/actor/v7pushaction/handle_app_name_override.go index 329a312934..2236e35891 100644 --- a/actor/v7pushaction/handle_app_name_override.go +++ b/actor/v7pushaction/handle_app_name_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleAppNameOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_app_name_override_test.go b/actor/v7pushaction/handle_app_name_override_test.go index 8d58871ce3..0e99ffb59c 100644 --- a/actor/v7pushaction/handle_app_name_override_test.go +++ b/actor/v7pushaction/handle_app_name_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_app_path_override.go b/actor/v7pushaction/handle_app_path_override.go index c10ace982d..ff2a2e8e5f 100644 --- a/actor/v7pushaction/handle_app_path_override.go +++ b/actor/v7pushaction/handle_app_path_override.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) // Overrides the path if path is given. Changes empty paths to pwd. Validates paths diff --git a/actor/v7pushaction/handle_app_path_override_test.go b/actor/v7pushaction/handle_app_path_override_test.go index 20f3d8496f..8baca7cb5f 100644 --- a/actor/v7pushaction/handle_app_path_override_test.go +++ b/actor/v7pushaction/handle_app_path_override_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "runtime" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_buildpacks_override.go b/actor/v7pushaction/handle_buildpacks_override.go index 669d04ab01..4408a1c887 100644 --- a/actor/v7pushaction/handle_buildpacks_override.go +++ b/actor/v7pushaction/handle_buildpacks_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleBuildpacksOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_buildpacks_override_test.go b/actor/v7pushaction/handle_buildpacks_override_test.go index 49c6bc6569..762d40a353 100644 --- a/actor/v7pushaction/handle_buildpacks_override_test.go +++ b/actor/v7pushaction/handle_buildpacks_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_cnb_credentials_override.go b/actor/v7pushaction/handle_cnb_credentials_override.go index 8fa212aab4..85adf2d3c7 100644 --- a/actor/v7pushaction/handle_cnb_credentials_override.go +++ b/actor/v7pushaction/handle_cnb_credentials_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleCNBCredentialsOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_cnb_credentials_override_test.go b/actor/v7pushaction/handle_cnb_credentials_override_test.go index 87a1117de0..878fb8e363 100644 --- a/actor/v7pushaction/handle_cnb_credentials_override_test.go +++ b/actor/v7pushaction/handle_cnb_credentials_override_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_default_route_override.go b/actor/v7pushaction/handle_default_route_override.go index fb664ea0c3..da907e868e 100644 --- a/actor/v7pushaction/handle_default_route_override.go +++ b/actor/v7pushaction/handle_default_route_override.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleDefaultRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_default_route_override_test.go b/actor/v7pushaction/handle_default_route_override_test.go index cc94e9ad9f..b9486f6953 100644 --- a/actor/v7pushaction/handle_default_route_override_test.go +++ b/actor/v7pushaction/handle_default_route_override_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_disk_override.go b/actor/v7pushaction/handle_disk_override.go index 47adb500fd..df676cfbd5 100644 --- a/actor/v7pushaction/handle_disk_override.go +++ b/actor/v7pushaction/handle_disk_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleDiskOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_disk_override_test.go b/actor/v7pushaction/handle_disk_override_test.go index 3b139bd072..ef3f6201ba 100644 --- a/actor/v7pushaction/handle_disk_override_test.go +++ b/actor/v7pushaction/handle_disk_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_docker_image_override.go b/actor/v7pushaction/handle_docker_image_override.go index 9190bca816..715f18c84c 100644 --- a/actor/v7pushaction/handle_docker_image_override.go +++ b/actor/v7pushaction/handle_docker_image_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleDockerImageOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_docker_image_override_test.go b/actor/v7pushaction/handle_docker_image_override_test.go index 9c7c231053..13e10f7329 100644 --- a/actor/v7pushaction/handle_docker_image_override_test.go +++ b/actor/v7pushaction/handle_docker_image_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_docker_username_override.go b/actor/v7pushaction/handle_docker_username_override.go index b9c31ad3e5..5c0eb29d02 100644 --- a/actor/v7pushaction/handle_docker_username_override.go +++ b/actor/v7pushaction/handle_docker_username_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleDockerUsernameOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_docker_username_override_test.go b/actor/v7pushaction/handle_docker_username_override_test.go index 0dd9a1cd38..13a8234101 100644 --- a/actor/v7pushaction/handle_docker_username_override_test.go +++ b/actor/v7pushaction/handle_docker_username_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_droplet_path_override.go b/actor/v7pushaction/handle_droplet_path_override.go index 8a5e97e8a7..46971f8e12 100644 --- a/actor/v7pushaction/handle_droplet_path_override.go +++ b/actor/v7pushaction/handle_droplet_path_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleDropletPathOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_droplet_path_override_test.go b/actor/v7pushaction/handle_droplet_path_override_test.go index 2c0dfdf5e1..5985960a68 100644 --- a/actor/v7pushaction/handle_droplet_path_override_test.go +++ b/actor/v7pushaction/handle_droplet_path_override_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_flag_override_func.go b/actor/v7pushaction/handle_flag_override_func.go index dc382117c9..f5507b2f2b 100644 --- a/actor/v7pushaction/handle_flag_override_func.go +++ b/actor/v7pushaction/handle_flag_override_func.go @@ -1,5 +1,5 @@ package v7pushaction -import "code.cloudfoundry.org/cli/util/manifestparser" +import "code.cloudfoundry.org/cli/v8/util/manifestparser" type HandleFlagOverrideFunc func(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) diff --git a/actor/v7pushaction/handle_flag_overrides.go b/actor/v7pushaction/handle_flag_overrides.go index 0b140d98b7..5b23a94325 100644 --- a/actor/v7pushaction/handle_flag_overrides.go +++ b/actor/v7pushaction/handle_flag_overrides.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func (actor Actor) HandleFlagOverrides( diff --git a/actor/v7pushaction/handle_flag_overrides_test.go b/actor/v7pushaction/handle_flag_overrides_test.go index a50450b004..8e944cba32 100644 --- a/actor/v7pushaction/handle_flag_overrides_test.go +++ b/actor/v7pushaction/handle_flag_overrides_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_health_check_endpoint_override.go b/actor/v7pushaction/handle_health_check_endpoint_override.go index ab9659ac7d..fe101ae0d4 100644 --- a/actor/v7pushaction/handle_health_check_endpoint_override.go +++ b/actor/v7pushaction/handle_health_check_endpoint_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleHealthCheckEndpointOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_endpoint_override_test.go b/actor/v7pushaction/handle_health_check_endpoint_override_test.go index c3cbac2ed7..f117da6513 100644 --- a/actor/v7pushaction/handle_health_check_endpoint_override_test.go +++ b/actor/v7pushaction/handle_health_check_endpoint_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_health_check_timeout_override.go b/actor/v7pushaction/handle_health_check_timeout_override.go index b4c6f97718..77616ec9f5 100644 --- a/actor/v7pushaction/handle_health_check_timeout_override.go +++ b/actor/v7pushaction/handle_health_check_timeout_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleHealthCheckTimeoutOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_timeout_override_test.go b/actor/v7pushaction/handle_health_check_timeout_override_test.go index 18fe4c52ea..6a47c22f74 100644 --- a/actor/v7pushaction/handle_health_check_timeout_override_test.go +++ b/actor/v7pushaction/handle_health_check_timeout_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_health_check_type_override.go b/actor/v7pushaction/handle_health_check_type_override.go index e9f0d4091c..29acc84c4e 100644 --- a/actor/v7pushaction/handle_health_check_type_override.go +++ b/actor/v7pushaction/handle_health_check_type_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleHealthCheckTypeOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_type_override_test.go b/actor/v7pushaction/handle_health_check_type_override_test.go index 695f06b6f8..cdbfc7ce1f 100644 --- a/actor/v7pushaction/handle_health_check_type_override_test.go +++ b/actor/v7pushaction/handle_health_check_type_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_instances_override.go b/actor/v7pushaction/handle_instances_override.go index 018ab02e8a..2f1ed64509 100644 --- a/actor/v7pushaction/handle_instances_override.go +++ b/actor/v7pushaction/handle_instances_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleInstancesOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_instances_override_test.go b/actor/v7pushaction/handle_instances_override_test.go index 4b662ce7cf..007441da6d 100644 --- a/actor/v7pushaction/handle_instances_override_test.go +++ b/actor/v7pushaction/handle_instances_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_lifecycle_override.go b/actor/v7pushaction/handle_lifecycle_override.go index 005aa65902..befa869b01 100644 --- a/actor/v7pushaction/handle_lifecycle_override.go +++ b/actor/v7pushaction/handle_lifecycle_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleLifecycleOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_log_rate_limit_override.go b/actor/v7pushaction/handle_log_rate_limit_override.go index 9e80cbfc80..0e6ce5be18 100644 --- a/actor/v7pushaction/handle_log_rate_limit_override.go +++ b/actor/v7pushaction/handle_log_rate_limit_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleLogRateLimitOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_log_rate_limit_override_test.go b/actor/v7pushaction/handle_log_rate_limit_override_test.go index f261703e51..3c5e83aae7 100644 --- a/actor/v7pushaction/handle_log_rate_limit_override_test.go +++ b/actor/v7pushaction/handle_log_rate_limit_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_memory_override.go b/actor/v7pushaction/handle_memory_override.go index 67c12f758b..77ad256f5b 100644 --- a/actor/v7pushaction/handle_memory_override.go +++ b/actor/v7pushaction/handle_memory_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleMemoryOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_memory_override_test.go b/actor/v7pushaction/handle_memory_override_test.go index d301981543..7b4825dc1b 100644 --- a/actor/v7pushaction/handle_memory_override_test.go +++ b/actor/v7pushaction/handle_memory_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_no_route_override.go b/actor/v7pushaction/handle_no_route_override.go index 10d5c170cd..11ff5744f8 100644 --- a/actor/v7pushaction/handle_no_route_override.go +++ b/actor/v7pushaction/handle_no_route_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleNoRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_no_route_override_test.go b/actor/v7pushaction/handle_no_route_override_test.go index 36b547901c..daffcb78d0 100644 --- a/actor/v7pushaction/handle_no_route_override_test.go +++ b/actor/v7pushaction/handle_no_route_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_random_route_override.go b/actor/v7pushaction/handle_random_route_override.go index ba18805c21..a3f069b560 100644 --- a/actor/v7pushaction/handle_random_route_override.go +++ b/actor/v7pushaction/handle_random_route_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleRandomRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_random_route_override_test.go b/actor/v7pushaction/handle_random_route_override_test.go index 566ee226f9..d4e7c95e3a 100644 --- a/actor/v7pushaction/handle_random_route_override_test.go +++ b/actor/v7pushaction/handle_random_route_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_stack_override.go b/actor/v7pushaction/handle_stack_override.go index 3087e67cce..4741052d4c 100644 --- a/actor/v7pushaction/handle_stack_override.go +++ b/actor/v7pushaction/handle_stack_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleStackOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_stack_override_test.go b/actor/v7pushaction/handle_stack_override_test.go index a7dd434f7b..af2191a72c 100644 --- a/actor/v7pushaction/handle_stack_override_test.go +++ b/actor/v7pushaction/handle_stack_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_start_command_override.go b/actor/v7pushaction/handle_start_command_override.go index 45dbe8838b..be6a1de2b0 100644 --- a/actor/v7pushaction/handle_start_command_override.go +++ b/actor/v7pushaction/handle_start_command_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleStartCommandOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_start_command_override_test.go b/actor/v7pushaction/handle_start_command_override_test.go index 93df0fa065..b1143bca4d 100644 --- a/actor/v7pushaction/handle_start_command_override_test.go +++ b/actor/v7pushaction/handle_start_command_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_strategy_override.go b/actor/v7pushaction/handle_strategy_override.go index 7501a02427..55ab81bf8a 100644 --- a/actor/v7pushaction/handle_strategy_override.go +++ b/actor/v7pushaction/handle_strategy_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleStrategyOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_strategy_override_test.go b/actor/v7pushaction/handle_strategy_override_test.go index 476636d234..f716b65c8b 100644 --- a/actor/v7pushaction/handle_strategy_override_test.go +++ b/actor/v7pushaction/handle_strategy_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_task_override.go b/actor/v7pushaction/handle_task_override.go index 6d369d8b82..6ab978f7ec 100644 --- a/actor/v7pushaction/handle_task_override.go +++ b/actor/v7pushaction/handle_task_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) func HandleTaskOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_task_override_test.go b/actor/v7pushaction/handle_task_override_test.go index 88700852f0..85e004f385 100644 --- a/actor/v7pushaction/handle_task_override_test.go +++ b/actor/v7pushaction/handle_task_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/push_plan.go b/actor/v7pushaction/push_plan.go index dc4a181e2b..f66dfe18cf 100644 --- a/actor/v7pushaction/push_plan.go +++ b/actor/v7pushaction/push_plan.go @@ -3,11 +3,11 @@ package v7pushaction import ( "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" "github.com/cloudfoundry/bosh-cli/director/template" ) diff --git a/actor/v7pushaction/resource_match.go b/actor/v7pushaction/resource_match.go index dcfb1ebafd..af2e4dabee 100644 --- a/actor/v7pushaction/resource_match.go +++ b/actor/v7pushaction/resource_match.go @@ -1,6 +1,6 @@ package v7pushaction -import "code.cloudfoundry.org/cli/actor/sharedaction" +import "code.cloudfoundry.org/cli/v8/actor/sharedaction" // MatchResources returns back a list of matched and unmatched resources for the provided resources. func (actor Actor) MatchResources(resources []sharedaction.V3Resource) ([]sharedaction.V3Resource, []sharedaction.V3Resource, Warnings, error) { diff --git a/actor/v7pushaction/resource_match_test.go b/actor/v7pushaction/resource_match_test.go index e35c761829..e4fb9a5586 100644 --- a/actor/v7pushaction/resource_match_test.go +++ b/actor/v7pushaction/resource_match_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "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 217ebbbc32..72ccf245ea 100644 --- a/actor/v7pushaction/restart_application_test.go +++ b/actor/v7pushaction/restart_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/sequence.go b/actor/v7pushaction/sequence.go index 1f9aa741a7..b45290174a 100644 --- a/actor/v7pushaction/sequence.go +++ b/actor/v7pushaction/sequence.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) func ShouldCreateBitsPackage(plan PushPlan) bool { diff --git a/actor/v7pushaction/sequence_test.go b/actor/v7pushaction/sequence_test.go index 5274516b04..756611989f 100644 --- a/actor/v7pushaction/sequence_test.go +++ b/actor/v7pushaction/sequence_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/resources" . "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 03ca77503c..2f9c3f727c 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 @@ -1,8 +1,8 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "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 9b543b34cb..ac2c94901b 100644 --- a/actor/v7pushaction/set_droplet_for_application_test.go +++ b/actor/v7pushaction/set_droplet_for_application_test.go @@ -3,10 +3,10 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_all_resources_for_push_plan.go b/actor/v7pushaction/setup_all_resources_for_push_plan.go index e58b9ed546..9c743b056b 100644 --- a/actor/v7pushaction/setup_all_resources_for_push_plan.go +++ b/actor/v7pushaction/setup_all_resources_for_push_plan.go @@ -4,8 +4,8 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) func (actor Actor) SetupAllResourcesForPushPlan(pushPlan PushPlan, overrides FlagOverrides) (PushPlan, error) { 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 cb991961c1..373a22b90c 100644 --- a/actor/v7pushaction/setup_all_resources_for_push_plan_test.go +++ b/actor/v7pushaction/setup_all_resources_for_push_plan_test.go @@ -4,11 +4,11 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/setup_deployment_information_for_push_plan.go b/actor/v7pushaction/setup_deployment_information_for_push_plan.go index 11e4dd26d8..474554e609 100644 --- a/actor/v7pushaction/setup_deployment_information_for_push_plan.go +++ b/actor/v7pushaction/setup_deployment_information_for_push_plan.go @@ -1,6 +1,6 @@ package v7pushaction -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" +import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" func SetupDeploymentInformationForPushPlan(pushPlan PushPlan, overrides FlagOverrides) (PushPlan, error) { pushPlan.Strategy = overrides.Strategy diff --git a/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go b/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go index 14515c9f44..24f5a5d904 100644 --- a/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go +++ b/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "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 f06eeb6d76..e714110064 100644 --- a/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go +++ b/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "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 fa24192cc6..ae224fdf80 100644 --- a/actor/v7pushaction/setup_no_start_for_push_plan_test.go +++ b/actor/v7pushaction/setup_no_start_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "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 3e89800bb1..be6366f4b7 100644 --- a/actor/v7pushaction/setup_no_wait_for_push_plan_test.go +++ b/actor/v7pushaction/setup_no_wait_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "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 17a1bd3ab6..5f2963274d 100644 --- a/actor/v7pushaction/setup_task_app_for_push_plan_test.go +++ b/actor/v7pushaction/setup_task_app_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/shared_actor.go b/actor/v7pushaction/shared_actor.go index cd4efca31b..dc8f9259be 100644 --- a/actor/v7pushaction/shared_actor.go +++ b/actor/v7pushaction/shared_actor.go @@ -3,7 +3,7 @@ package v7pushaction import ( "io" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.ReadCloser diff --git a/actor/v7pushaction/stage_package_for_application_test.go b/actor/v7pushaction/stage_package_for_application_test.go index cfe6a90051..bd09bb9b8a 100644 --- a/actor/v7pushaction/stage_package_for_application_test.go +++ b/actor/v7pushaction/stage_package_for_application_test.go @@ -3,10 +3,10 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/stop_application.go b/actor/v7pushaction/stop_application.go index b6865a2f16..947dbe7f5f 100644 --- a/actor/v7pushaction/stop_application.go +++ b/actor/v7pushaction/stop_application.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7pushaction/stop_application_test.go b/actor/v7pushaction/stop_application_test.go index 04287023c2..1fc37ccd12 100644 --- a/actor/v7pushaction/stop_application_test.go +++ b/actor/v7pushaction/stop_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/v7_actor.go b/actor/v7pushaction/v7_actor.go index 91356c9df4..5b6e5005a6 100644 --- a/actor/v7pushaction/v7_actor.go +++ b/actor/v7pushaction/v7_actor.go @@ -3,9 +3,9 @@ package v7pushaction import ( "io" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V7Actor diff --git a/actor/v7pushaction/v7pushaction_suite_test.go b/actor/v7pushaction/v7pushaction_suite_test.go index 2a68dddff2..050a13f6f4 100644 --- a/actor/v7pushaction/v7pushaction_suite_test.go +++ b/actor/v7pushaction/v7pushaction_suite_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" + . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go b/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go index 9b0a3aa81c..1294227060 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction" ) type FakeProgressBar struct { diff --git a/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go b/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go index 63ba72df44..6244f06f6b 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction" ) type FakeSharedActor struct { diff --git a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go index 76d8d4d185..9de5b3510b 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go @@ -5,10 +5,10 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/resources" ) type FakeV7Actor struct { diff --git a/actor/versioncheck/minimum_version_check_test.go b/actor/versioncheck/minimum_version_check_test.go index 89015dbe12..3f4743e3fc 100644 --- a/actor/versioncheck/minimum_version_check_test.go +++ b/actor/versioncheck/minimum_version_check_test.go @@ -1,7 +1,7 @@ package versioncheck_test import ( - . "code.cloudfoundry.org/cli/actor/versioncheck" + . "code.cloudfoundry.org/cli/v8/actor/versioncheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccerror/multi_error_test.go b/api/cloudcontroller/ccerror/multi_error_test.go index 8b78993bda..a1e40f3c18 100644 --- a/api/cloudcontroller/ccerror/multi_error_test.go +++ b/api/cloudcontroller/ccerror/multi_error_test.go @@ -3,7 +3,7 @@ package ccerror_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" . "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 1bcfe10cc7..a654ca2f12 100644 --- a/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go +++ b/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" . "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 161c2c0bf9..0b122b11d5 100644 --- a/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go +++ b/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/user_not_found.go b/api/cloudcontroller/ccerror/user_not_found.go index 1ed3c3ee6c..13e3a90207 100644 --- a/api/cloudcontroller/ccerror/user_not_found.go +++ b/api/cloudcontroller/ccerror/user_not_found.go @@ -3,7 +3,7 @@ package ccerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // UserNotFoundError is returned when a role does not exist. diff --git a/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go b/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go index 024d896fe1..c40445248a 100644 --- a/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go +++ b/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccerror/v3_job_failed_error.go b/api/cloudcontroller/ccerror/v3_job_failed_error.go index aac4025f08..732cc89873 100644 --- a/api/cloudcontroller/ccerror/v3_job_failed_error.go +++ b/api/cloudcontroller/ccerror/v3_job_failed_error.go @@ -3,7 +3,7 @@ package ccerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // V3JobFailedError represents a failed Cloud Controller Job. It wraps the error diff --git a/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go b/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go index 0a265e85f3..ece7202bfd 100644 --- a/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go +++ b/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go @@ -3,7 +3,7 @@ package ccerror_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/application.go b/api/cloudcontroller/ccv3/application.go index e2530a9b73..8de1d3b1b1 100644 --- a/api/cloudcontroller/ccv3/application.go +++ b/api/cloudcontroller/ccv3/application.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateApplication creates an application with the given settings. diff --git a/api/cloudcontroller/ccv3/application_feature.go b/api/cloudcontroller/ccv3/application_feature.go index ee07cc6cf5..aa4f2ccc4b 100644 --- a/api/cloudcontroller/ccv3/application_feature.go +++ b/api/cloudcontroller/ccv3/application_feature.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) type SSHEnabled struct { diff --git a/api/cloudcontroller/ccv3/application_feature_test.go b/api/cloudcontroller/ccv3/application_feature_test.go index 2b0567169e..0c60b26953 100644 --- a/api/cloudcontroller/ccv3/application_feature_test.go +++ b/api/cloudcontroller/ccv3/application_feature_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "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 46002b20b0..5352fb02e7 100644 --- a/api/cloudcontroller/ccv3/application_test.go +++ b/api/cloudcontroller/ccv3/application_test.go @@ -4,13 +4,13 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/build.go b/api/cloudcontroller/ccv3/build.go index 2c67189218..67e082ee9f 100644 --- a/api/cloudcontroller/ccv3/build.go +++ b/api/cloudcontroller/ccv3/build.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateBuild creates the given build, requires Package GUID to be set on the diff --git a/api/cloudcontroller/ccv3/build_test.go b/api/cloudcontroller/ccv3/build_test.go index c1f9cd0a70..33c799b8ba 100644 --- a/api/cloudcontroller/ccv3/build_test.go +++ b/api/cloudcontroller/ccv3/build_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/buildpack.go b/api/cloudcontroller/ccv3/buildpack.go index 7846d58952..f310cbf447 100644 --- a/api/cloudcontroller/ccv3/buildpack.go +++ b/api/cloudcontroller/ccv3/buildpack.go @@ -3,9 +3,9 @@ package ccv3 import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/api/cloudcontroller/uploads" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateBuildpack creates a buildpack with the given settings, Type and the diff --git a/api/cloudcontroller/ccv3/buildpack_test.go b/api/cloudcontroller/ccv3/buildpack_test.go index 9ef09c56dc..72be1b23d7 100644 --- a/api/cloudcontroller/ccv3/buildpack_test.go +++ b/api/cloudcontroller/ccv3/buildpack_test.go @@ -8,16 +8,16 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/resources" . "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 c6db76ee3c..a41a95fd5e 100644 --- a/api/cloudcontroller/ccv3/ccv3_suite_test.go +++ b/api/cloudcontroller/ccv3/ccv3_suite_test.go @@ -5,8 +5,8 @@ import ( "log" "testing" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go index 5c41fa00cd..7d4575eb1c 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" ) type FakeClock struct { diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go index 46d95f6f2f..7adb3e228e 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go @@ -4,8 +4,8 @@ package ccv3fakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" ) type FakeConnectionWrapper struct { diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go index 528b7ba15b..8eadd43bc8 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go @@ -6,8 +6,8 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" ) type FakeRequester struct { diff --git a/api/cloudcontroller/ccv3/client.go b/api/cloudcontroller/ccv3/client.go index ffb7ef5d93..fefdc642a8 100644 --- a/api/cloudcontroller/ccv3/client.go +++ b/api/cloudcontroller/ccv3/client.go @@ -77,7 +77,7 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" ) // Warnings are a collection of warnings that the Cloud Controller can return diff --git a/api/cloudcontroller/ccv3/client_test.go b/api/cloudcontroller/ccv3/client_test.go index 116faa9acc..7dfb2af68d 100644 --- a/api/cloudcontroller/ccv3/client_test.go +++ b/api/cloudcontroller/ccv3/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/connection_wrapper.go b/api/cloudcontroller/ccv3/connection_wrapper.go index 376891cadd..d3c2d27e43 100644 --- a/api/cloudcontroller/ccv3/connection_wrapper.go +++ b/api/cloudcontroller/ccv3/connection_wrapper.go @@ -1,6 +1,6 @@ package ccv3 -import "code.cloudfoundry.org/cli/api/cloudcontroller" +import "code.cloudfoundry.org/cli/v8/api/cloudcontroller" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ConnectionWrapper diff --git a/api/cloudcontroller/ccv3/deployment.go b/api/cloudcontroller/ccv3/deployment.go index 3d72e47f48..9aa469bbb9 100644 --- a/api/cloudcontroller/ccv3/deployment.go +++ b/api/cloudcontroller/ccv3/deployment.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) ContinueDeployment(deploymentGUID string) (Warnings, error) { diff --git a/api/cloudcontroller/ccv3/deployment_test.go b/api/cloudcontroller/ccv3/deployment_test.go index ad2099583b..f49b05ae3d 100644 --- a/api/cloudcontroller/ccv3/deployment_test.go +++ b/api/cloudcontroller/ccv3/deployment_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/domain.go b/api/cloudcontroller/ccv3/domain.go index 6b0aae2141..c933d17e70 100644 --- a/api/cloudcontroller/ccv3/domain.go +++ b/api/cloudcontroller/ccv3/domain.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) type SharedOrgs struct { diff --git a/api/cloudcontroller/ccv3/domain_test.go b/api/cloudcontroller/ccv3/domain_test.go index df3dbf5b59..ecd529e62c 100644 --- a/api/cloudcontroller/ccv3/domain_test.go +++ b/api/cloudcontroller/ccv3/domain_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/droplet.go b/api/cloudcontroller/ccv3/droplet.go index 7d9bfe5e70..e846864caf 100644 --- a/api/cloudcontroller/ccv3/droplet.go +++ b/api/cloudcontroller/ccv3/droplet.go @@ -3,10 +3,10 @@ package ccv3 import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/api/cloudcontroller/uploads" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v8/resources" ) type DropletCreateRequest struct { diff --git a/api/cloudcontroller/ccv3/droplet_test.go b/api/cloudcontroller/ccv3/droplet_test.go index 2e8f9eed29..1d0696d61a 100644 --- a/api/cloudcontroller/ccv3/droplet_test.go +++ b/api/cloudcontroller/ccv3/droplet_test.go @@ -7,15 +7,15 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/environment.go b/api/cloudcontroller/ccv3/environment.go index 45af18d5bb..28b3c1be2e 100644 --- a/api/cloudcontroller/ccv3/environment.go +++ b/api/cloudcontroller/ccv3/environment.go @@ -1,7 +1,7 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" ) // Environment variables that will be provided to an app at runtime. It will @@ -13,11 +13,11 @@ type Environment struct { Application map[string]interface{} `json:"application_env_json"` // EnvironmentVariables are user provided environment variables. EnvironmentVariables map[string]interface{} `json:"environment_variables"` - //Running is the set of default environment variables available to running - //apps. + // Running is the set of default environment variables available to running + // apps. Running map[string]interface{} `json:"running_env_json"` - //Staging is the set of default environment variables available during - //staging. + // Staging is the set of default environment variables available during + // staging. Staging map[string]interface{} `json:"staging_env_json"` // System contains information about bound services for the application. AKA // VCAP_SERVICES. diff --git a/api/cloudcontroller/ccv3/environment_test.go b/api/cloudcontroller/ccv3/environment_test.go index 14b8462218..1b95f7af8f 100644 --- a/api/cloudcontroller/ccv3/environment_test.go +++ b/api/cloudcontroller/ccv3/environment_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/environment_variables.go b/api/cloudcontroller/ccv3/environment_variables.go index 22c50d8f97..e8384790c7 100644 --- a/api/cloudcontroller/ccv3/environment_variables.go +++ b/api/cloudcontroller/ccv3/environment_variables.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // EnvironmentVariables represents the environment variables that can be set on diff --git a/api/cloudcontroller/ccv3/environment_variables_test.go b/api/cloudcontroller/ccv3/environment_variables_test.go index f2ce0794bd..2f4e227dc9 100644 --- a/api/cloudcontroller/ccv3/environment_variables_test.go +++ b/api/cloudcontroller/ccv3/environment_variables_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/errors.go b/api/cloudcontroller/ccv3/errors.go index e819b980a4..a153545dd2 100644 --- a/api/cloudcontroller/ccv3/errors.go +++ b/api/cloudcontroller/ccv3/errors.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" ) const ( @@ -146,7 +146,7 @@ func handleNotFound(errorResponse ccerror.V3Error, request *cloudcontroller.Requ } func handleUnprocessableEntity(errorResponse ccerror.V3Error) error { - //idea to make route already exist error flexible for all relevant error cases + // idea to make route already exist error flexible for all relevant error cases errorString := errorResponse.Detail err := ccerror.UnprocessableEntityError{Message: errorResponse.Detail} appNameTakenRegexp := regexp.MustCompile(`App with the name '.*' already exists\.`) diff --git a/api/cloudcontroller/ccv3/errors_test.go b/api/cloudcontroller/ccv3/errors_test.go index a5c92c3218..7e633d0555 100644 --- a/api/cloudcontroller/ccv3/errors_test.go +++ b/api/cloudcontroller/ccv3/errors_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/event.go b/api/cloudcontroller/ccv3/event.go index 3a918eed1d..685736c742 100644 --- a/api/cloudcontroller/ccv3/event.go +++ b/api/cloudcontroller/ccv3/event.go @@ -3,8 +3,8 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" ) type Event struct { diff --git a/api/cloudcontroller/ccv3/event_test.go b/api/cloudcontroller/ccv3/event_test.go index 542a60fd4c..643fd555a3 100644 --- a/api/cloudcontroller/ccv3/event_test.go +++ b/api/cloudcontroller/ccv3/event_test.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/feature_flag.go b/api/cloudcontroller/ccv3/feature_flag.go index 80f775acc8..98da5cb50c 100644 --- a/api/cloudcontroller/ccv3/feature_flag.go +++ b/api/cloudcontroller/ccv3/feature_flag.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) GetFeatureFlag(flagName string) (resources.FeatureFlag, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/feature_flag_test.go b/api/cloudcontroller/ccv3/feature_flag_test.go index ceeb15cf22..121f62e1fa 100644 --- a/api/cloudcontroller/ccv3/feature_flag_test.go +++ b/api/cloudcontroller/ccv3/feature_flag_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/included_resources.go b/api/cloudcontroller/ccv3/included_resources.go index 0044707663..5a192ffae3 100644 --- a/api/cloudcontroller/ccv3/included_resources.go +++ b/api/cloudcontroller/ccv3/included_resources.go @@ -1,6 +1,6 @@ package ccv3 -import "code.cloudfoundry.org/cli/resources" +import "code.cloudfoundry.org/cli/v8/resources" type IncludedResources struct { Users []resources.User `json:"users,omitempty"` diff --git a/api/cloudcontroller/ccv3/info.go b/api/cloudcontroller/ccv3/info.go index 564834a8ed..12afec65b7 100644 --- a/api/cloudcontroller/ccv3/info.go +++ b/api/cloudcontroller/ccv3/info.go @@ -3,9 +3,9 @@ package ccv3 import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/resources" ) type InfoLinks struct { diff --git a/api/cloudcontroller/ccv3/info_test.go b/api/cloudcontroller/ccv3/info_test.go index 542909b391..5ac21ff43a 100644 --- a/api/cloudcontroller/ccv3/info_test.go +++ b/api/cloudcontroller/ccv3/info_test.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/internal/routing_test.go b/api/cloudcontroller/ccv3/internal/routing_test.go index 59b52b3f74..60666e5980 100644 --- a/api/cloudcontroller/ccv3/internal/routing_test.go +++ b/api/cloudcontroller/ccv3/internal/routing_test.go @@ -3,7 +3,7 @@ package internal_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/isolation_segment.go b/api/cloudcontroller/ccv3/isolation_segment.go index 16dbd4ec17..c712391d5a 100644 --- a/api/cloudcontroller/ccv3/isolation_segment.go +++ b/api/cloudcontroller/ccv3/isolation_segment.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateIsolationSegment will create an Isolation Segment on the Cloud diff --git a/api/cloudcontroller/ccv3/isolation_segment_test.go b/api/cloudcontroller/ccv3/isolation_segment_test.go index a52e3d1344..af8719d7c0 100644 --- a/api/cloudcontroller/ccv3/isolation_segment_test.go +++ b/api/cloudcontroller/ccv3/isolation_segment_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/job.go b/api/cloudcontroller/ccv3/job.go index a0704a8084..63189a47f6 100644 --- a/api/cloudcontroller/ccv3/job.go +++ b/api/cloudcontroller/ccv3/job.go @@ -3,8 +3,8 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // Job represents a Cloud Controller Job. diff --git a/api/cloudcontroller/ccv3/job_test.go b/api/cloudcontroller/ccv3/job_test.go index d4bacafa8a..e538a08839 100644 --- a/api/cloudcontroller/ccv3/job_test.go +++ b/api/cloudcontroller/ccv3/job_test.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/job_url.go b/api/cloudcontroller/ccv3/job_url.go index f49a965789..49ae539030 100644 --- a/api/cloudcontroller/ccv3/job_url.go +++ b/api/cloudcontroller/ccv3/job_url.go @@ -1,7 +1,7 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" ) // JobURL is the URL to a given Job. diff --git a/api/cloudcontroller/ccv3/job_url_test.go b/api/cloudcontroller/ccv3/job_url_test.go index 3c6d3bd621..4d077daa6b 100644 --- a/api/cloudcontroller/ccv3/job_url_test.go +++ b/api/cloudcontroller/ccv3/job_url_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/manifest.go b/api/cloudcontroller/ccv3/manifest.go index fba84e1c40..6461efbe2f 100644 --- a/api/cloudcontroller/ccv3/manifest.go +++ b/api/cloudcontroller/ccv3/manifest.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // GetApplicationManifest returns a (YAML) manifest for an application and its diff --git a/api/cloudcontroller/ccv3/manifest_test.go b/api/cloudcontroller/ccv3/manifest_test.go index 4038a80556..e5944afcf9 100644 --- a/api/cloudcontroller/ccv3/manifest_test.go +++ b/api/cloudcontroller/ccv3/manifest_test.go @@ -4,13 +4,13 @@ import ( "errors" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/metadata.go b/api/cloudcontroller/ccv3/metadata.go index a909e49f18..f8c277f64e 100644 --- a/api/cloudcontroller/ccv3/metadata.go +++ b/api/cloudcontroller/ccv3/metadata.go @@ -3,8 +3,8 @@ package ccv3 import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) UpdateResourceMetadata(resource string, resourceGUID string, metadata resources.Metadata) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/metadata_test.go b/api/cloudcontroller/ccv3/metadata_test.go index 763ec58bb5..24ca2f57ed 100644 --- a/api/cloudcontroller/ccv3/metadata_test.go +++ b/api/cloudcontroller/ccv3/metadata_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/organization.go b/api/cloudcontroller/ccv3/organization.go index b75cad50e9..5e21a0e7d8 100644 --- a/api/cloudcontroller/ccv3/organization.go +++ b/api/cloudcontroller/ccv3/organization.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) CreateOrganization(orgName string) (resources.Organization, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/organization_quota.go b/api/cloudcontroller/ccv3/organization_quota.go index 8812493a56..95a3a81e89 100644 --- a/api/cloudcontroller/ccv3/organization_quota.go +++ b/api/cloudcontroller/ccv3/organization_quota.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) ApplyOrganizationQuota(quotaGuid, orgGuid string) (resources.RelationshipList, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/organization_quota_test.go b/api/cloudcontroller/ccv3/organization_quota_test.go index a8b810fae9..b1aaaa41da 100644 --- a/api/cloudcontroller/ccv3/organization_quota_test.go +++ b/api/cloudcontroller/ccv3/organization_quota_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "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 1b7800dffc..77dafec7ca 100644 --- a/api/cloudcontroller/ccv3/organization_test.go +++ b/api/cloudcontroller/ccv3/organization_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/package.go b/api/cloudcontroller/ccv3/package.go index 0dcdfcaaaf..c220d63035 100644 --- a/api/cloudcontroller/ccv3/package.go +++ b/api/cloudcontroller/ccv3/package.go @@ -8,11 +8,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.Reader diff --git a/api/cloudcontroller/ccv3/package_test.go b/api/cloudcontroller/ccv3/package_test.go index 5cc627d290..54bcd15b38 100644 --- a/api/cloudcontroller/ccv3/package_test.go +++ b/api/cloudcontroller/ccv3/package_test.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/api/cloudcontroller/ccv3/paginate.go b/api/cloudcontroller/ccv3/paginate.go index bf87cce32e..c38cfd32a0 100644 --- a/api/cloudcontroller/ccv3/paginate.go +++ b/api/cloudcontroller/ccv3/paginate.go @@ -3,7 +3,7 @@ package ccv3 import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" ) func (requester RealRequester) paginate(request *cloudcontroller.Request, obj interface{}, appendToExternalList func(interface{}) error, specificPage bool) (IncludedResources, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/paginated_resources_test.go b/api/cloudcontroller/ccv3/paginated_resources_test.go index debe0ad162..44d03a6b53 100644 --- a/api/cloudcontroller/ccv3/paginated_resources_test.go +++ b/api/cloudcontroller/ccv3/paginated_resources_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - . "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/process.go b/api/cloudcontroller/ccv3/process.go index d03f2885fb..a386431491 100644 --- a/api/cloudcontroller/ccv3/process.go +++ b/api/cloudcontroller/ccv3/process.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateApplicationProcessScale updates process instances count, memory or disk diff --git a/api/cloudcontroller/ccv3/process_instance.go b/api/cloudcontroller/ccv3/process_instance.go index da5764a6f1..6491705873 100644 --- a/api/cloudcontroller/ccv3/process_instance.go +++ b/api/cloudcontroller/ccv3/process_instance.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/types" ) // ProcessInstance represents a single process instance for a particular diff --git a/api/cloudcontroller/ccv3/process_instance_test.go b/api/cloudcontroller/ccv3/process_instance_test.go index 911d5d402a..c4fdd1c0bd 100644 --- a/api/cloudcontroller/ccv3/process_instance_test.go +++ b/api/cloudcontroller/ccv3/process_instance_test.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/types" . "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 fc584e4f37..0c22b80851 100644 --- a/api/cloudcontroller/ccv3/process_test.go +++ b/api/cloudcontroller/ccv3/process_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/query_test.go b/api/cloudcontroller/ccv3/query_test.go index e614d4c819..205895c4ab 100644 --- a/api/cloudcontroller/ccv3/query_test.go +++ b/api/cloudcontroller/ccv3/query_test.go @@ -3,7 +3,7 @@ package ccv3_test import ( "net/url" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/relationship.go b/api/cloudcontroller/ccv3/relationship.go index e4ed3b81ef..86b035a339 100644 --- a/api/cloudcontroller/ccv3/relationship.go +++ b/api/cloudcontroller/ccv3/relationship.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // DeleteIsolationSegmentOrganization will delete the relationship between diff --git a/api/cloudcontroller/ccv3/relationship_list.go b/api/cloudcontroller/ccv3/relationship_list.go index a60adef250..e437cc3fc8 100644 --- a/api/cloudcontroller/ccv3/relationship_list.go +++ b/api/cloudcontroller/ccv3/relationship_list.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // EntitleIsolationSegmentToOrganizations will create a link between the diff --git a/api/cloudcontroller/ccv3/relationship_list_test.go b/api/cloudcontroller/ccv3/relationship_list_test.go index 06fbfc4c4f..f9e4d0a8db 100644 --- a/api/cloudcontroller/ccv3/relationship_list_test.go +++ b/api/cloudcontroller/ccv3/relationship_list_test.go @@ -3,9 +3,9 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "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 88fcd4e3de..22f1c440e7 100644 --- a/api/cloudcontroller/ccv3/relationship_test.go +++ b/api/cloudcontroller/ccv3/relationship_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/request.go b/api/cloudcontroller/ccv3/request.go index 65b988ac78..13cf361b97 100644 --- a/api/cloudcontroller/ccv3/request.go +++ b/api/cloudcontroller/ccv3/request.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" ) // requestOptions contains all the options to create an HTTP request. diff --git a/api/cloudcontroller/ccv3/requester.go b/api/cloudcontroller/ccv3/requester.go index f0982fc629..309f8e9b30 100644 --- a/api/cloudcontroller/ccv3/requester.go +++ b/api/cloudcontroller/ccv3/requester.go @@ -8,8 +8,8 @@ import ( "net/http" "runtime" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Requester diff --git a/api/cloudcontroller/ccv3/requester_test.go b/api/cloudcontroller/ccv3/requester_test.go index 6b078ece01..9330d9934b 100644 --- a/api/cloudcontroller/ccv3/requester_test.go +++ b/api/cloudcontroller/ccv3/requester_test.go @@ -8,13 +8,13 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/resource.go b/api/cloudcontroller/ccv3/resource.go index cb8d778c37..aaf944a371 100644 --- a/api/cloudcontroller/ccv3/resource.go +++ b/api/cloudcontroller/ccv3/resource.go @@ -5,8 +5,8 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" ) type Checksum struct { diff --git a/api/cloudcontroller/ccv3/resource_test.go b/api/cloudcontroller/ccv3/resource_test.go index 0b47d31fb0..397a6b3e70 100644 --- a/api/cloudcontroller/ccv3/resource_test.go +++ b/api/cloudcontroller/ccv3/resource_test.go @@ -5,8 +5,8 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/revisions.go b/api/cloudcontroller/ccv3/revisions.go index 67b14a0fc5..3451fb2fbe 100644 --- a/api/cloudcontroller/ccv3/revisions.go +++ b/api/cloudcontroller/ccv3/revisions.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) GetApplicationRevisions(appGUID string, query ...Query) ([]resources.Revision, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/revisions_test.go b/api/cloudcontroller/ccv3/revisions_test.go index fe3ac699ea..d1a9f4ac95 100644 --- a/api/cloudcontroller/ccv3/revisions_test.go +++ b/api/cloudcontroller/ccv3/revisions_test.go @@ -3,11 +3,11 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/role.go b/api/cloudcontroller/ccv3/role.go index 7e12f96dc8..5c7bb5f14a 100644 --- a/api/cloudcontroller/ccv3/role.go +++ b/api/cloudcontroller/ccv3/role.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) CreateRole(roleSpec resources.Role) (resources.Role, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/role_test.go b/api/cloudcontroller/ccv3/role_test.go index 50a226da1b..9b1c1d3dd4 100644 --- a/api/cloudcontroller/ccv3/role_test.go +++ b/api/cloudcontroller/ccv3/role_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/route.go b/api/cloudcontroller/ccv3/route.go index afff0af5e9..355045fd7c 100644 --- a/api/cloudcontroller/ccv3/route.go +++ b/api/cloudcontroller/ccv3/route.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client Client) CreateRoute(route resources.Route) (resources.Route, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/route_binding.go b/api/cloudcontroller/ccv3/route_binding.go index 643479d628..b2701cfc8b 100644 --- a/api/cloudcontroller/ccv3/route_binding.go +++ b/api/cloudcontroller/ccv3/route_binding.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) CreateRouteBinding(binding resources.RouteBinding) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/route_binding_test.go b/api/cloudcontroller/ccv3/route_binding_test.go index 6321d4faad..43c3e49520 100644 --- a/api/cloudcontroller/ccv3/route_binding_test.go +++ b/api/cloudcontroller/ccv3/route_binding_test.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/route_test.go b/api/cloudcontroller/ccv3/route_test.go index c1597c71db..985e493e35 100644 --- a/api/cloudcontroller/ccv3/route_test.go +++ b/api/cloudcontroller/ccv3/route_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/security_group.go b/api/cloudcontroller/ccv3/security_group.go index 1880769cef..8a72533e45 100644 --- a/api/cloudcontroller/ccv3/security_group.go +++ b/api/cloudcontroller/ccv3/security_group.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) CreateSecurityGroup(securityGroup resources.SecurityGroup) (resources.SecurityGroup, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/security_group_test.go b/api/cloudcontroller/ccv3/security_group_test.go index b2a1e915ae..3683740bbc 100644 --- a/api/cloudcontroller/ccv3/security_group_test.go +++ b/api/cloudcontroller/ccv3/security_group_test.go @@ -3,11 +3,11 @@ package ccv3_test import ( "errors" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/service_broker.go b/api/cloudcontroller/ccv3/service_broker.go index c61b0d9fa2..07addf4081 100644 --- a/api/cloudcontroller/ccv3/service_broker.go +++ b/api/cloudcontroller/ccv3/service_broker.go @@ -3,8 +3,8 @@ package ccv3 import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateServiceBroker registers a new service broker. diff --git a/api/cloudcontroller/ccv3/service_broker_test.go b/api/cloudcontroller/ccv3/service_broker_test.go index ab4ea030bd..8c46520fd2 100644 --- a/api/cloudcontroller/ccv3/service_broker_test.go +++ b/api/cloudcontroller/ccv3/service_broker_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_credential_binding.go b/api/cloudcontroller/ccv3/service_credential_binding.go index 8d3910273c..5fb7e25d31 100644 --- a/api/cloudcontroller/ccv3/service_credential_binding.go +++ b/api/cloudcontroller/ccv3/service_credential_binding.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/lookuptable" ) func (client *Client) CreateServiceCredentialBinding(binding resources.ServiceCredentialBinding) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_credential_binding_test.go b/api/cloudcontroller/ccv3/service_credential_binding_test.go index f78261ad69..6de802b382 100644 --- a/api/cloudcontroller/ccv3/service_credential_binding_test.go +++ b/api/cloudcontroller/ccv3/service_credential_binding_test.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/service_instance.go b/api/cloudcontroller/ccv3/service_instance.go index 5ab9c84b64..5f7a9257b5 100644 --- a/api/cloudcontroller/ccv3/service_instance.go +++ b/api/cloudcontroller/ccv3/service_instance.go @@ -1,12 +1,12 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/lookuptable" ) type SpaceWithOrganization struct { diff --git a/api/cloudcontroller/ccv3/service_instance_test.go b/api/cloudcontroller/ccv3/service_instance_test.go index f4ee3c427c..bd39e3a95c 100644 --- a/api/cloudcontroller/ccv3/service_instance_test.go +++ b/api/cloudcontroller/ccv3/service_instance_test.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/service_offering.go b/api/cloudcontroller/ccv3/service_offering.go index c5ce0cba2e..e48ec922c2 100644 --- a/api/cloudcontroller/ccv3/service_offering.go +++ b/api/cloudcontroller/ccv3/service_offering.go @@ -1,10 +1,10 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/lookuptable" ) // GetServiceOffering lists service offering with optional filters. diff --git a/api/cloudcontroller/ccv3/service_offering_test.go b/api/cloudcontroller/ccv3/service_offering_test.go index 03383e390f..8968b554bf 100644 --- a/api/cloudcontroller/ccv3/service_offering_test.go +++ b/api/cloudcontroller/ccv3/service_offering_test.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_plan.go b/api/cloudcontroller/ccv3/service_plan.go index e61a462e6d..e3a2c43086 100644 --- a/api/cloudcontroller/ccv3/service_plan.go +++ b/api/cloudcontroller/ccv3/service_plan.go @@ -1,11 +1,11 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/lookuptable" ) func (client *Client) GetServicePlanByGUID(guid string) (resources.ServicePlan, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_plan_test.go b/api/cloudcontroller/ccv3/service_plan_test.go index 492e9f35bb..3dc7701d31 100644 --- a/api/cloudcontroller/ccv3/service_plan_test.go +++ b/api/cloudcontroller/ccv3/service_plan_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_plan_visibility.go b/api/cloudcontroller/ccv3/service_plan_visibility.go index 89fb79b21f..7b647ea784 100644 --- a/api/cloudcontroller/ccv3/service_plan_visibility.go +++ b/api/cloudcontroller/ccv3/service_plan_visibility.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) GetServicePlanVisibility(servicePlanGUID string) (resources.ServicePlanVisibility, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_plan_visibility_test.go b/api/cloudcontroller/ccv3/service_plan_visibility_test.go index d5d0c7a136..70e135c04f 100644 --- a/api/cloudcontroller/ccv3/service_plan_visibility_test.go +++ b/api/cloudcontroller/ccv3/service_plan_visibility_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/sidecar.go b/api/cloudcontroller/ccv3/sidecar.go index f9e59c92a2..d3b33c0805 100644 --- a/api/cloudcontroller/ccv3/sidecar.go +++ b/api/cloudcontroller/ccv3/sidecar.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) GetProcessSidecars(processGuid string) ([]resources.Sidecar, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/sidecar_test.go b/api/cloudcontroller/ccv3/sidecar_test.go index 744bb8db77..933cf33ba5 100644 --- a/api/cloudcontroller/ccv3/sidecar_test.go +++ b/api/cloudcontroller/ccv3/sidecar_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/space.go b/api/cloudcontroller/ccv3/space.go index cad31730bc..7a68b9a9c1 100644 --- a/api/cloudcontroller/ccv3/space.go +++ b/api/cloudcontroller/ccv3/space.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) CreateSpace(space resources.Space) (resources.Space, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_feature.go b/api/cloudcontroller/ccv3/space_feature.go index 462295bc4e..3600eb6857 100644 --- a/api/cloudcontroller/ccv3/space_feature.go +++ b/api/cloudcontroller/ccv3/space_feature.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client *Client) GetSpaceFeature(spaceGUID string, featureName string) (bool, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_feature_test.go b/api/cloudcontroller/ccv3/space_feature_test.go index d3aea454d7..8dddc891c3 100644 --- a/api/cloudcontroller/ccv3/space_feature_test.go +++ b/api/cloudcontroller/ccv3/space_feature_test.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/space_quota.go b/api/cloudcontroller/ccv3/space_quota.go index b8fb01a176..f555020b7f 100644 --- a/api/cloudcontroller/ccv3/space_quota.go +++ b/api/cloudcontroller/ccv3/space_quota.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) func (client Client) ApplySpaceQuota(quotaGUID string, spaceGUID string) (resources.RelationshipList, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_quota_test.go b/api/cloudcontroller/ccv3/space_quota_test.go index 64d3cb9e31..6b41fb1d5d 100644 --- a/api/cloudcontroller/ccv3/space_quota_test.go +++ b/api/cloudcontroller/ccv3/space_quota_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "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 11b247018d..40a3b9eaa2 100644 --- a/api/cloudcontroller/ccv3/space_test.go +++ b/api/cloudcontroller/ccv3/space_test.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/stack.go b/api/cloudcontroller/ccv3/stack.go index e1704a3c39..ece8e6e491 100644 --- a/api/cloudcontroller/ccv3/stack.go +++ b/api/cloudcontroller/ccv3/stack.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // GetStacks lists stacks with optional filters. diff --git a/api/cloudcontroller/ccv3/stack_test.go b/api/cloudcontroller/ccv3/stack_test.go index 8ad2225db6..f6a3fa2e05 100644 --- a/api/cloudcontroller/ccv3/stack_test.go +++ b/api/cloudcontroller/ccv3/stack_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "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 f7be61b25a..d5f0e5fa9a 100644 --- a/api/cloudcontroller/ccv3/target_test.go +++ b/api/cloudcontroller/ccv3/target_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/task.go b/api/cloudcontroller/ccv3/task.go index 359ee9277a..23104e73d0 100644 --- a/api/cloudcontroller/ccv3/task.go +++ b/api/cloudcontroller/ccv3/task.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateApplication resources.Task runs a command in the Application environment diff --git a/api/cloudcontroller/ccv3/task_test.go b/api/cloudcontroller/ccv3/task_test.go index c45c4d4b7a..4ecbe09058 100644 --- a/api/cloudcontroller/ccv3/task_test.go +++ b/api/cloudcontroller/ccv3/task_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/user.go b/api/cloudcontroller/ccv3/user.go index 7b2aa8edb2..247d3a77d6 100644 --- a/api/cloudcontroller/ccv3/user.go +++ b/api/cloudcontroller/ccv3/user.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v8/resources" ) // CreateUser creates a new Cloud Controller User from the provided UAA user diff --git a/api/cloudcontroller/ccv3/user_test.go b/api/cloudcontroller/ccv3/user_test.go index 2b42fb3925..75ef1c8fec 100644 --- a/api/cloudcontroller/ccv3/user_test.go +++ b/api/cloudcontroller/ccv3/user_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/v2_formatted_resource.go b/api/cloudcontroller/ccv3/v2_formatted_resource.go index 2107a905a9..ca981f2ed0 100644 --- a/api/cloudcontroller/ccv3/v2_formatted_resource.go +++ b/api/cloudcontroller/ccv3/v2_formatted_resource.go @@ -5,7 +5,7 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" ) // V2FormattedResource represents a Cloud Controller Resource that still has the same shape as the V2 Resource. diff --git a/api/cloudcontroller/ccv3/v2_formatted_resource_test.go b/api/cloudcontroller/ccv3/v2_formatted_resource_test.go index 6f4083b504..d8937bdd1c 100644 --- a/api/cloudcontroller/ccv3/v2_formatted_resource_test.go +++ b/api/cloudcontroller/ccv3/v2_formatted_resource_test.go @@ -3,7 +3,7 @@ package ccv3_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/cloud_controller_connection.go b/api/cloudcontroller/cloud_controller_connection.go index b5601a86cc..74141674f0 100644 --- a/api/cloudcontroller/cloud_controller_connection.go +++ b/api/cloudcontroller/cloud_controller_connection.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/util" ) // Config is for configuring a CloudControllerConnection. diff --git a/api/cloudcontroller/cloud_controller_connection_test.go b/api/cloudcontroller/cloud_controller_connection_test.go index b32124f5ce..d19f76719e 100644 --- a/api/cloudcontroller/cloud_controller_connection_test.go +++ b/api/cloudcontroller/cloud_controller_connection_test.go @@ -6,8 +6,8 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go b/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go index 068ea8e1a5..d9fb642894 100644 --- a/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go +++ b/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go @@ -4,7 +4,7 @@ package cloudcontrollerfakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" ) type FakeConnection struct { diff --git a/api/cloudcontroller/pipebomb.go b/api/cloudcontroller/pipebomb.go index 29ac6b0fe1..c3ba3c69b4 100644 --- a/api/cloudcontroller/pipebomb.go +++ b/api/cloudcontroller/pipebomb.go @@ -3,7 +3,7 @@ package cloudcontroller import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" ) // Pipebomb is a wrapper around an io.Pipe's io.ReadCloser that turns it into a diff --git a/api/cloudcontroller/uploads/upload.go b/api/cloudcontroller/uploads/upload.go index fa69b97a9a..9e81296257 100644 --- a/api/cloudcontroller/uploads/upload.go +++ b/api/cloudcontroller/uploads/upload.go @@ -6,7 +6,7 @@ import ( "mime/multipart" "path/filepath" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" ) func CalculateRequestSize(fileSize int64, path string, fieldName string) (int64, error) { diff --git a/api/cloudcontroller/wrapper/custom_wrapper.go b/api/cloudcontroller/wrapper/custom_wrapper.go index dc6b38af74..09cc493f1d 100644 --- a/api/cloudcontroller/wrapper/custom_wrapper.go +++ b/api/cloudcontroller/wrapper/custom_wrapper.go @@ -1,6 +1,6 @@ package wrapper -import "code.cloudfoundry.org/cli/api/cloudcontroller" +import "code.cloudfoundry.org/cli/v8/api/cloudcontroller" // CustomWrapper is a wrapper that can execute arbitrary code via the // CustomMake function on every request that passes through Make. diff --git a/api/cloudcontroller/wrapper/kubernetes_authentication.go b/api/cloudcontroller/wrapper/kubernetes_authentication.go index 622bd580cc..cc2fe0561a 100644 --- a/api/cloudcontroller/wrapper/kubernetes_authentication.go +++ b/api/cloudcontroller/wrapper/kubernetes_authentication.go @@ -3,10 +3,10 @@ package wrapper import ( "net/http" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/shared" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/shared" + "code.cloudfoundry.org/cli/v8/command" ) type KubernetesAuthentication struct { diff --git a/api/cloudcontroller/wrapper/kubernetes_authentication_test.go b/api/cloudcontroller/wrapper/kubernetes_authentication_test.go index 443f21bdbd..8601ddad93 100644 --- a/api/cloudcontroller/wrapper/kubernetes_authentication_test.go +++ b/api/cloudcontroller/wrapper/kubernetes_authentication_test.go @@ -11,12 +11,12 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/integration/helpers" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" diff --git a/api/cloudcontroller/wrapper/request_logger.go b/api/cloudcontroller/wrapper/request_logger.go index abebb85108..a3db0437f6 100644 --- a/api/cloudcontroller/wrapper/request_logger.go +++ b/api/cloudcontroller/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/cloudcontroller/wrapper/request_logger_test.go b/api/cloudcontroller/wrapper/request_logger_test.go index f105321c9a..66fef9f37b 100644 --- a/api/cloudcontroller/wrapper/request_logger_test.go +++ b/api/cloudcontroller/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/retry_request.go b/api/cloudcontroller/wrapper/retry_request.go index cf9e7f6cd6..dbca1b9f9e 100644 --- a/api/cloudcontroller/wrapper/retry_request.go +++ b/api/cloudcontroller/wrapper/retry_request.go @@ -3,8 +3,8 @@ package wrapper import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/cloudcontroller/wrapper/retry_request_test.go b/api/cloudcontroller/wrapper/retry_request_test.go index 118d285ae2..747a3cf6e8 100644 --- a/api/cloudcontroller/wrapper/retry_request_test.go +++ b/api/cloudcontroller/wrapper/retry_request_test.go @@ -6,10 +6,10 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/uaa_authentication.go b/api/cloudcontroller/wrapper/uaa_authentication.go index d11ae16285..375bf3fd24 100644 --- a/api/cloudcontroller/wrapper/uaa_authentication.go +++ b/api/cloudcontroller/wrapper/uaa_authentication.go @@ -6,8 +6,8 @@ import ( "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/cloudcontroller/wrapper/uaa_authentication_test.go b/api/cloudcontroller/wrapper/uaa_authentication_test.go index 6302c91d3c..adcca89b22 100644 --- a/api/cloudcontroller/wrapper/uaa_authentication_test.go +++ b/api/cloudcontroller/wrapper/uaa_authentication_test.go @@ -7,18 +7,18 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper/wrapperfakes" - "code.cloudfoundry.org/cli/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go index 1ef43d6890..0478ea48e3 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" ) type FakeRequestLoggerOutput struct { diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go index fc1158cfa3..6b26b2911c 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" ) type FakeTokenCache struct { diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go index b328b1d7c8..3670dc7838 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa" ) type FakeUAAClient struct { diff --git a/api/logcache/log_cache_client.go b/api/logcache/log_cache_client.go index a6166346f5..93fe0b83e9 100644 --- a/api/logcache/log_cache_client.go +++ b/api/logcache/log_cache_client.go @@ -10,10 +10,10 @@ import ( logcache "code.cloudfoundry.org/go-log-cache/v2" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/shared" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/shared" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/util" ) type RequestLoggerOutput interface { @@ -34,31 +34,31 @@ type DebugPrinter struct { func (p DebugPrinter) PrintError(err error) { for _, output := range p.outputs { - _ = output.Start() //nolint - _ = output.DisplayType("ERROR", time.Now()) //nolint - _ = output.DisplayDump(err.Error()) //nolint - _ = output.Stop() //nolint + _ = output.Start() // nolint + _ = output.DisplayType("ERROR", time.Now()) // nolint + _ = output.DisplayDump(err.Error()) // nolint + _ = output.Stop() // nolint } } func (p DebugPrinter) PrintRequest(req *http.Request) { for _, output := range p.outputs { - _ = output.Start() //nolint - _ = output.DisplayType("REQUEST", time.Now()) //nolint - _ = output.DisplayRequestHeader(req.Method, req.URL.RequestURI(), req.Proto) //nolint - _ = output.DisplayHost(req.URL.Host) //nolint - _ = output.DisplayDump(headersString(req.Header)) //nolint - _ = output.Stop() //nolint + _ = output.Start() // nolint + _ = output.DisplayType("REQUEST", time.Now()) // nolint + _ = output.DisplayRequestHeader(req.Method, req.URL.RequestURI(), req.Proto) // nolint + _ = output.DisplayHost(req.URL.Host) // nolint + _ = output.DisplayDump(headersString(req.Header)) // nolint + _ = output.Stop() // nolint } } func (p DebugPrinter) PrintResponse(resp *http.Response) { for _, output := range p.outputs { - _ = output.Start() //nolint - _ = output.DisplayType("RESPONSE", time.Now()) //nolint - _ = output.DisplayResponseHeader(resp.Proto, resp.Status) //nolint - _ = output.DisplayDump(headersString(resp.Header)) //nolint - _ = output.Stop() //nolint + _ = output.Start() // nolint + _ = output.DisplayType("RESPONSE", time.Now()) // nolint + _ = output.DisplayResponseHeader(resp.Proto, resp.Status) // nolint + _ = output.DisplayDump(headersString(resp.Header)) // nolint + _ = output.Stop() // nolint } } @@ -124,7 +124,7 @@ func NewClient(logCacheEndpoint string, config command.Config, ui command.UI, k8 } } - var client logcache.HTTPClient //nolint + var client logcache.HTTPClient // nolint client = &userAgentHTTPClient{ c: &http.Client{Transport: tr}, userAgent: fmt.Sprintf("%s/%s (%s; %s %s)", config.BinaryName(), config.BinaryVersion(), runtime.Version(), runtime.GOARCH, runtime.GOOS), diff --git a/api/plugin/client_test.go b/api/plugin/client_test.go index 4a3275201e..d4b87714aa 100644 --- a/api/plugin/client_test.go +++ b/api/plugin/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" . "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 5261eba3b6..0c2f6a90d0 100644 --- a/api/plugin/download_plugin_test.go +++ b/api/plugin/download_plugin_test.go @@ -6,9 +6,9 @@ import ( "net/url" "os" - . "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/plugin_connection.go b/api/plugin/plugin_connection.go index 465be1bacd..7fcd3fdabe 100644 --- a/api/plugin/plugin_connection.go +++ b/api/plugin/plugin_connection.go @@ -11,8 +11,8 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/util" ) // PluginConnection represents a connection to a plugin repo. diff --git a/api/plugin/plugin_connection_test.go b/api/plugin/plugin_connection_test.go index ac1a8b36f5..381ec6f835 100644 --- a/api/plugin/plugin_connection_test.go +++ b/api/plugin/plugin_connection_test.go @@ -7,9 +7,9 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" . "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 d929b9a2a9..7fd9b57262 100644 --- a/api/plugin/plugin_repository_test.go +++ b/api/plugin/plugin_repository_test.go @@ -5,8 +5,8 @@ import ( "net/http" "net/url" - . "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" + . "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" . "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 fb57342105..6b8e479c5e 100644 --- a/api/plugin/plugin_suite_test.go +++ b/api/plugin/plugin_suite_test.go @@ -5,7 +5,7 @@ import ( "log" "testing" - . "code.cloudfoundry.org/cli/api/plugin" + . "code.cloudfoundry.org/cli/v8/api/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/pluginfakes/fake_connection.go b/api/plugin/pluginfakes/fake_connection.go index 7c0c8374cf..31ab99fdca 100644 --- a/api/plugin/pluginfakes/fake_connection.go +++ b/api/plugin/pluginfakes/fake_connection.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin" ) type FakeConnection struct { diff --git a/api/plugin/pluginfakes/fake_connection_wrapper.go b/api/plugin/pluginfakes/fake_connection_wrapper.go index 02121dbbc4..e116eda2f1 100644 --- a/api/plugin/pluginfakes/fake_connection_wrapper.go +++ b/api/plugin/pluginfakes/fake_connection_wrapper.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin" ) type FakeConnectionWrapper struct { diff --git a/api/plugin/pluginfakes/fake_proxy_reader.go b/api/plugin/pluginfakes/fake_proxy_reader.go index bb9729e831..0c987a47d5 100644 --- a/api/plugin/pluginfakes/fake_proxy_reader.go +++ b/api/plugin/pluginfakes/fake_proxy_reader.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin" ) type FakeProxyReader struct { diff --git a/api/plugin/wrapper/request_logger.go b/api/plugin/wrapper/request_logger.go index 8903969fd0..6b193410e7 100644 --- a/api/plugin/wrapper/request_logger.go +++ b/api/plugin/wrapper/request_logger.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/plugin/wrapper/request_logger_test.go b/api/plugin/wrapper/request_logger_test.go index 2b6a5fe1e4..ec06eda9f3 100644 --- a/api/plugin/wrapper/request_logger_test.go +++ b/api/plugin/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - . "code.cloudfoundry.org/cli/api/plugin/wrapper" - "code.cloudfoundry.org/cli/api/plugin/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v8/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v8/api/plugin/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/plugin/wrapper/retry_request.go b/api/plugin/wrapper/retry_request.go index 0af18b74db..b0535b2f11 100644 --- a/api/plugin/wrapper/retry_request.go +++ b/api/plugin/wrapper/retry_request.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/plugin/wrapper/retry_request_test.go b/api/plugin/wrapper/retry_request_test.go index 151c32b5a0..c3ecfe1294 100644 --- a/api/plugin/wrapper/retry_request_test.go +++ b/api/plugin/wrapper/retry_request_test.go @@ -6,10 +6,10 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - . "code.cloudfoundry.org/cli/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v8/api/plugin/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go b/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go index 5f0b28bfaa..0252deb85f 100644 --- a/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v8/api/plugin/wrapper" ) type FakeRequestLoggerOutput struct { diff --git a/api/router/client.go b/api/router/client.go index b6ceeefe46..531a8539ef 100644 --- a/api/router/client.go +++ b/api/router/client.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime" - "code.cloudfoundry.org/cli/api/router/internal" + "code.cloudfoundry.org/cli/v8/api/router/internal" "github.com/tedsuo/rata" ) diff --git a/api/router/router_connection.go b/api/router/router_connection.go index c5e8ebbc4b..43562a340b 100644 --- a/api/router/router_connection.go +++ b/api/router/router_connection.go @@ -10,9 +10,9 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v8/util" ) // ConnectionConfig is for configuring the RouterConnection diff --git a/api/router/router_group.go b/api/router/router_group.go index de67d5cf6f..fae6675b2b 100644 --- a/api/router/router_group.go +++ b/api/router/router_group.go @@ -3,8 +3,8 @@ package router import ( "net/url" - "code.cloudfoundry.org/cli/api/router/internal" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v8/api/router/internal" + "code.cloudfoundry.org/cli/v8/api/router/routererror" ) // RouterGroup represents a router group. diff --git a/api/router/router_group_test.go b/api/router/router_group_test.go index 461d183cf5..26f9cfcc38 100644 --- a/api/router/router_group_test.go +++ b/api/router/router_group_test.go @@ -3,9 +3,9 @@ package router_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/api/router/wrapper" + . "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v8/api/router/wrapper" . "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 483f3bbb72..56fb9c41af 100644 --- a/api/router/router_suite_test.go +++ b/api/router/router_suite_test.go @@ -6,7 +6,7 @@ import ( "net/url" "testing" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v8/api/router" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/router/routerfakes/fake_connection.go b/api/router/routerfakes/fake_connection.go index 5185d53c75..02d025df16 100644 --- a/api/router/routerfakes/fake_connection.go +++ b/api/router/routerfakes/fake_connection.go @@ -4,7 +4,7 @@ package routerfakes import ( "sync" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v8/api/router" ) type FakeConnection struct { diff --git a/api/router/routerfakes/fake_connection_wrapper.go b/api/router/routerfakes/fake_connection_wrapper.go index d890a183eb..e9d31bc9b9 100644 --- a/api/router/routerfakes/fake_connection_wrapper.go +++ b/api/router/routerfakes/fake_connection_wrapper.go @@ -4,7 +4,7 @@ package routerfakes import ( "sync" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v8/api/router" ) type FakeConnectionWrapper struct { diff --git a/api/router/wrapper/error_wrapper.go b/api/router/wrapper/error_wrapper.go index 07579b9095..8a33fdee6d 100644 --- a/api/router/wrapper/error_wrapper.go +++ b/api/router/wrapper/error_wrapper.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/api/router/routererror" ) const expiredTokenMessage = "Token is expired" diff --git a/api/router/wrapper/error_wrapper_test.go b/api/router/wrapper/error_wrapper_test.go index e5b57115d1..b4b99d6c53 100644 --- a/api/router/wrapper/error_wrapper_test.go +++ b/api/router/wrapper/error_wrapper_test.go @@ -3,10 +3,10 @@ package wrapper_test import ( "net/http" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/api/router/routerfakes" - . "code.cloudfoundry.org/cli/api/router/wrapper" + "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v8/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v8/api/router/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/router/wrapper/request_logger.go b/api/router/wrapper/request_logger.go index 9f7b4206ea..be8bdd57a9 100644 --- a/api/router/wrapper/request_logger.go +++ b/api/router/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v8/api/router" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/router/wrapper/request_logger_test.go b/api/router/wrapper/request_logger_test.go index ac025e02d7..36397b58fb 100644 --- a/api/router/wrapper/request_logger_test.go +++ b/api/router/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routerfakes" - . "code.cloudfoundry.org/cli/api/router/wrapper" - "code.cloudfoundry.org/cli/api/router/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v8/api/router/wrapper" + "code.cloudfoundry.org/cli/v8/api/router/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/router/wrapper/uaa_authentication.go b/api/router/wrapper/uaa_authentication.go index 6fca8a07d8..cf2766c3ef 100644 --- a/api/router/wrapper/uaa_authentication.go +++ b/api/router/wrapper/uaa_authentication.go @@ -1,9 +1,9 @@ package wrapper import ( - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v8/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/router/wrapper/uaa_authentication_test.go b/api/router/wrapper/uaa_authentication_test.go index 73320125a9..5f288ade4a 100644 --- a/api/router/wrapper/uaa_authentication_test.go +++ b/api/router/wrapper/uaa_authentication_test.go @@ -6,13 +6,13 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" - "code.cloudfoundry.org/cli/api/router/routerfakes" - . "code.cloudfoundry.org/cli/api/router/wrapper" - "code.cloudfoundry.org/cli/api/router/wrapper/wrapperfakes" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v8/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v8/api/router/wrapper" + "code.cloudfoundry.org/cli/v8/api/router/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/router/wrapper/wrapperfakes/fake_request_logger_output.go b/api/router/wrapper/wrapperfakes/fake_request_logger_output.go index 665f9441df..9ce2e5c7d3 100644 --- a/api/router/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/router/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/router/wrapper" + "code.cloudfoundry.org/cli/v8/api/router/wrapper" ) type FakeRequestLoggerOutput struct { diff --git a/api/router/wrapper/wrapperfakes/fake_token_cache.go b/api/router/wrapper/wrapperfakes/fake_token_cache.go index 780d388a0b..85a630477f 100644 --- a/api/router/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/router/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/router/wrapper" + "code.cloudfoundry.org/cli/v8/api/router/wrapper" ) type FakeTokenCache struct { diff --git a/api/router/wrapper/wrapperfakes/fake_uaaclient.go b/api/router/wrapper/wrapperfakes/fake_uaaclient.go index e534f49ba4..5b0806abb6 100644 --- a/api/router/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/router/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/router/wrapper" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/router/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa" ) type FakeUAAClient struct { diff --git a/api/shared/wrap_for_cf_on_k8s.go b/api/shared/wrap_for_cf_on_k8s.go index d5734d6ffd..383452510b 100644 --- a/api/shared/wrap_for_cf_on_k8s.go +++ b/api/shared/wrap_for_cf_on_k8s.go @@ -15,8 +15,8 @@ import ( "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/transport" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" // imported for the side effects _ "k8s.io/client-go/plugin/pkg/client/auth/azure" diff --git a/api/shared/wrap_for_cf_on_k8s_test.go b/api/shared/wrap_for_cf_on_k8s_test.go index f79b605091..05a52fdad1 100644 --- a/api/shared/wrap_for_cf_on_k8s_test.go +++ b/api/shared/wrap_for_cf_on_k8s_test.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/shared" - "code.cloudfoundry.org/cli/api/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v8/api/shared" + "code.cloudfoundry.org/cli/v8/api/shared/sharedfakes" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/integration/helpers" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" diff --git a/api/uaa/auth.go b/api/uaa/auth.go index f12da64f16..4045a2b98a 100644 --- a/api/uaa/auth.go +++ b/api/uaa/auth.go @@ -8,8 +8,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/api/uaa/internal" ) // AuthResponse contains the access token and refresh token which are granted diff --git a/api/uaa/auth_test.go b/api/uaa/auth_test.go index b7002c3b79..9bb4537511 100644 --- a/api/uaa/auth_test.go +++ b/api/uaa/auth_test.go @@ -6,9 +6,9 @@ import ( "net/http" "net/url" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/client.go b/api/uaa/client.go index a8ccd54e4f..e616f8a01d 100644 --- a/api/uaa/client.go +++ b/api/uaa/client.go @@ -9,7 +9,8 @@ import ( "fmt" "runtime" - "code.cloudfoundry.org/cli/api/uaa/internal" + legacy "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/internal" ) // Client is the UAA client @@ -21,6 +22,8 @@ type Client struct { connection Connection router *internal.Router userAgent string + + legacyClient *legacy.Client } // NewClient returns a new UAA Client with the provided configuration @@ -38,8 +41,14 @@ func NewClient(config Config) *Client { connection: NewConnection(config.SkipSSLValidation(), config.UAADisableKeepAlives(), config.DialTimeout()), userAgent: userAgent, + + legacyClient: legacy.NewClient(config), } client.WrapConnection(NewErrorWrapper()) return &client } + +func (c Client) LegacyClient() *legacy.Client { + return c.legacyClient +} diff --git a/api/uaa/client_test.go b/api/uaa/client_test.go index fa68377604..b6cabeb70e 100644 --- a/api/uaa/client_test.go +++ b/api/uaa/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/error_converter_test.go b/api/uaa/error_converter_test.go index a3fb659690..a23509fa4b 100644 --- a/api/uaa/error_converter_test.go +++ b/api/uaa/error_converter_test.go @@ -3,8 +3,8 @@ package uaa_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/info_test.go b/api/uaa/info_test.go index 2657447a38..3f58a6f0cf 100644 --- a/api/uaa/info_test.go +++ b/api/uaa/info_test.go @@ -1,7 +1,7 @@ package uaa_test import ( - . "code.cloudfoundry.org/cli/api/uaa" + . "code.cloudfoundry.org/cli/v8/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/internal/routing_test.go b/api/uaa/internal/routing_test.go index e808296c04..0a804607b5 100644 --- a/api/uaa/internal/routing_test.go +++ b/api/uaa/internal/routing_test.go @@ -3,7 +3,7 @@ package internal_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/uaa/internal" + . "code.cloudfoundry.org/cli/v8/api/uaa/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go b/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go index d905db448b..28909d7636 100644 --- a/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go +++ b/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go @@ -4,7 +4,7 @@ package noaabridgefakes import ( "sync" - "code.cloudfoundry.org/cli/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v8/api/uaa/noaabridge" ) type FakeTokenCache struct { diff --git a/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go b/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go index 21ec904816..4e546562c7 100644 --- a/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go +++ b/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package noaabridgefakes import ( "sync" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/noaabridge" ) type FakeUAAClient struct { diff --git a/api/uaa/noaabridge/token_refresher.go b/api/uaa/noaabridge/token_refresher.go index 1c5278618b..3e588b6cb4 100644 --- a/api/uaa/noaabridge/token_refresher.go +++ b/api/uaa/noaabridge/token_refresher.go @@ -2,7 +2,7 @@ // TokenRefresher interface for noaa/consumer. package noaabridge -import "code.cloudfoundry.org/cli/api/uaa" +import "code.cloudfoundry.org/cli/v8/api/uaa" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/uaa/noaabridge/token_refresher_test.go b/api/uaa/noaabridge/token_refresher_test.go index b7bdf5fcee..59294d0f86 100644 --- a/api/uaa/noaabridge/token_refresher_test.go +++ b/api/uaa/noaabridge/token_refresher_test.go @@ -3,9 +3,9 @@ package noaabridge_test import ( "errors" - "code.cloudfoundry.org/cli/api/uaa" - . "code.cloudfoundry.org/cli/api/uaa/noaabridge" - "code.cloudfoundry.org/cli/api/uaa/noaabridge/noaabridgefakes" + "code.cloudfoundry.org/cli/v8/api/uaa" + . "code.cloudfoundry.org/cli/v8/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v8/api/uaa/noaabridge/noaabridgefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/prompts_test.go b/api/uaa/prompts_test.go index 117a12586e..f2c273df49 100644 --- a/api/uaa/prompts_test.go +++ b/api/uaa/prompts_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/api/uaa" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v8/api/uaa" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/refresh_token.go b/api/uaa/refresh_token.go index fba19e211e..f68e9a663b 100644 --- a/api/uaa/refresh_token.go +++ b/api/uaa/refresh_token.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/api/uaa/internal" ) // RefreshedTokens represents the UAA refresh token response. diff --git a/api/uaa/refresh_token_test.go b/api/uaa/refresh_token_test.go index 92359d38b3..03a2bec62b 100644 --- a/api/uaa/refresh_token_test.go +++ b/api/uaa/refresh_token_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/request.go b/api/uaa/request.go index a49df595b4..db3d93af98 100644 --- a/api/uaa/request.go +++ b/api/uaa/request.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v8/api/uaa/internal" ) // RequestOptions contains all the options to create an HTTP Request. diff --git a/api/uaa/resources.go b/api/uaa/resources.go index 5a674db8c6..1184e5ef77 100644 --- a/api/uaa/resources.go +++ b/api/uaa/resources.go @@ -1,7 +1,7 @@ package uaa import ( - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v8/api/uaa/internal" ) // SetupResources configures the client to use the specified settings and diescopers the UAA and Authentication resources diff --git a/api/uaa/resources_test.go b/api/uaa/resources_test.go index 23543858ad..355f4263ca 100644 --- a/api/uaa/resources_test.go +++ b/api/uaa/resources_test.go @@ -1,8 +1,8 @@ package uaa_test import ( - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/ssh.go b/api/uaa/ssh.go index 01cff5eeaa..d8091cd74d 100644 --- a/api/uaa/ssh.go +++ b/api/uaa/ssh.go @@ -3,7 +3,7 @@ package uaa import ( "net/url" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v8/api/uaa/internal" ) func (client *Client) GetSSHPasscode(accessToken string, sshOAuthClient string) (string, error) { diff --git a/api/uaa/ssh_test.go b/api/uaa/ssh_test.go index 94ff807109..a8628090c7 100644 --- a/api/uaa/ssh_test.go +++ b/api/uaa/ssh_test.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/uaa_connection.go b/api/uaa/uaa_connection.go index 69c6be93fd..fd90a004ef 100644 --- a/api/uaa/uaa_connection.go +++ b/api/uaa/uaa_connection.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/util" ) // UAAConnection represents the connection to UAA diff --git a/api/uaa/uaa_connection_test.go b/api/uaa/uaa_connection_test.go index 25009795a4..8f05b8eee4 100644 --- a/api/uaa/uaa_connection_test.go +++ b/api/uaa/uaa_connection_test.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/uaa" + . "code.cloudfoundry.org/cli/v8/api/uaa" . "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 a8d48f4975..66269e34a3 100644 --- a/api/uaa/uaa_suite_test.go +++ b/api/uaa/uaa_suite_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/uaafakes/fake_config.go b/api/uaa/uaafakes/fake_config.go index 02dc7f5e99..7161dbf87d 100644 --- a/api/uaa/uaafakes/fake_config.go +++ b/api/uaa/uaafakes/fake_config.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa" ) type FakeConfig struct { diff --git a/api/uaa/uaafakes/fake_connection.go b/api/uaa/uaafakes/fake_connection.go index b9013ee19d..03986a5dba 100644 --- a/api/uaa/uaafakes/fake_connection.go +++ b/api/uaa/uaafakes/fake_connection.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa" ) type FakeConnection struct { diff --git a/api/uaa/uaafakes/fake_connection_wrapper.go b/api/uaa/uaafakes/fake_connection_wrapper.go index 98ef73893f..7c12cc8d3e 100644 --- a/api/uaa/uaafakes/fake_connection_wrapper.go +++ b/api/uaa/uaafakes/fake_connection_wrapper.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa" ) type FakeConnectionWrapper struct { diff --git a/api/uaa/user.go b/api/uaa/user.go index 0ca5fa9d39..50df8e4276 100644 --- a/api/uaa/user.go +++ b/api/uaa/user.go @@ -7,8 +7,8 @@ import ( "net/http" "net/url" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/uaa/internal" ) // User represents an UAA user account. diff --git a/api/uaa/user_test.go b/api/uaa/user_test.go index e86ade3a0c..a92a4713ce 100644 --- a/api/uaa/user_test.go +++ b/api/uaa/user_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/version_test.go b/api/uaa/version_test.go index 780bd814ca..245b85742d 100644 --- a/api/uaa/version_test.go +++ b/api/uaa/version_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/api/uaa" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v8/api/uaa" + . "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/request_logger.go b/api/uaa/wrapper/request_logger.go index 8e03425211..1f08e23257 100644 --- a/api/uaa/wrapper/request_logger.go +++ b/api/uaa/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/uaa/wrapper/request_logger_test.go b/api/uaa/wrapper/request_logger_test.go index b7b0f036fa..2919d42eb0 100644 --- a/api/uaa/wrapper/request_logger_test.go +++ b/api/uaa/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/api/uaa/wrapper" - "code.cloudfoundry.org/cli/api/uaa/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/retry_request.go b/api/uaa/wrapper/retry_request.go index fa5c110353..c02278d5bf 100644 --- a/api/uaa/wrapper/retry_request.go +++ b/api/uaa/wrapper/retry_request.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/uaa/wrapper/retry_request_test.go b/api/uaa/wrapper/retry_request_test.go index 7c0270dec9..9ee42eca79 100644 --- a/api/uaa/wrapper/retry_request_test.go +++ b/api/uaa/wrapper/retry_request_test.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/uaa_authentication.go b/api/uaa/wrapper/uaa_authentication.go index 96bc7e64d0..91afe62e28 100644 --- a/api/uaa/wrapper/uaa_authentication.go +++ b/api/uaa/wrapper/uaa_authentication.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/uaa/wrapper/uaa_authentication_test.go b/api/uaa/wrapper/uaa_authentication_test.go index 055dac1f79..516f7a21e9 100644 --- a/api/uaa/wrapper/uaa_authentication_test.go +++ b/api/uaa/wrapper/uaa_authentication_test.go @@ -8,11 +8,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/api/uaa/wrapper" - "code.cloudfoundry.org/cli/api/uaa/wrapper/util" - "code.cloudfoundry.org/cli/api/uaa/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go b/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go index 4d6ba759ad..00eea2a61d 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" ) type FakeRequestLoggerOutput struct { diff --git a/api/uaa/wrapper/wrapperfakes/fake_token_cache.go b/api/uaa/wrapper/wrapperfakes/fake_token_cache.go index b1516a14ad..62fca90656 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/uaa/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" ) type FakeTokenCache struct { diff --git a/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go b/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go index 57836aafcd..7156fe7d73 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" ) type FakeUAAClient struct { diff --git a/cf/actors/actors_suite_test.go b/cf/actors/actors_suite_test.go index d40c9f87f6..5480df72c5 100644 --- a/cf/actors/actors_suite_test.go +++ b/cf/actors/actors_suite_test.go @@ -1,8 +1,8 @@ package actors_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/actorsfakes/fake_push_actor.go b/cf/actors/actorsfakes/fake_push_actor.go index caa013a686..571c0c8265 100644 --- a/cf/actors/actorsfakes/fake_push_actor.go +++ b/cf/actors/actorsfakes/fake_push_actor.go @@ -5,9 +5,9 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakePushActor struct { diff --git a/cf/actors/actorsfakes/fake_route_actor.go b/cf/actors/actorsfakes/fake_route_actor.go index 795612f425..4f7f40933b 100644 --- a/cf/actors/actorsfakes/fake_route_actor.go +++ b/cf/actors/actorsfakes/fake_route_actor.go @@ -4,8 +4,8 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeRouteActor struct { diff --git a/cf/actors/actorsfakes/fake_service_actor.go b/cf/actors/actorsfakes/fake_service_actor.go index 292c15a4da..5f55496069 100644 --- a/cf/actors/actorsfakes/fake_service_actor.go +++ b/cf/actors/actorsfakes/fake_service_actor.go @@ -4,8 +4,8 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServiceActor struct { diff --git a/cf/actors/actorsfakes/fake_service_plan_actor.go b/cf/actors/actorsfakes/fake_service_plan_actor.go index 35cd597e58..9adbb8985e 100644 --- a/cf/actors/actorsfakes/fake_service_plan_actor.go +++ b/cf/actors/actorsfakes/fake_service_plan_actor.go @@ -4,7 +4,7 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/actors" ) type FakeServicePlanActor struct { diff --git a/cf/actors/brokerbuilder/broker_builder.go b/cf/actors/brokerbuilder/broker_builder.go index e46d9501f5..97c0e0076b 100644 --- a/cf/actors/brokerbuilder/broker_builder.go +++ b/cf/actors/brokerbuilder/broker_builder.go @@ -1,9 +1,9 @@ package brokerbuilder import ( - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BrokerBuilder diff --git a/cf/actors/brokerbuilder/broker_builder_test.go b/cf/actors/brokerbuilder/broker_builder_test.go index 8d00992732..ec3a17b6e7 100644 --- a/cf/actors/brokerbuilder/broker_builder_test.go +++ b/cf/actors/brokerbuilder/broker_builder_test.go @@ -3,11 +3,11 @@ package brokerbuilder_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go b/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go index 8afcd08a52..a94e808087 100644 --- a/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go +++ b/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go @@ -4,8 +4,8 @@ package brokerbuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeBrokerBuilder struct { diff --git a/cf/actors/planbuilder/plan_builder.go b/cf/actors/planbuilder/plan_builder.go index 871f450a4e..4d735ba577 100644 --- a/cf/actors/planbuilder/plan_builder.go +++ b/cf/actors/planbuilder/plan_builder.go @@ -1,9 +1,9 @@ package planbuilder import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PlanBuilder diff --git a/cf/actors/planbuilder/plan_builder_test.go b/cf/actors/planbuilder/plan_builder_test.go index f49c1b6a1f..8f842bb11c 100644 --- a/cf/actors/planbuilder/plan_builder_test.go +++ b/cf/actors/planbuilder/plan_builder_test.go @@ -3,10 +3,10 @@ package planbuilder_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go b/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go index 73e44142c0..ec8080b956 100644 --- a/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go +++ b/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go @@ -4,8 +4,8 @@ package planbuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakePlanBuilder struct { diff --git a/cf/actors/plugininstaller/plugin_downloader.go b/cf/actors/plugininstaller/plugin_downloader.go index b431d11d44..d6be89fcc2 100644 --- a/cf/actors/plugininstaller/plugin_downloader.go +++ b/cf/actors/plugininstaller/plugin_downloader.go @@ -7,9 +7,9 @@ import ( "runtime" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/downloader" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/downloader" ) type PluginDownloader struct { diff --git a/cf/actors/plugininstaller/plugin_installer.go b/cf/actors/plugininstaller/plugin_installer.go index d7b8724f17..cc173e17b6 100644 --- a/cf/actors/plugininstaller/plugin_installer.go +++ b/cf/actors/plugininstaller/plugin_installer.go @@ -1,11 +1,11 @@ package plugininstaller import ( - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/downloader" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/downloader" + "code.cloudfoundry.org/cli/v8/util" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginInstaller diff --git a/cf/actors/plugininstaller/plugin_installer_with_repo.go b/cf/actors/plugininstaller/plugin_installer_with_repo.go index 50845ff4a2..d861446326 100644 --- a/cf/actors/plugininstaller/plugin_installer_with_repo.go +++ b/cf/actors/plugininstaller/plugin_installer_with_repo.go @@ -5,11 +5,11 @@ import ( "strings" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/util" ) type pluginInstallerWithRepo struct { diff --git a/cf/actors/plugininstaller/plugin_installer_without_repo.go b/cf/actors/plugininstaller/plugin_installer_without_repo.go index 7cf0bf9703..10b2787dae 100644 --- a/cf/actors/plugininstaller/plugin_installer_without_repo.go +++ b/cf/actors/plugininstaller/plugin_installer_without_repo.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type pluginInstallerWithoutRepo struct { diff --git a/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go b/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go index fd496df711..45c132a499 100644 --- a/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go +++ b/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go @@ -4,7 +4,7 @@ package plugininstallerfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/plugininstaller" + "code.cloudfoundry.org/cli/v8/cf/actors/plugininstaller" ) type FakePluginInstaller struct { diff --git a/cf/actors/pluginrepo/plugin_repo.go b/cf/actors/pluginrepo/plugin_repo.go index e7ac7ef6be..2196e5575b 100644 --- a/cf/actors/pluginrepo/plugin_repo.go +++ b/cf/actors/pluginrepo/plugin_repo.go @@ -8,9 +8,9 @@ import ( "strings" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginRepo diff --git a/cf/actors/pluginrepo/plugin_repo_suite_test.go b/cf/actors/pluginrepo/plugin_repo_suite_test.go index cbb56b8b87..638c7d68db 100644 --- a/cf/actors/pluginrepo/plugin_repo_suite_test.go +++ b/cf/actors/pluginrepo/plugin_repo_suite_test.go @@ -1,8 +1,8 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/pluginrepo/plugin_repo_test.go b/cf/actors/pluginrepo/plugin_repo_test.go index 3247dd2800..6bd5415ba8 100644 --- a/cf/actors/pluginrepo/plugin_repo_test.go +++ b/cf/actors/pluginrepo/plugin_repo_test.go @@ -5,9 +5,9 @@ import ( "net/http" "net/http/httptest" - . "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go b/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go index 8971d8783c..776d1b4e74 100644 --- a/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go +++ b/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go @@ -4,9 +4,9 @@ package pluginrepofakes import ( "sync" - "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8-plugin-repo/web" + "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakePluginRepo struct { diff --git a/cf/actors/push.go b/cf/actors/push.go index 182e2b2f30..24942ec5bc 100644 --- a/cf/actors/push.go +++ b/cf/actors/push.go @@ -7,11 +7,11 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/appfiles" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/appfiles" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/actors/push_test.go b/cf/actors/push_test.go index 205850e52c..46145cedf6 100644 --- a/cf/actors/push_test.go +++ b/cf/actors/push_test.go @@ -8,13 +8,13 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/applicationbits/applicationbitsfakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/appfiles/appfilesfakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/applicationbits/applicationbitsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/appfiles/appfilesfakes" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/routes.go b/cf/actors/routes.go index 0b36048050..361bdfb780 100644 --- a/cf/actors/routes.go +++ b/cf/actors/routes.go @@ -5,12 +5,12 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/util/randomword" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/util/randomword" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteActor @@ -58,7 +58,7 @@ func (routeActor routeActor) CreateRandomTCPRoute(domain models.DomainFields) (m func (routeActor routeActor) FindOrCreateRoute(hostname string, domain models.DomainFields, path string, port int, useRandomPort bool) (models.Route, error) { var route models.Route var err error - //if tcp route use random port should skip route lookup + // if tcp route use random port should skip route lookup if useRandomPort && domain.RouterGroupType == tcp { err = new(errors.ModelNotFoundError) } else { diff --git a/cf/actors/routes_test.go b/cf/actors/routes_test.go index 95176a5042..c8be541120 100644 --- a/cf/actors/routes_test.go +++ b/cf/actors/routes_test.go @@ -3,12 +3,12 @@ package actors_test import ( "errors" - . "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/apifakes" - cferrors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/errors/errorsfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" + . "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + cferrors "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/errors/errorsfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/servicebuilder/service_builder.go b/cf/actors/servicebuilder/service_builder.go index c91f07a7b1..d719ba0034 100644 --- a/cf/actors/servicebuilder/service_builder.go +++ b/cf/actors/servicebuilder/service_builder.go @@ -3,9 +3,9 @@ package servicebuilder import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBuilder diff --git a/cf/actors/servicebuilder/service_builder_test.go b/cf/actors/servicebuilder/service_builder_test.go index 380fcbb9b7..83a0290ce9 100644 --- a/cf/actors/servicebuilder/service_builder_test.go +++ b/cf/actors/servicebuilder/service_builder_test.go @@ -3,11 +3,11 @@ package servicebuilder_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go b/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go index 2a05297cc3..f3ef94d04c 100644 --- a/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go +++ b/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go @@ -4,8 +4,8 @@ package servicebuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServiceBuilder struct { diff --git a/cf/actors/services.go b/cf/actors/services.go index c776e317a3..bc081e0e71 100644 --- a/cf/actors/services.go +++ b/cf/actors/services.go @@ -1,10 +1,10 @@ package actors import ( - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceActor diff --git a/cf/actors/services_plans.go b/cf/actors/services_plans.go index 47bc690aff..c40dd98e03 100644 --- a/cf/actors/services_plans.go +++ b/cf/actors/services_plans.go @@ -3,12 +3,12 @@ package actors import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanActor diff --git a/cf/actors/services_plans_test.go b/cf/actors/services_plans_test.go index ebd27048be..7720bc2c1a 100644 --- a/cf/actors/services_plans_test.go +++ b/cf/actors/services_plans_test.go @@ -1,14 +1,14 @@ package actors_test import ( - "code.cloudfoundry.org/cli/cf/errors" - - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/errors" + + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/services_test.go b/cf/actors/services_test.go index 16e5891b34..f71ae92716 100644 --- a/cf/actors/services_test.go +++ b/cf/actors/services_test.go @@ -1,12 +1,12 @@ package actors_test import ( - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder/brokerbuilderfakes" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder/brokerbuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/userprint/plugin.go b/cf/actors/userprint/plugin.go index a5e4f2aab6..2474aa11a4 100644 --- a/cf/actors/userprint/plugin.go +++ b/cf/actors/userprint/plugin.go @@ -1,8 +1,8 @@ package userprint import ( - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/plugin/models" ) type pluginPrinter struct { diff --git a/cf/actors/userprint/ui.go b/cf/actors/userprint/ui.go index e75ad01ea0..ad2ecb5039 100644 --- a/cf/actors/userprint/ui.go +++ b/cf/actors/userprint/ui.go @@ -1,9 +1,9 @@ package userprint import ( - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SpaceUsersUIPrinter struct { diff --git a/cf/actors/userprint/userprintfakes/fake_user_printer.go b/cf/actors/userprint/userprintfakes/fake_user_printer.go index 006670f0b3..443ce542dc 100644 --- a/cf/actors/userprint/userprintfakes/fake_user_printer.go +++ b/cf/actors/userprint/userprintfakes/fake_user_printer.go @@ -4,7 +4,7 @@ package userprintfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/actors/userprint" + "code.cloudfoundry.org/cli/v8/cf/actors/userprint" ) type FakeUserPrinter struct { diff --git a/cf/api/api_suite_test.go b/cf/api/api_suite_test.go index 063a28603b..44c036cb86 100644 --- a/cf/api/api_suite_test.go +++ b/cf/api/api_suite_test.go @@ -1,8 +1,8 @@ package api_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/apifakes/fake_app_summary_repository.go b/cf/api/apifakes/fake_app_summary_repository.go index 57f5838b1a..f42bf309f6 100644 --- a/cf/api/apifakes/fake_app_summary_repository.go +++ b/cf/api/apifakes/fake_app_summary_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeAppSummaryRepository struct { diff --git a/cf/api/apifakes/fake_buildpack_bits_repository.go b/cf/api/apifakes/fake_buildpack_bits_repository.go index abe7210975..58a208c376 100644 --- a/cf/api/apifakes/fake_buildpack_bits_repository.go +++ b/cf/api/apifakes/fake_buildpack_bits_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeBuildpackBitsRepository struct { diff --git a/cf/api/apifakes/fake_buildpack_repository.go b/cf/api/apifakes/fake_buildpack_repository.go index 305e43965b..382706a3e4 100644 --- a/cf/api/apifakes/fake_buildpack_repository.go +++ b/cf/api/apifakes/fake_buildpack_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeBuildpackRepository struct { diff --git a/cf/api/apifakes/fake_client_repository.go b/cf/api/apifakes/fake_client_repository.go index f470961a95..f59e450419 100644 --- a/cf/api/apifakes/fake_client_repository.go +++ b/cf/api/apifakes/fake_client_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api" ) type FakeClientRepository struct { diff --git a/cf/api/apifakes/fake_curl_repository.go b/cf/api/apifakes/fake_curl_repository.go index 5be62978a6..b6aeb4af56 100644 --- a/cf/api/apifakes/fake_curl_repository.go +++ b/cf/api/apifakes/fake_curl_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api" ) type FakeCurlRepository struct { diff --git a/cf/api/apifakes/fake_domain_repository.go b/cf/api/apifakes/fake_domain_repository.go index d87faffe6d..4eb7da2f3a 100644 --- a/cf/api/apifakes/fake_domain_repository.go +++ b/cf/api/apifakes/fake_domain_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeDomainRepository struct { diff --git a/cf/api/apifakes/fake_route_repository.go b/cf/api/apifakes/fake_route_repository.go index 1400d7ee04..92d1469891 100644 --- a/cf/api/apifakes/fake_route_repository.go +++ b/cf/api/apifakes/fake_route_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeRouteRepository struct { diff --git a/cf/api/apifakes/fake_route_service_binding_repository.go b/cf/api/apifakes/fake_route_service_binding_repository.go index 2c93527c84..10940a81b5 100644 --- a/cf/api/apifakes/fake_route_service_binding_repository.go +++ b/cf/api/apifakes/fake_route_service_binding_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api" ) type FakeRouteServiceBindingRepository struct { diff --git a/cf/api/apifakes/fake_routing_apirepository.go b/cf/api/apifakes/fake_routing_apirepository.go index e821850e54..6c24894069 100644 --- a/cf/api/apifakes/fake_routing_apirepository.go +++ b/cf/api/apifakes/fake_routing_apirepository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeRoutingAPIRepository struct { diff --git a/cf/api/apifakes/fake_service_auth_token_repository.go b/cf/api/apifakes/fake_service_auth_token_repository.go index d68f7817ff..8c5fea1a85 100644 --- a/cf/api/apifakes/fake_service_auth_token_repository.go +++ b/cf/api/apifakes/fake_service_auth_token_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServiceAuthTokenRepository struct { diff --git a/cf/api/apifakes/fake_service_binding_repository.go b/cf/api/apifakes/fake_service_binding_repository.go index 265da6a06a..1c14637710 100644 --- a/cf/api/apifakes/fake_service_binding_repository.go +++ b/cf/api/apifakes/fake_service_binding_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServiceBindingRepository struct { diff --git a/cf/api/apifakes/fake_service_broker_repository.go b/cf/api/apifakes/fake_service_broker_repository.go index 90f1206df3..18f2cac194 100644 --- a/cf/api/apifakes/fake_service_broker_repository.go +++ b/cf/api/apifakes/fake_service_broker_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServiceBrokerRepository struct { diff --git a/cf/api/apifakes/fake_service_key_repository.go b/cf/api/apifakes/fake_service_key_repository.go index d919c306d8..01baa02e2b 100644 --- a/cf/api/apifakes/fake_service_key_repository.go +++ b/cf/api/apifakes/fake_service_key_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServiceKeyRepository struct { diff --git a/cf/api/apifakes/fake_service_plan_repository.go b/cf/api/apifakes/fake_service_plan_repository.go index e650477f61..9e1699b1fb 100644 --- a/cf/api/apifakes/fake_service_plan_repository.go +++ b/cf/api/apifakes/fake_service_plan_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServicePlanRepository struct { diff --git a/cf/api/apifakes/fake_service_plan_visibility_repository.go b/cf/api/apifakes/fake_service_plan_visibility_repository.go index dcf0e32cba..0699c3ab8b 100644 --- a/cf/api/apifakes/fake_service_plan_visibility_repository.go +++ b/cf/api/apifakes/fake_service_plan_visibility_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServicePlanVisibilityRepository struct { diff --git a/cf/api/apifakes/fake_service_repository.go b/cf/api/apifakes/fake_service_repository.go index 752834cfad..a83227be35 100644 --- a/cf/api/apifakes/fake_service_repository.go +++ b/cf/api/apifakes/fake_service_repository.go @@ -4,9 +4,9 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServiceRepository struct { diff --git a/cf/api/apifakes/fake_service_summary_repository.go b/cf/api/apifakes/fake_service_summary_repository.go index f2ca290524..c307bc0c21 100644 --- a/cf/api/apifakes/fake_service_summary_repository.go +++ b/cf/api/apifakes/fake_service_summary_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeServiceSummaryRepository struct { diff --git a/cf/api/apifakes/fake_user_provided_service_instance_repository.go b/cf/api/apifakes/fake_user_provided_service_instance_repository.go index 175e18d2bf..047dcfb9af 100644 --- a/cf/api/apifakes/fake_user_provided_service_instance_repository.go +++ b/cf/api/apifakes/fake_user_provided_service_instance_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeUserProvidedServiceInstanceRepository struct { diff --git a/cf/api/apifakes/fake_user_repository.go b/cf/api/apifakes/fake_user_repository.go index 04fa96b965..9895b93f91 100644 --- a/cf/api/apifakes/fake_user_repository.go +++ b/cf/api/apifakes/fake_user_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeUserRepository struct { diff --git a/cf/api/apifakes/old_fake_app_summary_repo.go b/cf/api/apifakes/old_fake_app_summary_repo.go index 25c6de4982..fa376a99bc 100644 --- a/cf/api/apifakes/old_fake_app_summary_repo.go +++ b/cf/api/apifakes/old_fake_app_summary_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" ) type OldFakeAppSummaryRepo struct { diff --git a/cf/api/apifakes/old_fake_auth_token_repo.go b/cf/api/apifakes/old_fake_auth_token_repo.go index 4fb3576bad..3ab8e08064 100644 --- a/cf/api/apifakes/old_fake_auth_token_repo.go +++ b/cf/api/apifakes/old_fake_auth_token_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type OldFakeAuthTokenRepo struct { CreatedServiceAuthTokenFields models.ServiceAuthTokenFields diff --git a/cf/api/apifakes/old_fake_buildpack_bits_repo.go b/cf/api/apifakes/old_fake_buildpack_bits_repo.go index b82b3a0e6d..f620c1d107 100644 --- a/cf/api/apifakes/old_fake_buildpack_bits_repo.go +++ b/cf/api/apifakes/old_fake_buildpack_bits_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" ) type OldFakeBuildpackBitsRepository struct { diff --git a/cf/api/apifakes/old_fake_buildpack_repo.go b/cf/api/apifakes/old_fake_buildpack_repo.go index 1b361d6e7f..75f276e8ed 100644 --- a/cf/api/apifakes/old_fake_buildpack_repo.go +++ b/cf/api/apifakes/old_fake_buildpack_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" ) type OldFakeBuildpackRepository struct { diff --git a/cf/api/apifakes/old_fake_cc_request.go b/cf/api/apifakes/old_fake_cc_request.go index 0b64b79c80..3d520a1822 100644 --- a/cf/api/apifakes/old_fake_cc_request.go +++ b/cf/api/apifakes/old_fake_cc_request.go @@ -3,7 +3,7 @@ package apifakes import ( "net/http" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" ) func NewCloudControllerTestRequest(request testnet.TestRequest) testnet.TestRequest { diff --git a/cf/api/apifakes/old_fake_password_repo.go b/cf/api/apifakes/old_fake_password_repo.go index 53798334cd..68c6c3cff7 100644 --- a/cf/api/apifakes/old_fake_password_repo.go +++ b/cf/api/apifakes/old_fake_password_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/cf/errors" +import "code.cloudfoundry.org/cli/v8/cf/errors" type OldFakePasswordRepo struct { Score string diff --git a/cf/api/apifakes/old_fake_service_key_repo.go b/cf/api/apifakes/old_fake_service_key_repo.go index fcc19904e9..d5e40af811 100644 --- a/cf/api/apifakes/old_fake_service_key_repo.go +++ b/cf/api/apifakes/old_fake_service_key_repo.go @@ -1,7 +1,7 @@ package apifakes import ( - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" ) type OldFakeServiceKeyRepo struct { diff --git a/cf/api/apifakes/old_fake_service_plan_repo.go b/cf/api/apifakes/old_fake_service_plan_repo.go index 832b2f0c3c..ac0b0b0565 100644 --- a/cf/api/apifakes/old_fake_service_plan_repo.go +++ b/cf/api/apifakes/old_fake_service_plan_repo.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" ) type OldFakeServicePlanRepo struct { @@ -44,7 +44,7 @@ func (fake *OldFakeServicePlanRepo) Search(queryParams map[string]string) ([]mod } if queryParams == nil { - //return everything + // return everything var returnPlans []models.ServicePlanFields for _, value := range fake.SearchReturns { returnPlans = append(returnPlans, value...) diff --git a/cf/api/apifakes/old_fake_service_summary_repo.go b/cf/api/apifakes/old_fake_service_summary_repo.go index fed622ff3c..5fce171683 100644 --- a/cf/api/apifakes/old_fake_service_summary_repo.go +++ b/cf/api/apifakes/old_fake_service_summary_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type OldFakeServiceSummaryRepo struct { GetSummariesInCurrentSpaceInstances []models.ServiceInstance diff --git a/cf/api/app_summary.go b/cf/api/app_summary.go index 15a9b2387a..d67ecb8b4c 100644 --- a/cf/api/app_summary.go +++ b/cf/api/app_summary.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) type ApplicationSummaries struct { diff --git a/cf/api/app_summary_test.go b/cf/api/app_summary_test.go index 36f0b0e0d7..6d2c7d6eaa 100644 --- a/cf/api/app_summary_test.go +++ b/cf/api/app_summary_test.go @@ -5,14 +5,14 @@ import ( "net/http/httptest" "time" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appevents/app_events.go b/cf/api/appevents/app_events.go index a1bc966c83..b6463f62f3 100644 --- a/cf/api/appevents/app_events.go +++ b/cf/api/appevents/app_events.go @@ -3,10 +3,10 @@ package appevents import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/appevents/app_events_suite_test.go b/cf/api/appevents/app_events_suite_test.go index 72faadddf9..6bd71155a9 100644 --- a/cf/api/appevents/app_events_suite_test.go +++ b/cf/api/appevents/app_events_suite_test.go @@ -1,8 +1,8 @@ package appevents_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appevents/app_events_test.go b/cf/api/appevents/app_events_test.go index 3edf21f978..7330fbd982 100644 --- a/cf/api/appevents/app_events_test.go +++ b/cf/api/appevents/app_events_test.go @@ -6,14 +6,14 @@ import ( "time" - . "code.cloudfoundry.org/cli/cf/api/appevents" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "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" + . "code.cloudfoundry.org/cli/v8/cf/api/appevents" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appevents/appeventsfakes/fake_app_events_repository.go b/cf/api/appevents/appeventsfakes/fake_app_events_repository.go index 601be0df59..2b854c8f30 100644 --- a/cf/api/appevents/appeventsfakes/fake_app_events_repository.go +++ b/cf/api/appevents/appeventsfakes/fake_app_events_repository.go @@ -4,8 +4,8 @@ package appeventsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appevents" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/appevents" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeAppEventsRepository struct { diff --git a/cf/api/appevents/appeventsfakes/fake_repository.go b/cf/api/appevents/appeventsfakes/fake_repository.go index 1c62f9dde9..a229e46fe2 100644 --- a/cf/api/appevents/appeventsfakes/fake_repository.go +++ b/cf/api/appevents/appeventsfakes/fake_repository.go @@ -4,8 +4,8 @@ package appeventsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appevents" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/appevents" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeRepository struct { diff --git a/cf/api/appfiles/app_files.go b/cf/api/appfiles/app_files.go index 473b27e122..982006c46a 100644 --- a/cf/api/appfiles/app_files.go +++ b/cf/api/appfiles/app_files.go @@ -3,8 +3,8 @@ package appfiles import ( "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/appfiles/app_files_suite_test.go b/cf/api/appfiles/app_files_suite_test.go index f1e204e4e1..cda4809d9f 100644 --- a/cf/api/appfiles/app_files_suite_test.go +++ b/cf/api/appfiles/app_files_suite_test.go @@ -1,8 +1,8 @@ package appfiles_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appfiles/app_files_test.go b/cf/api/appfiles/app_files_test.go index 62f6484f2e..afdd65236e 100644 --- a/cf/api/appfiles/app_files_test.go +++ b/cf/api/appfiles/app_files_test.go @@ -6,15 +6,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api/appfiles" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/api/appfiles" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go b/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go index f3d46847d7..15b944270d 100644 --- a/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go +++ b/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appfiles" + "code.cloudfoundry.org/cli/v8/cf/api/appfiles" ) type FakeAppFilesRepository struct { diff --git a/cf/api/appfiles/appfilesfakes/fake_repository.go b/cf/api/appfiles/appfilesfakes/fake_repository.go index 38b0d22db3..9356a885da 100644 --- a/cf/api/appfiles/appfilesfakes/fake_repository.go +++ b/cf/api/appfiles/appfilesfakes/fake_repository.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appfiles" + "code.cloudfoundry.org/cli/v8/cf/api/appfiles" ) type FakeRepository struct { diff --git a/cf/api/appinstances/app_instances.go b/cf/api/appinstances/app_instances.go index 6a3ea08600..286426b1ad 100644 --- a/cf/api/appinstances/app_instances.go +++ b/cf/api/appinstances/app_instances.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) type InstancesAPIResponse map[string]InstanceAPIResponse diff --git a/cf/api/appinstances/app_instances_suite_test.go b/cf/api/appinstances/app_instances_suite_test.go index dc833a081c..72e6aaf0ba 100644 --- a/cf/api/appinstances/app_instances_suite_test.go +++ b/cf/api/appinstances/app_instances_suite_test.go @@ -1,8 +1,8 @@ package appinstances_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appinstances/app_instances_test.go b/cf/api/appinstances/app_instances_test.go index 625a905eda..5960872041 100644 --- a/cf/api/appinstances/app_instances_test.go +++ b/cf/api/appinstances/app_instances_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api/appinstances" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go b/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go index efd79f324e..b11ceb274b 100644 --- a/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go +++ b/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go @@ -4,8 +4,8 @@ package appinstancesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeAppInstancesRepository struct { diff --git a/cf/api/appinstances/appinstancesfakes/fake_repository.go b/cf/api/appinstances/appinstancesfakes/fake_repository.go index 74baf569a4..311dff9205 100644 --- a/cf/api/appinstances/appinstancesfakes/fake_repository.go +++ b/cf/api/appinstances/appinstancesfakes/fake_repository.go @@ -4,8 +4,8 @@ package appinstancesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeRepository struct { diff --git a/cf/api/applicationbits/application_bits.go b/cf/api/applicationbits/application_bits.go index 1b16ae9d3c..fe1bb99601 100644 --- a/cf/api/applicationbits/application_bits.go +++ b/cf/api/applicationbits/application_bits.go @@ -10,10 +10,10 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/net" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/api/applicationbits/application_bits_suite_test.go b/cf/api/applicationbits/application_bits_suite_test.go index 80506752f9..d3f5dc3c2e 100644 --- a/cf/api/applicationbits/application_bits_suite_test.go +++ b/cf/api/applicationbits/application_bits_suite_test.go @@ -1,8 +1,8 @@ package applicationbits_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/applicationbits/application_bits_test.go b/cf/api/applicationbits/application_bits_test.go index 0ee4183737..54d2402522 100644 --- a/cf/api/applicationbits/application_bits_test.go +++ b/cf/api/applicationbits/application_bits_test.go @@ -13,16 +13,16 @@ import ( "strings" "time" - testapi "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + testapi "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go b/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go index 9c69ac9fdc..b980aa2fdc 100644 --- a/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go +++ b/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v8/cf/api/resources" ) type FakeApplicationBitsRepository struct { diff --git a/cf/api/applicationbits/applicationbitsfakes/fake_repository.go b/cf/api/applicationbits/applicationbitsfakes/fake_repository.go index fd56c91170..56fe5c6554 100644 --- a/cf/api/applicationbits/applicationbitsfakes/fake_repository.go +++ b/cf/api/applicationbits/applicationbitsfakes/fake_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v8/cf/api/resources" ) type FakeRepository struct { diff --git a/cf/api/applications/applications.go b/cf/api/applications/applications.go index 32058b5ba0..efd8323ecf 100644 --- a/cf/api/applications/applications.go +++ b/cf/api/applications/applications.go @@ -7,13 +7,13 @@ import ( "net/url" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/applications/applications_suite_test.go b/cf/api/applications/applications_suite_test.go index 4fc00bc02a..a987b0247a 100644 --- a/cf/api/applications/applications_suite_test.go +++ b/cf/api/applications/applications_suite_test.go @@ -1,8 +1,8 @@ package applications_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/applications/applications_test.go b/cf/api/applications/applications_test.go index 125da3522a..4668415ae9 100644 --- a/cf/api/applications/applications_test.go +++ b/cf/api/applications/applications_test.go @@ -8,19 +8,19 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/applications/applicationsfakes/fake_repository.go b/cf/api/applications/applicationsfakes/fake_repository.go index 0d7974f80d..c575e232ae 100644 --- a/cf/api/applications/applicationsfakes/fake_repository.go +++ b/cf/api/applications/applicationsfakes/fake_repository.go @@ -4,8 +4,8 @@ package applicationsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeRepository struct { diff --git a/cf/api/authentication/authentication.go b/cf/api/authentication/authentication.go index 5e0fc670c6..1405616319 100644 --- a/cf/api/authentication/authentication.go +++ b/cf/api/authentication/authentication.go @@ -10,11 +10,11 @@ import ( "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/util" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . TokenRefresher diff --git a/cf/api/authentication/authentication_suite_test.go b/cf/api/authentication/authentication_suite_test.go index 1469b4e91b..f1062a9627 100644 --- a/cf/api/authentication/authentication_suite_test.go +++ b/cf/api/authentication/authentication_suite_test.go @@ -1,8 +1,8 @@ package authentication_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/authentication/authentication_test.go b/cf/api/authentication/authentication_test.go index a00143c9ee..33586dbcde 100644 --- a/cf/api/authentication/authentication_test.go +++ b/cf/api/authentication/authentication_test.go @@ -7,15 +7,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/authentication/authenticationfakes/fake_repository.go b/cf/api/authentication/authenticationfakes/fake_repository.go index fc59759766..30ba8e77de 100644 --- a/cf/api/authentication/authenticationfakes/fake_repository.go +++ b/cf/api/authentication/authenticationfakes/fake_repository.go @@ -5,8 +5,8 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" ) type FakeRepository struct { diff --git a/cf/api/authentication/authenticationfakes/fake_token_refresher.go b/cf/api/authentication/authenticationfakes/fake_token_refresher.go index 7df7aadfc8..d4c46a7e86 100644 --- a/cf/api/authentication/authenticationfakes/fake_token_refresher.go +++ b/cf/api/authentication/authenticationfakes/fake_token_refresher.go @@ -4,7 +4,7 @@ package authenticationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" ) type FakeTokenRefresher struct { diff --git a/cf/api/buildpack_bits.go b/cf/api/buildpack_bits.go index da6efd357e..801f0ccbfd 100644 --- a/cf/api/buildpack_bits.go +++ b/cf/api/buildpack_bits.go @@ -16,13 +16,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/util" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/api/buildpack_bits_test.go b/cf/api/buildpack_bits_test.go index ae480e1fbb..ed7f35c698 100644 --- a/cf/api/buildpack_bits_test.go +++ b/cf/api/buildpack_bits_test.go @@ -15,17 +15,17 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/buildpacks.go b/cf/api/buildpacks.go index abb6206eaf..0541801ebc 100644 --- a/cf/api/buildpacks.go +++ b/cf/api/buildpacks.go @@ -6,12 +6,12 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BuildpackRepository diff --git a/cf/api/buildpacks_test.go b/cf/api/buildpacks_test.go index 0cebb449ef..73f851eafb 100644 --- a/cf/api/buildpacks_test.go +++ b/cf/api/buildpacks_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/clients.go b/cf/api/clients.go index d1d9476252..c317a86c20 100644 --- a/cf/api/clients.go +++ b/cf/api/clients.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ClientRepository diff --git a/cf/api/clients_test.go b/cf/api/clients_test.go index 0749a84913..5a6d44e56b 100644 --- a/cf/api/clients_test.go +++ b/cf/api/clients_test.go @@ -4,13 +4,13 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/copyapplicationsource/copy_application_source.go b/cf/api/copyapplicationsource/copy_application_source.go index 06e6486cdc..51a3ab66ec 100644 --- a/cf/api/copyapplicationsource/copy_application_source.go +++ b/cf/api/copyapplicationsource/copy_application_source.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/copyapplicationsource/copy_application_source_suite_test.go b/cf/api/copyapplicationsource/copy_application_source_suite_test.go index e32ffea0f3..13132289ef 100644 --- a/cf/api/copyapplicationsource/copy_application_source_suite_test.go +++ b/cf/api/copyapplicationsource/copy_application_source_suite_test.go @@ -1,8 +1,8 @@ package copyapplicationsource_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/copyapplicationsource/copy_application_source_test.go b/cf/api/copyapplicationsource/copy_application_source_test.go index fa2b3139b9..87a90df724 100644 --- a/cf/api/copyapplicationsource/copy_application_source_test.go +++ b/cf/api/copyapplicationsource/copy_application_source_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - . "code.cloudfoundry.org/cli/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + . "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go b/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go index 3e4eb5f013..56b3b9afde 100644 --- a/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go +++ b/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go @@ -4,7 +4,7 @@ package copyapplicationsourcefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource" ) type FakeRepository struct { diff --git a/cf/api/curl.go b/cf/api/curl.go index dd09950d00..59968724d6 100644 --- a/cf/api/curl.go +++ b/cf/api/curl.go @@ -9,10 +9,10 @@ import ( "net/textproto" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CurlRepository diff --git a/cf/api/curl_test.go b/cf/api/curl_test.go index 34fcd62e4d..c5c843c353 100644 --- a/cf/api/curl_test.go +++ b/cf/api/curl_test.go @@ -6,16 +6,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/domains.go b/cf/api/domains.go index cb56fd65cb..58a4d85544 100644 --- a/cf/api/domains.go +++ b/cf/api/domains.go @@ -6,13 +6,13 @@ import ( "fmt" "net/url" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DomainRepository diff --git a/cf/api/domains_test.go b/cf/api/domains_test.go index 54925d15bd..e30e58976a 100644 --- a/cf/api/domains_test.go +++ b/cf/api/domains_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/endpoints.go b/cf/api/endpoints.go index ce3e085ba8..4d3d5a372f 100644 --- a/cf/api/endpoints.go +++ b/cf/api/endpoints.go @@ -3,8 +3,8 @@ package api import ( "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" ) type RemoteInfoRepository struct { diff --git a/cf/api/endpoints_test.go b/cf/api/endpoints_test.go index 3892bba24e..5bebc85afd 100644 --- a/cf/api/endpoints_test.go +++ b/cf/api/endpoints_test.go @@ -10,14 +10,14 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "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" + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/environmentvariablegroups/environment_variable_groups.go b/cf/api/environmentvariablegroups/environment_variable_groups.go index 296553615c..bb8419b842 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go b/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go index 5725fb9866..d1cd00431b 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go @@ -1,8 +1,8 @@ package environmentvariablegroups_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/environmentvariablegroups/environment_variable_groups_test.go b/cf/api/environmentvariablegroups/environment_variable_groups_test.go index 48a3724aeb..fe873b78f8 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups_test.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups_test.go @@ -4,17 +4,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go b/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go index 6bd8cefec9..f0f01aa61c 100644 --- a/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go +++ b/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go @@ -4,8 +4,8 @@ package environmentvariablegroupsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeRepository struct { diff --git a/cf/api/featureflags/feature_flags.go b/cf/api/featureflags/feature_flags.go index e9a038236c..5ea926c873 100644 --- a/cf/api/featureflags/feature_flags.go +++ b/cf/api/featureflags/feature_flags.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . FeatureFlagRepository diff --git a/cf/api/featureflags/feature_flags_suite_test.go b/cf/api/featureflags/feature_flags_suite_test.go index 26e7da8db5..db79b4771f 100644 --- a/cf/api/featureflags/feature_flags_suite_test.go +++ b/cf/api/featureflags/feature_flags_suite_test.go @@ -1,8 +1,8 @@ package featureflags_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/featureflags/feature_flags_test.go b/cf/api/featureflags/feature_flags_test.go index 6c0cf5f925..b88f7c8301 100644 --- a/cf/api/featureflags/feature_flags_test.go +++ b/cf/api/featureflags/feature_flags_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go b/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go index a68aa95f6b..cbaf7a0f2a 100644 --- a/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go +++ b/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go @@ -4,8 +4,8 @@ package featureflagsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeFeatureFlagRepository struct { diff --git a/cf/api/logs/log_cache_message.go b/cf/api/logs/log_cache_message.go index 798b1653d3..d54a83f6aa 100644 --- a/cf/api/logs/log_cache_message.go +++ b/cf/api/logs/log_cache_message.go @@ -6,7 +6,7 @@ import ( "time" "unicode/utf8" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ColorLogger diff --git a/cf/api/logs/log_cache_message_test.go b/cf/api/logs/log_cache_message_test.go index ee73874b72..087b908c17 100644 --- a/cf/api/logs/log_cache_message_test.go +++ b/cf/api/logs/log_cache_message_test.go @@ -3,9 +3,9 @@ package logs_test import ( "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/api/logs/logsfakes" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/api/logs/logsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/log_cache_repository.go b/cf/api/logs/log_cache_repository.go index e6c3983690..b17b4ebf13 100644 --- a/cf/api/logs/log_cache_repository.go +++ b/cf/api/logs/log_cache_repository.go @@ -3,8 +3,8 @@ package logs import ( "context" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type terminalColorLogger struct { diff --git a/cf/api/logs/log_cache_repository_test.go b/cf/api/logs/log_cache_repository_test.go index a3c48c45a7..cc2a39b5f8 100644 --- a/cf/api/logs/log_cache_repository_test.go +++ b/cf/api/logs/log_cache_repository_test.go @@ -5,9 +5,9 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/cf/api/logs" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/cf/api/logs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/logsfakes/fake_color_logger.go b/cf/api/logs/logsfakes/fake_color_logger.go index 74720c0274..1d9b85492a 100644 --- a/cf/api/logs/logsfakes/fake_color_logger.go +++ b/cf/api/logs/logsfakes/fake_color_logger.go @@ -4,7 +4,7 @@ package logsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/api/logs" ) type FakeColorLogger struct { diff --git a/cf/api/logs/logsfakes/fake_loggable.go b/cf/api/logs/logsfakes/fake_loggable.go index a89a655a1f..49b2c3f506 100644 --- a/cf/api/logs/logsfakes/fake_loggable.go +++ b/cf/api/logs/logsfakes/fake_loggable.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/api/logs" ) type FakeLoggable struct { diff --git a/cf/api/logs/logsfakes/fake_repository.go b/cf/api/logs/logsfakes/fake_repository.go index 58c98a08a7..f17edff7c1 100644 --- a/cf/api/logs/logsfakes/fake_repository.go +++ b/cf/api/logs/logsfakes/fake_repository.go @@ -4,7 +4,7 @@ package logsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/api/logs" ) type FakeRepository struct { diff --git a/cf/api/organizations/organizations.go b/cf/api/organizations/organizations.go index d376547ed7..3ea3a78e7b 100644 --- a/cf/api/organizations/organizations.go +++ b/cf/api/organizations/organizations.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrganizationRepository diff --git a/cf/api/organizations/organizations_suite_test.go b/cf/api/organizations/organizations_suite_test.go index 3c75cf6d18..e86bfb1bb2 100644 --- a/cf/api/organizations/organizations_suite_test.go +++ b/cf/api/organizations/organizations_suite_test.go @@ -1,8 +1,8 @@ package organizations_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/organizations/organizations_test.go b/cf/api/organizations/organizations_test.go index 8819e5fe40..530d7a8334 100644 --- a/cf/api/organizations/organizations_test.go +++ b/cf/api/organizations/organizations_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/organizations/organizationsfakes/fake_organization_repository.go b/cf/api/organizations/organizationsfakes/fake_organization_repository.go index 316d80c421..0e514c5e20 100644 --- a/cf/api/organizations/organizationsfakes/fake_organization_repository.go +++ b/cf/api/organizations/organizationsfakes/fake_organization_repository.go @@ -4,8 +4,8 @@ package organizationsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeOrganizationRepository struct { diff --git a/cf/api/password/password.go b/cf/api/password/password.go index 639248f2b9..2b579f7a50 100644 --- a/cf/api/password/password.go +++ b/cf/api/password/password.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/password/password_suite_test.go b/cf/api/password/password_suite_test.go index 9c8d685ba8..26cbe329a4 100644 --- a/cf/api/password/password_suite_test.go +++ b/cf/api/password/password_suite_test.go @@ -1,8 +1,8 @@ package password_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/password/password_test.go b/cf/api/password/password_test.go index b1b22d29c1..d34d9d5404 100644 --- a/cf/api/password/password_test.go +++ b/cf/api/password/password_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api/password" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/api/password" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/password/passwordfakes/fake_repository.go b/cf/api/password/passwordfakes/fake_repository.go index 2ba9b6b5e1..fd4f98364a 100644 --- a/cf/api/password/passwordfakes/fake_repository.go +++ b/cf/api/password/passwordfakes/fake_repository.go @@ -4,7 +4,7 @@ package passwordfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/password" + "code.cloudfoundry.org/cli/v8/cf/api/password" ) type FakeRepository struct { diff --git a/cf/api/quotas/quotas.go b/cf/api/quotas/quotas.go index 3781151ec1..f13d17b6b0 100644 --- a/cf/api/quotas/quotas.go +++ b/cf/api/quotas/quotas.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . QuotaRepository diff --git a/cf/api/quotas/quotas_suite_test.go b/cf/api/quotas/quotas_suite_test.go index 04d290d00b..5199e6cb47 100644 --- a/cf/api/quotas/quotas_suite_test.go +++ b/cf/api/quotas/quotas_suite_test.go @@ -1,8 +1,8 @@ package quotas_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/quotas/quotas_test.go b/cf/api/quotas/quotas_test.go index bfc056e5af..74e278c73e 100644 --- a/cf/api/quotas/quotas_test.go +++ b/cf/api/quotas/quotas_test.go @@ -4,19 +4,19 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" "encoding/json" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/quotas/quotasfakes/fake_quota_repository.go b/cf/api/quotas/quotasfakes/fake_quota_repository.go index cd31317b51..00f96cf222 100644 --- a/cf/api/quotas/quotasfakes/fake_quota_repository.go +++ b/cf/api/quotas/quotasfakes/fake_quota_repository.go @@ -4,8 +4,8 @@ package quotasfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeQuotaRepository struct { diff --git a/cf/api/repository_locator.go b/cf/api/repository_locator.go index f0ad31cb1d..9cb7048b0f 100644 --- a/cf/api/repository_locator.go +++ b/cf/api/repository_locator.go @@ -1,34 +1,34 @@ package api import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - v7action2 "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/cf/api/appevents" - api_appfiles "code.cloudfoundry.org/cli/cf/api/appfiles" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/api/applicationbits" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/password" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - securitygroupspaces "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + v7action2 "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/logcache" + "code.cloudfoundry.org/cli/v8/cf/api/appevents" + api_appfiles "code.cloudfoundry.org/cli/v8/cf/api/appfiles" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances" + "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/password" + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" + securitygroupspaces "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/api/stacks" + "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type RepositoryLocator struct { diff --git a/cf/api/resources/applications.go b/cf/api/resources/applications.go index 16e8e1a11b..535ed65171 100644 --- a/cf/api/resources/applications.go +++ b/cf/api/resources/applications.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" ) type PaginatedApplicationResources struct { diff --git a/cf/api/resources/applications_test.go b/cf/api/resources/applications_test.go index e2ad37d376..46af57fade 100644 --- a/cf/api/resources/applications_test.go +++ b/cf/api/resources/applications_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/auth_tokens.go b/cf/api/resources/auth_tokens.go index e39dd918f1..94c6d66707 100644 --- a/cf/api/resources/auth_tokens.go +++ b/cf/api/resources/auth_tokens.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type PaginatedAuthTokenResources struct { Resources []AuthTokenResource diff --git a/cf/api/resources/buildpacks.go b/cf/api/resources/buildpacks.go index 12db203a22..4e6993b940 100644 --- a/cf/api/resources/buildpacks.go +++ b/cf/api/resources/buildpacks.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type BuildpackResource struct { Resource diff --git a/cf/api/resources/domains.go b/cf/api/resources/domains.go index 4a0488ae7c..36b5421f51 100644 --- a/cf/api/resources/domains.go +++ b/cf/api/resources/domains.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type DomainResource struct { Resource diff --git a/cf/api/resources/events.go b/cf/api/resources/events.go index a94d520589..446048c386 100644 --- a/cf/api/resources/events.go +++ b/cf/api/resources/events.go @@ -6,9 +6,9 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/util/generic" ) type EventResource interface { diff --git a/cf/api/resources/events_test.go b/cf/api/resources/events_test.go index 46cf9df9ec..c2bd07aede 100644 --- a/cf/api/resources/events_test.go +++ b/cf/api/resources/events_test.go @@ -5,7 +5,7 @@ import ( "time" - . "code.cloudfoundry.org/cli/cf/api/resources" + . "code.cloudfoundry.org/cli/v8/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/feature_flags.go b/cf/api/resources/feature_flags.go index c800c49207..74d98babd9 100644 --- a/cf/api/resources/feature_flags.go +++ b/cf/api/resources/feature_flags.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type FeatureFlagResource struct { Entity models.FeatureFlag diff --git a/cf/api/resources/organizations.go b/cf/api/resources/organizations.go index de7677b6f7..dc109565ad 100644 --- a/cf/api/resources/organizations.go +++ b/cf/api/resources/organizations.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type OrganizationResource struct { Resource diff --git a/cf/api/resources/quotas.go b/cf/api/resources/quotas.go index be3234992b..48ea9a5e22 100644 --- a/cf/api/resources/quotas.go +++ b/cf/api/resources/quotas.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type PaginatedQuotaResources struct { Resources []QuotaResource diff --git a/cf/api/resources/quotas_test.go b/cf/api/resources/quotas_test.go index a79e171286..3306b6f37a 100644 --- a/cf/api/resources/quotas_test.go +++ b/cf/api/resources/quotas_test.go @@ -1,9 +1,9 @@ package resources_test import ( - . "code.cloudfoundry.org/cli/cf/api/resources" + . "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" "encoding/json" . "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 1e1735288d..1ecf4c9b0f 100644 --- a/cf/api/resources/resources_test.go +++ b/cf/api/resources/resources_test.go @@ -3,8 +3,8 @@ package resources_test import ( "testing" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/routes.go b/cf/api/resources/routes.go index 55e8ac4749..a21da2a76b 100644 --- a/cf/api/resources/routes.go +++ b/cf/api/resources/routes.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type RouteResource struct { Resource diff --git a/cf/api/resources/security_groups.go b/cf/api/resources/security_groups.go index 5b4a58f3c2..120eed5d74 100644 --- a/cf/api/resources/security_groups.go +++ b/cf/api/resources/security_groups.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type PaginatedSecurityGroupResources struct { Resources []SecurityGroupResource diff --git a/cf/api/resources/service_bindings.go b/cf/api/resources/service_bindings.go index df28cd11f6..411026c719 100644 --- a/cf/api/resources/service_bindings.go +++ b/cf/api/resources/service_bindings.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type ServiceBindingResource struct { Resource diff --git a/cf/api/resources/service_brokers.go b/cf/api/resources/service_brokers.go index ad37ad9ce4..e42fe2825d 100644 --- a/cf/api/resources/service_brokers.go +++ b/cf/api/resources/service_brokers.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type ServiceBrokerResource struct { Resource diff --git a/cf/api/resources/service_instances.go b/cf/api/resources/service_instances.go index a8315a6630..a13bb43b32 100644 --- a/cf/api/resources/service_instances.go +++ b/cf/api/resources/service_instances.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type PaginatedServiceInstanceResources struct { TotalResults int `json:"total_results"` diff --git a/cf/api/resources/service_instances_test.go b/cf/api/resources/service_instances_test.go index 1b88be8a86..9af6584bb5 100644 --- a/cf/api/resources/service_instances_test.go +++ b/cf/api/resources/service_instances_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - . "code.cloudfoundry.org/cli/cf/api/resources" + . "code.cloudfoundry.org/cli/v8/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/resources/service_keys.go b/cf/api/resources/service_keys.go index 6727fe3310..c4731821aa 100644 --- a/cf/api/resources/service_keys.go +++ b/cf/api/resources/service_keys.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type ServiceKeyResource struct { Resource diff --git a/cf/api/resources/service_keys_test.go b/cf/api/resources/service_keys_test.go index a74423b1cd..1680cfa90d 100644 --- a/cf/api/resources/service_keys_test.go +++ b/cf/api/resources/service_keys_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/cf/api/resources" + . "code.cloudfoundry.org/cli/v8/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/resources/service_offerings.go b/cf/api/resources/service_offerings.go index 5cc8cc2675..a86a41a78c 100644 --- a/cf/api/resources/service_offerings.go +++ b/cf/api/resources/service_offerings.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strconv" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" ) type PaginatedServiceOfferingResources struct { diff --git a/cf/api/resources/service_plan_visibility.go b/cf/api/resources/service_plan_visibility.go index 939bb16c8a..ac4fa03415 100644 --- a/cf/api/resources/service_plan_visibility.go +++ b/cf/api/resources/service_plan_visibility.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type ServicePlanVisibilityResource struct { Resource diff --git a/cf/api/resources/service_plans.go b/cf/api/resources/service_plans.go index 1e310d0021..17566b912d 100644 --- a/cf/api/resources/service_plans.go +++ b/cf/api/resources/service_plans.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" ) type ServicePlanResource struct { diff --git a/cf/api/resources/space_quotas.go b/cf/api/resources/space_quotas.go index 8a3d8658a4..98a7652538 100644 --- a/cf/api/resources/space_quotas.go +++ b/cf/api/resources/space_quotas.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type PaginatedSpaceQuotaResources struct { Resources []SpaceQuotaResource diff --git a/cf/api/resources/spaces.go b/cf/api/resources/spaces.go index e081c3fed6..293baa16cc 100644 --- a/cf/api/resources/spaces.go +++ b/cf/api/resources/spaces.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type SpaceResource struct { Resource diff --git a/cf/api/resources/stacks.go b/cf/api/resources/stacks.go index fd114673cd..98bcc209a5 100644 --- a/cf/api/resources/stacks.go +++ b/cf/api/resources/stacks.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type PaginatedStackResources struct { Resources []StackResource diff --git a/cf/api/resources/users.go b/cf/api/resources/users.go index 61cbd23e46..6e7a395422 100644 --- a/cf/api/resources/users.go +++ b/cf/api/resources/users.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/cf/models" +import "code.cloudfoundry.org/cli/v8/cf/models" type UserResource struct { Resource diff --git a/cf/api/route_service_binding_repository.go b/cf/api/route_service_binding_repository.go index 85215a48b1..6eff9be552 100644 --- a/cf/api/route_service_binding_repository.go +++ b/cf/api/route_service_binding_repository.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteServiceBindingRepository diff --git a/cf/api/route_service_binding_repository_test.go b/cf/api/route_service_binding_repository_test.go index 47a8409de7..afc33fe202 100644 --- a/cf/api/route_service_binding_repository_test.go +++ b/cf/api/route_service_binding_repository_test.go @@ -5,17 +5,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/routes.go b/cf/api/routes.go index 0fc4f405cf..aeacee023d 100644 --- a/cf/api/routes.go +++ b/cf/api/routes.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" "github.com/google/go-querystring/query" ) diff --git a/cf/api/routes_test.go b/cf/api/routes_test.go index e1862374ac..40b5ba5c8f 100644 --- a/cf/api/routes_test.go +++ b/cf/api/routes_test.go @@ -6,18 +6,18 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "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" - - . "code.cloudfoundry.org/cli/cf/api" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/routing_api.go b/cf/api/routing_api.go index 08cf6fd970..f045ab8803 100644 --- a/cf/api/routing_api.go +++ b/cf/api/routing_api.go @@ -3,9 +3,9 @@ package api import ( "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) type routingAPIRepository struct { diff --git a/cf/api/routing_api_test.go b/cf/api/routing_api_test.go index 37d874bb92..38311e2c9f 100644 --- a/cf/api/routing_api_test.go +++ b/cf/api/routing_api_test.go @@ -6,14 +6,14 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/securitygroups/defaults/defaults.go b/cf/api/securitygroups/defaults/defaults.go index 57e0e08d5d..cfc9e629f4 100644 --- a/cf/api/securitygroups/defaults/defaults.go +++ b/cf/api/securitygroups/defaults/defaults.go @@ -3,10 +3,10 @@ package defaults import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) type DefaultSecurityGroupsRepoBase struct { diff --git a/cf/api/securitygroups/defaults/running/running.go b/cf/api/securitygroups/defaults/running/running.go index 879669a72f..5a8018b049 100644 --- a/cf/api/securitygroups/defaults/running/running.go +++ b/cf/api/securitygroups/defaults/running/running.go @@ -1,11 +1,11 @@ package running import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults" + . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults" ) const urlPath = "/v2/config/running_security_groups" diff --git a/cf/api/securitygroups/defaults/running/running_suite_test.go b/cf/api/securitygroups/defaults/running/running_suite_test.go index beeaf9853e..d071aca402 100644 --- a/cf/api/securitygroups/defaults/running/running_suite_test.go +++ b/cf/api/securitygroups/defaults/running/running_suite_test.go @@ -1,8 +1,8 @@ package running_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/defaults/running/running_test.go b/cf/api/securitygroups/defaults/running/running_test.go index 340d0b329f..9fb0868740 100644 --- a/cf/api/securitygroups/defaults/running/running_test.go +++ b/cf/api/securitygroups/defaults/running/running_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go b/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go index 22b51815f6..8d73e58ec6 100644 --- a/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go +++ b/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go @@ -4,8 +4,8 @@ package runningfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeSecurityGroupsRepo struct { diff --git a/cf/api/securitygroups/defaults/staging/staging.go b/cf/api/securitygroups/defaults/staging/staging.go index d75143f165..abafa4a1f5 100644 --- a/cf/api/securitygroups/defaults/staging/staging.go +++ b/cf/api/securitygroups/defaults/staging/staging.go @@ -1,11 +1,11 @@ package staging import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults" + . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults" ) const urlPath = "/v2/config/staging_security_groups" diff --git a/cf/api/securitygroups/defaults/staging/staging_suite_test.go b/cf/api/securitygroups/defaults/staging/staging_suite_test.go index 0e39b6127a..46ff3f88a7 100644 --- a/cf/api/securitygroups/defaults/staging/staging_suite_test.go +++ b/cf/api/securitygroups/defaults/staging/staging_suite_test.go @@ -1,8 +1,8 @@ package staging_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/defaults/staging/staging_test.go b/cf/api/securitygroups/defaults/staging/staging_test.go index 6d805551bb..b4d2e1caee 100644 --- a/cf/api/securitygroups/defaults/staging/staging_test.go +++ b/cf/api/securitygroups/defaults/staging/staging_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - 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" - - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go b/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go index 5b4f8a39bf..8411e02607 100644 --- a/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go +++ b/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go @@ -4,8 +4,8 @@ package stagingfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeSecurityGroupsRepo struct { diff --git a/cf/api/securitygroups/security_groups.go b/cf/api/securitygroups/security_groups.go index 4e72ff8085..86dddfc861 100644 --- a/cf/api/securitygroups/security_groups.go +++ b/cf/api/securitygroups/security_groups.go @@ -4,11 +4,11 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecurityGroupRepo diff --git a/cf/api/securitygroups/security_groups_suite_test.go b/cf/api/securitygroups/security_groups_suite_test.go index 093c14f29a..f35c5e93a0 100644 --- a/cf/api/securitygroups/security_groups_suite_test.go +++ b/cf/api/securitygroups/security_groups_suite_test.go @@ -1,8 +1,8 @@ package securitygroups_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/security_groups_test.go b/cf/api/securitygroups/security_groups_test.go index c784696804..7360b1c0df 100644 --- a/cf/api/securitygroups/security_groups_test.go +++ b/cf/api/securitygroups/security_groups_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go b/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go index 7d6736c7f5..9ad0b0d87c 100644 --- a/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go +++ b/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go @@ -4,8 +4,8 @@ package securitygroupsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeSecurityGroupRepo struct { diff --git a/cf/api/securitygroups/spaces/space_binder.go b/cf/api/securitygroups/spaces/space_binder.go index 16691d3a03..4112df26d9 100644 --- a/cf/api/securitygroups/spaces/space_binder.go +++ b/cf/api/securitygroups/spaces/space_binder.go @@ -3,9 +3,9 @@ package spaces import ( "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecurityGroupSpaceBinder diff --git a/cf/api/securitygroups/spaces/space_binder_test.go b/cf/api/securitygroups/spaces/space_binder_test.go index f3992f9634..7c1fcf06ea 100644 --- a/cf/api/securitygroups/spaces/space_binder_test.go +++ b/cf/api/securitygroups/spaces/space_binder_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go b/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go index 768032bd02..b32d69f549 100644 --- a/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go +++ b/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go @@ -4,7 +4,7 @@ package spacesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" ) type FakeSecurityGroupSpaceBinder struct { diff --git a/cf/api/securitygroups/spaces/suite_test.go b/cf/api/securitygroups/spaces/suite_test.go index 935c3f694a..3eda6b8f7c 100644 --- a/cf/api/securitygroups/spaces/suite_test.go +++ b/cf/api/securitygroups/spaces/suite_test.go @@ -1,8 +1,8 @@ package spaces_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/service_auth_tokens.go b/cf/api/service_auth_tokens.go index 931327e870..0ac8af9ad0 100644 --- a/cf/api/service_auth_tokens.go +++ b/cf/api/service_auth_tokens.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceAuthTokenRepository diff --git a/cf/api/service_auth_tokens_test.go b/cf/api/service_auth_tokens_test.go index 2a8fba16eb..e134158314 100644 --- a/cf/api/service_auth_tokens_test.go +++ b/cf/api/service_auth_tokens_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_bindings.go b/cf/api/service_bindings.go index 05d9118e84..f9c0cc6926 100644 --- a/cf/api/service_bindings.go +++ b/cf/api/service_bindings.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBindingRepository diff --git a/cf/api/service_bindings_test.go b/cf/api/service_bindings_test.go index 1d7f9dcb1d..5c1b0509a5 100644 --- a/cf/api/service_bindings_test.go +++ b/cf/api/service_bindings_test.go @@ -4,15 +4,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/service_brokers.go b/cf/api/service_brokers.go index df0080320f..d526bcf1ed 100644 --- a/cf/api/service_brokers.go +++ b/cf/api/service_brokers.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBrokerRepository diff --git a/cf/api/service_brokers_test.go b/cf/api/service_brokers_test.go index 6c979f1135..7a6290f664 100644 --- a/cf/api/service_brokers_test.go +++ b/cf/api/service_brokers_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" @@ -203,7 +203,7 @@ var _ = Describe("Service Brokers Repo", func() { req := apifakes.NewCloudControllerTestRequest(testnet.TestRequest{ Method: "GET", Path: "/v2/service_brokers/bogus-guid", - //This error code may not reflect reality. Check it, change the code to match, and remove this comment. + // This error code may not reflect reality. Check it, change the code to match, and remove this comment. Response: testnet.TestResponse{Status: http.StatusNotFound, Body: `{"error_code":"ServiceBrokerNotFound","description":"Service Broker bogus-guid not found","code":270042}`}, }) diff --git a/cf/api/service_keys.go b/cf/api/service_keys.go index c7e2c006e9..285fc9dadf 100644 --- a/cf/api/service_keys.go +++ b/cf/api/service_keys.go @@ -6,11 +6,11 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceKeyRepository diff --git a/cf/api/service_keys_test.go b/cf/api/service_keys_test.go index f404f12ac0..b9b9cc6df6 100644 --- a/cf/api/service_keys_test.go +++ b/cf/api/service_keys_test.go @@ -4,19 +4,19 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" - . "code.cloudfoundry.org/cli/cf/api" + . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_plan.go b/cf/api/service_plan.go index a2ad0291a9..fa8b2515e2 100644 --- a/cf/api/service_plan.go +++ b/cf/api/service_plan.go @@ -5,10 +5,10 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanRepository diff --git a/cf/api/service_plan_test.go b/cf/api/service_plan_test.go index 26a74c13d0..9e3c418d5b 100644 --- a/cf/api/service_plan_test.go +++ b/cf/api/service_plan_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_plan_visibility.go b/cf/api/service_plan_visibility.go index 9d2aed39a8..af858e3168 100644 --- a/cf/api/service_plan_visibility.go +++ b/cf/api/service_plan_visibility.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanVisibilityRepository diff --git a/cf/api/service_plan_visibility_test.go b/cf/api/service_plan_visibility_test.go index cb17887ee4..2f1aeb69b7 100644 --- a/cf/api/service_plan_visibility_test.go +++ b/cf/api/service_plan_visibility_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_summary.go b/cf/api/service_summary.go index a1920e8008..9ab0767e45 100644 --- a/cf/api/service_summary.go +++ b/cf/api/service_summary.go @@ -3,9 +3,9 @@ package api import ( "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) type ServiceInstancesSummaries struct { diff --git a/cf/api/service_summary_test.go b/cf/api/service_summary_test.go index 15e7b1bd0d..44b9b9cc10 100644 --- a/cf/api/service_summary_test.go +++ b/cf/api/service_summary_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/services.go b/cf/api/services.go index 87e91e208c..bf3b755cf8 100644 --- a/cf/api/services.go +++ b/cf/api/services.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceRepository diff --git a/cf/api/services_test.go b/cf/api/services_test.go index 62d5b1f476..15bafd9ccb 100644 --- a/cf/api/services_test.go +++ b/cf/api/services_test.go @@ -7,19 +7,19 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "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" - - . "code.cloudfoundry.org/cli/cf/api" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/spacequotas/space_quotas.go b/cf/api/spacequotas/space_quotas.go index 07ab2cb248..ae1deea717 100644 --- a/cf/api/spacequotas/space_quotas.go +++ b/cf/api/spacequotas/space_quotas.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceQuotaRepository diff --git a/cf/api/spacequotas/space_quotas_suite_test.go b/cf/api/spacequotas/space_quotas_suite_test.go index 92d8005177..2bc9535515 100644 --- a/cf/api/spacequotas/space_quotas_suite_test.go +++ b/cf/api/spacequotas/space_quotas_suite_test.go @@ -1,8 +1,8 @@ package spacequotas_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/spacequotas/space_quotas_test.go b/cf/api/spacequotas/space_quotas_test.go index d895031c54..f64ab51ee0 100644 --- a/cf/api/spacequotas/space_quotas_test.go +++ b/cf/api/spacequotas/space_quotas_test.go @@ -5,17 +5,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go b/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go index c80e8b605c..8a7a17ae8c 100644 --- a/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go +++ b/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go @@ -4,8 +4,8 @@ package spacequotasfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeSpaceQuotaRepository struct { diff --git a/cf/api/spaces/spaces.go b/cf/api/spaces/spaces.go index c742162996..1c8b5fa96e 100644 --- a/cf/api/spaces/spaces.go +++ b/cf/api/spaces/spaces.go @@ -6,11 +6,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRepository diff --git a/cf/api/spaces/spaces_suite_test.go b/cf/api/spaces/spaces_suite_test.go index 4fa12fe9ce..c4eef1158a 100644 --- a/cf/api/spaces/spaces_suite_test.go +++ b/cf/api/spaces/spaces_suite_test.go @@ -1,8 +1,8 @@ package spaces_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/spaces/spaces_test.go b/cf/api/spaces/spaces_test.go index 157cb55744..d235714707 100644 --- a/cf/api/spaces/spaces_test.go +++ b/cf/api/spaces/spaces_test.go @@ -6,17 +6,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "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" - - . "code.cloudfoundry.org/cli/cf/api/spaces" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api/spaces" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/spaces/spacesfakes/fake_space_repository.go b/cf/api/spaces/spacesfakes/fake_space_repository.go index 0112f8ec72..a21308ed31 100644 --- a/cf/api/spaces/spacesfakes/fake_space_repository.go +++ b/cf/api/spaces/spacesfakes/fake_space_repository.go @@ -4,8 +4,8 @@ package spacesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeSpaceRepository struct { diff --git a/cf/api/stacks/stacks.go b/cf/api/stacks/stacks.go index 94c5136102..ae6d584312 100644 --- a/cf/api/stacks/stacks.go +++ b/cf/api/stacks/stacks.go @@ -4,13 +4,13 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . StackRepository diff --git a/cf/api/stacks/stacks_suite_test.go b/cf/api/stacks/stacks_suite_test.go index 0b75daba4b..6e7423b53e 100644 --- a/cf/api/stacks/stacks_suite_test.go +++ b/cf/api/stacks/stacks_suite_test.go @@ -1,8 +1,8 @@ package stacks_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/stacks/stacks_test.go b/cf/api/stacks/stacks_test.go index 65a78a827a..ff08611890 100644 --- a/cf/api/stacks/stacks_test.go +++ b/cf/api/stacks/stacks_test.go @@ -4,18 +4,18 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - . "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/api/stacks" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/stacks/stacksfakes/fake_stack_repository.go b/cf/api/stacks/stacksfakes/fake_stack_repository.go index bd4f105e3f..fad6f0c389 100644 --- a/cf/api/stacks/stacksfakes/fake_stack_repository.go +++ b/cf/api/stacks/stacksfakes/fake_stack_repository.go @@ -4,8 +4,8 @@ package stacksfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/stacks" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeStackRepository struct { diff --git a/cf/api/user_provided_service_instances.go b/cf/api/user_provided_service_instances.go index 2f19444ded..3431ddca8b 100644 --- a/cf/api/user_provided_service_instances.go +++ b/cf/api/user_provided_service_instances.go @@ -5,9 +5,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserProvidedServiceInstanceRepository diff --git a/cf/api/user_provided_service_instances_test.go b/cf/api/user_provided_service_instances_test.go index 87dd06baad..9366a86aae 100644 --- a/cf/api/user_provided_service_instances_test.go +++ b/cf/api/user_provided_service_instances_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/users.go b/cf/api/users.go index bfe2c69520..42df9af738 100644 --- a/cf/api/users.go +++ b/cf/api/users.go @@ -9,12 +9,12 @@ import ( neturl "net/url" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" ) var orgRoleToPathMap = map[models.Role]string{ @@ -312,8 +312,8 @@ func (repo CloudControllerUserRepository) SetSpaceRoleByUsername(username, space setOrgRoleErr := apiErrResponse{} apiErr = repo.assocUserWithOrgByUsername(username, orgGUID, &setOrgRoleErr) if setOrgRoleErr.Code == 10003 { - //operator lacking the privilege to set org role - //user might already be in org, so ignoring error and attempt to set space role + // operator lacking the privilege to set org role + // user might already be in org, so ignoring error and attempt to set space role } else if apiErr != nil { return } diff --git a/cf/api/users_test.go b/cf/api/users_test.go index a2f06eddbb..e46ae03378 100644 --- a/cf/api/users_test.go +++ b/cf/api/users_test.go @@ -4,15 +4,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/appfiles/app_files.go b/cf/appfiles/app_files.go index 216d110767..482bf59698 100644 --- a/cf/appfiles/app_files.go +++ b/cf/appfiles/app_files.go @@ -9,7 +9,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" securejoin "github.com/cyphar/filepath-securejoin" ) diff --git a/cf/appfiles/app_files_suite_test.go b/cf/appfiles/app_files_suite_test.go index eccda8a285..a0fd339570 100644 --- a/cf/appfiles/app_files_suite_test.go +++ b/cf/appfiles/app_files_suite_test.go @@ -3,8 +3,8 @@ package appfiles_test import ( "testing" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "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 63e79ce357..a90e18f646 100644 --- a/cf/appfiles/app_files_test.go +++ b/cf/appfiles/app_files_test.go @@ -7,10 +7,10 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/appfiles" uuid "github.com/nu7hatch/gouuid" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/appfiles/appfilesfakes/fake_app_files.go b/cf/appfiles/appfilesfakes/fake_app_files.go index 2075d71e7c..0ab3d52481 100644 --- a/cf/appfiles/appfilesfakes/fake_app_files.go +++ b/cf/appfiles/appfilesfakes/fake_app_files.go @@ -4,8 +4,8 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeAppFiles struct { diff --git a/cf/appfiles/appfilesfakes/fake_cf_ignore.go b/cf/appfiles/appfilesfakes/fake_cf_ignore.go index 3efcacff4b..3180cafc7f 100644 --- a/cf/appfiles/appfilesfakes/fake_cf_ignore.go +++ b/cf/appfiles/appfilesfakes/fake_cf_ignore.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/appfiles" ) type FakeCfIgnore struct { diff --git a/cf/appfiles/appfilesfakes/fake_zipper.go b/cf/appfiles/appfilesfakes/fake_zipper.go index 1dff9a5b64..f5c22484d8 100644 --- a/cf/appfiles/appfilesfakes/fake_zipper.go +++ b/cf/appfiles/appfilesfakes/fake_zipper.go @@ -5,7 +5,7 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/appfiles" ) type FakeZipper struct { diff --git a/cf/appfiles/cf_ignore.go b/cf/appfiles/cf_ignore.go index 6faecd3ed8..abf37e8537 100644 --- a/cf/appfiles/cf_ignore.go +++ b/cf/appfiles/cf_ignore.go @@ -4,7 +4,7 @@ import ( "path" "strings" - "code.cloudfoundry.org/cli/cf/util/glob" + "code.cloudfoundry.org/cli/v8/cf/util/glob" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CfIgnore diff --git a/cf/appfiles/cf_ignore_test.go b/cf/appfiles/cf_ignore_test.go index 12410ce8a8..3f597df10f 100644 --- a/cf/appfiles/cf_ignore_test.go +++ b/cf/appfiles/cf_ignore_test.go @@ -1,7 +1,7 @@ package appfiles_test import ( - . "code.cloudfoundry.org/cli/cf/appfiles" + . "code.cloudfoundry.org/cli/v8/cf/appfiles" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/appfiles/zipper.go b/cf/appfiles/zipper.go index 22bccb71e5..d422e15f0b 100644 --- a/cf/appfiles/zipper.go +++ b/cf/appfiles/zipper.go @@ -9,7 +9,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/errors" "code.cloudfoundry.org/gofileutils/fileutils" securejoin "github.com/cyphar/filepath-securejoin" ) diff --git a/cf/appfiles/zipper_test.go b/cf/appfiles/zipper_test.go index a262b2fdcf..bb1eed3be0 100644 --- a/cf/appfiles/zipper_test.go +++ b/cf/appfiles/zipper_test.go @@ -12,7 +12,7 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/cf/appfiles" + . "code.cloudfoundry.org/cli/v8/cf/appfiles" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/cmd/cmd.go b/cf/cmd/cmd.go index d2c1a38264..91d7d414e3 100644 --- a/cf/cmd/cmd.go +++ b/cf/cmd/cmd.go @@ -8,21 +8,21 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commandsloader" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/cf/util/spellcheck" - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commandsloader" + "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v8/cf/util/spellcheck" + "code.cloudfoundry.org/cli/v8/plugin/rpc" netrpc "net/rpc" ) @@ -31,18 +31,18 @@ var cmdRegistry = commandregistry.Commands func Main(traceEnv string, args []string) { - //handle `cf -v` for cf version + // handle `cf -v` for cf version if len(args) == 2 && (args[1] == "-v" || args[1] == "--version") { args[1] = "version" } - //handles `cf` + // handles `cf` if len(args) == 1 { args = []string{args[0], "help"} } - //handles `cf [COMMAND] -h ...` - //rearrange args to `cf help COMMAND` and let `command help` to print out usage + // handles `cf [COMMAND] -h ...` + // rearrange args to `cf help COMMAND` and let `command help` to print out usage args = append([]string{args[0]}, handleHelp(args[1:])...) newArgs, isVerbose := handleVerbose(args) @@ -86,7 +86,7 @@ func Main(traceEnv string, args []string) { commandsloader.Load() - //run core command + // run core command cmdName := args[1] cmd := cmdRegistry.FindCommand(cmdName) if cmd != nil { @@ -137,7 +137,7 @@ func Main(traceEnv string, args []string) { os.Exit(0) } - //non core command, try plugin command + // non core command, try plugin command server := netrpc.NewServer() rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, deps.Config, deps.RepoLocator, rpc.NewCommandRunner(), deps.Logger, Writer, server) if err != nil { diff --git a/cf/commandregistry/command.go b/cf/commandregistry/command.go index 5141c9bffd..e73ed6999f 100644 --- a/cf/commandregistry/command.go +++ b/cf/commandregistry/command.go @@ -1,8 +1,8 @@ package commandregistry import ( - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Command @@ -21,7 +21,7 @@ type CommandMetadata struct { Description string Flags map[string]flags.FlagSet SkipFlagParsing bool - TotalArgs int //Optional: number of required arguments to skip for flag verification + TotalArgs int // Optional: number of required arguments to skip for flag verification Hidden bool Examples []string } diff --git a/cf/commandregistry/commandregistryfakes/fake_command.go b/cf/commandregistry/commandregistryfakes/fake_command.go index 7941211b44..a58ee01636 100644 --- a/cf/commandregistry/commandregistryfakes/fake_command.go +++ b/cf/commandregistry/commandregistryfakes/fake_command.go @@ -4,9 +4,9 @@ package commandregistryfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeCommand struct { diff --git a/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go b/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go index 5bb4798d2b..57aa9b275b 100644 --- a/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go +++ b/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go @@ -4,7 +4,7 @@ package commandregistryfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" ) type FakeRandomWordGenerator struct { diff --git a/cf/commandregistry/dependency.go b/cf/commandregistry/dependency.go index 8360e9b8ed..6633632313 100644 --- a/cf/commandregistry/dependency.go +++ b/cf/commandregistry/dependency.go @@ -8,24 +8,24 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/plugin/models" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/randomword" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/manifest" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v8/util/randomword" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RandomWordGenerator @@ -56,7 +56,7 @@ type Dependency struct { PushActor actors.PushActor RouteActor actors.RouteActor ChecksumUtil util.Sha1Checksum - WildcardDependency interface{} //use for injecting fakes + WildcardDependency interface{} // use for injecting fakes Logger trace.Printer } diff --git a/cf/commandregistry/dependency_test.go b/cf/commandregistry/dependency_test.go index a58824a979..868b2f627b 100644 --- a/cf/commandregistry/dependency_test.go +++ b/cf/commandregistry/dependency_test.go @@ -1,8 +1,8 @@ package commandregistry_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" "os" diff --git a/cf/commandregistry/fakecommand/fake_command1.go b/cf/commandregistry/fakecommand/fake_command1.go index 46c6a7a459..ecdf3feec6 100644 --- a/cf/commandregistry/fakecommand/fake_command1.go +++ b/cf/commandregistry/fakecommand/fake_command1.go @@ -3,9 +3,9 @@ package fakecommand import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeCommand1 struct { diff --git a/cf/commandregistry/fakecommand/fake_command2.go b/cf/commandregistry/fakecommand/fake_command2.go index 0d15e461c8..ecc2d35a7a 100644 --- a/cf/commandregistry/fakecommand/fake_command2.go +++ b/cf/commandregistry/fakecommand/fake_command2.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeCommand2 struct { diff --git a/cf/commandregistry/fakecommand/fake_command_max_length_name.go b/cf/commandregistry/fakecommand/fake_command_max_length_name.go index 1dacefa59d..2f56a52afd 100644 --- a/cf/commandregistry/fakecommand/fake_command_max_length_name.go +++ b/cf/commandregistry/fakecommand/fake_command_max_length_name.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeCommand3 struct { diff --git a/cf/commandregistry/registry.go b/cf/commandregistry/registry.go index 2b7ee3cbf7..c95900dfe1 100644 --- a/cf/commandregistry/registry.go +++ b/cf/commandregistry/registry.go @@ -6,13 +6,13 @@ import ( "strings" "unicode/utf8" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v8/cf/terminal" ) var _ = initI18nFunc() diff --git a/cf/commandregistry/registry_test.go b/cf/commandregistry/registry_test.go index 86c5cfea4d..a55cb36d90 100644 --- a/cf/commandregistry/registry_test.go +++ b/cf/commandregistry/registry_test.go @@ -3,13 +3,13 @@ package commandregistry_test import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/commandregistry/fakecommand" + . "code.cloudfoundry.org/cli/v8/cf/commandregistry/fakecommand" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/api.go b/cf/commands/api.go index 8c44883574..bec8a4dc57 100644 --- a/cf/commands/api.go +++ b/cf/commands/api.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type API struct { diff --git a/cf/commands/api_test.go b/cf/commands/api_test.go index 93d86d5ad6..46ad3e1e2a 100644 --- a/cf/commands/api_test.go +++ b/cf/commands/api_test.go @@ -3,20 +3,20 @@ package commands_test import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("Api", func() { diff --git a/cf/commands/application/app.go b/cf/commands/application/app.go index de7ef2e879..7b3606f477 100644 --- a/cf/commands/application/app.go +++ b/cf/commands/application/app.go @@ -4,21 +4,21 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/uihelpers" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/plugin/models" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances" + "code.cloudfoundry.org/cli/v8/cf/api/stacks" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/uihelpers" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Displayer diff --git a/cf/commands/application/app_test.go b/cf/commands/application/app_test.go index c419071b81..323c9fa357 100644 --- a/cf/commands/application/app_test.go +++ b/cf/commands/application/app_test.go @@ -4,26 +4,26 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/plugin/models" - - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/appinstances/appinstancesfakes" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/plugin/models" + + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances/appinstancesfakes" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -476,7 +476,7 @@ var _ = Describe("App", func() { getAppSummaryModel.State = "stopped" appSummaryRepo.GetSummaryReturns(getAppSummaryModel, nil) - var instances []models.AppInstanceFields //Very important since this is a nil body + var instances []models.AppInstanceFields // Very important since this is a nil body appInstancesRepo.GetInstancesReturns(instances, errors.New("Bonzi")) }) diff --git a/cf/commands/application/application_suite_test.go b/cf/commands/application/application_suite_test.go index 7d66957acf..b6cb10befe 100644 --- a/cf/commands/application/application_suite_test.go +++ b/cf/commands/application/application_suite_test.go @@ -1,8 +1,8 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/application/applicationfakes/fake_app_displayer.go b/cf/commands/application/applicationfakes/fake_app_displayer.go index 95024a07f4..0bd52af24a 100644 --- a/cf/commands/application/applicationfakes/fake_app_displayer.go +++ b/cf/commands/application/applicationfakes/fake_app_displayer.go @@ -1,10 +1,10 @@ package applicationfakes import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeAppDisplayer struct { diff --git a/cf/commands/application/applicationfakes/fake_displayer.go b/cf/commands/application/applicationfakes/fake_displayer.go index 29fd79fd74..f696fd2960 100644 --- a/cf/commands/application/applicationfakes/fake_displayer.go +++ b/cf/commands/application/applicationfakes/fake_displayer.go @@ -4,8 +4,8 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeDisplayer struct { diff --git a/cf/commands/application/applicationfakes/fake_restarter.go b/cf/commands/application/applicationfakes/fake_restarter.go index 1ee736c2ab..84db7da336 100644 --- a/cf/commands/application/applicationfakes/fake_restarter.go +++ b/cf/commands/application/applicationfakes/fake_restarter.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeRestarter struct { diff --git a/cf/commands/application/applicationfakes/fake_staging_watcher.go b/cf/commands/application/applicationfakes/fake_staging_watcher.go index 6fdda4de08..ec28e0e45f 100644 --- a/cf/commands/application/applicationfakes/fake_staging_watcher.go +++ b/cf/commands/application/applicationfakes/fake_staging_watcher.go @@ -4,8 +4,8 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeStagingWatcher struct { diff --git a/cf/commands/application/applicationfakes/fake_starter.go b/cf/commands/application/applicationfakes/fake_starter.go index 43ff78cdc4..4a4b6cdbe8 100644 --- a/cf/commands/application/applicationfakes/fake_starter.go +++ b/cf/commands/application/applicationfakes/fake_starter.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeStarter struct { diff --git a/cf/commands/application/applicationfakes/fake_stopper.go b/cf/commands/application/applicationfakes/fake_stopper.go index fed79044c6..7675328321 100644 --- a/cf/commands/application/applicationfakes/fake_stopper.go +++ b/cf/commands/application/applicationfakes/fake_stopper.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeStopper struct { diff --git a/cf/commands/application/apps.go b/cf/commands/application/apps.go index e246f9ff09..9b2e828e17 100644 --- a/cf/commands/application/apps.go +++ b/cf/commands/application/apps.go @@ -3,18 +3,18 @@ package application import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - plugin_models "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/uihelpers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/uihelpers" ) type ListApps struct { diff --git a/cf/commands/application/apps_test.go b/cf/commands/application/apps_test.go index 3ad32e19e3..81d0cfa91b 100644 --- a/cf/commands/application/apps_test.go +++ b/cf/commands/application/apps_test.go @@ -1,25 +1,25 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("list-apps command", func() { diff --git a/cf/commands/application/copy_source.go b/cf/commands/application/copy_source.go index a5c9b286bd..82801ad7fc 100644 --- a/cf/commands/application/copy_source.go +++ b/cf/commands/application/copy_source.go @@ -5,18 +5,18 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CopySource struct { @@ -76,7 +76,7 @@ func (cmd *CopySource) SetDependency(deps commandregistry.Dependency, pluginCall cmd.spaceRepo = deps.RepoLocator.GetSpaceRepository() cmd.copyAppSourceRepo = deps.RepoLocator.GetCopyApplicationSourceRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("restart") commandDep = commandDep.SetDependency(deps, false) cmd.appRestart = commandDep.(Restarter) diff --git a/cf/commands/application/copy_source_test.go b/cf/commands/application/copy_source_test.go index 5d8e6ba0a2..9556a66ead 100644 --- a/cf/commands/application/copy_source_test.go +++ b/cf/commands/application/copy_source_test.go @@ -1,24 +1,24 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/api/copyapplicationsource/copyapplicationsourcefakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource/copyapplicationsourcefakes" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -48,7 +48,7 @@ var _ = Describe("CopySource", func() { deps.RepoLocator = deps.RepoLocator.SetOrganizationRepository(orgRepo) deps.Config = config - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(appRestarter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("copy-source").SetDependency(deps, pluginCall)) @@ -64,11 +64,11 @@ var _ = Describe("CopySource", func() { orgRepo = new(organizationsfakes.FakeOrganizationRepository) config = testconfig.NewRepositoryWithDefaults() - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("restart") appRestarter = new(applicationfakes.FakeRestarter) - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry appRestarter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return appRestarter } diff --git a/cf/commands/application/delete.go b/cf/commands/application/delete.go index caa784d525..620e017032 100644 --- a/cf/commands/application/delete.go +++ b/cf/commands/application/delete.go @@ -1,15 +1,15 @@ package application import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteApp struct { diff --git a/cf/commands/application/delete_test.go b/cf/commands/application/delete_test.go index 23d2bef410..0e74875d22 100644 --- a/cf/commands/application/delete_test.go +++ b/cf/commands/application/delete_test.go @@ -1,21 +1,21 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("delete app command", func() { diff --git a/cf/commands/application/disable_ssh.go b/cf/commands/application/disable_ssh.go index 0f7f8f1923..1a7e0d6387 100644 --- a/cf/commands/application/disable_ssh.go +++ b/cf/commands/application/disable_ssh.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DisableSSH struct { diff --git a/cf/commands/application/disable_ssh_test.go b/cf/commands/application/disable_ssh_test.go index b223af0b66..880242c7f8 100644 --- a/cf/commands/application/disable_ssh_test.go +++ b/cf/commands/application/disable_ssh_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/enable_ssh.go b/cf/commands/application/enable_ssh.go index 6971c44a60..9deb7401b4 100644 --- a/cf/commands/application/enable_ssh.go +++ b/cf/commands/application/enable_ssh.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type EnableSSH struct { diff --git a/cf/commands/application/enable_ssh_test.go b/cf/commands/application/enable_ssh_test.go index aa820d3252..b11da7c945 100644 --- a/cf/commands/application/enable_ssh_test.go +++ b/cf/commands/application/enable_ssh_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/env.go b/cf/commands/application/env.go index 0783a5fd99..82a3a16734 100644 --- a/cf/commands/application/env.go +++ b/cf/commands/application/env.go @@ -5,15 +5,15 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Env struct { diff --git a/cf/commands/application/env_test.go b/cf/commands/application/env_test.go index a449322500..3f7561e4d1 100644 --- a/cf/commands/application/env_test.go +++ b/cf/commands/application/env_test.go @@ -1,18 +1,18 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/events.go b/cf/commands/application/events.go index 1c143d7531..d144a9e538 100644 --- a/cf/commands/application/events.go +++ b/cf/commands/application/events.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/appevents" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/appevents" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Events struct { diff --git a/cf/commands/application/events_test.go b/cf/commands/application/events_test.go index c75b8507ce..ba30cf6219 100644 --- a/cf/commands/application/events_test.go +++ b/cf/commands/application/events_test.go @@ -4,19 +4,19 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - - "code.cloudfoundry.org/cli/cf/api/appevents/appeventsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + + "code.cloudfoundry.org/cli/v8/cf/api/appevents/appeventsfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/files.go b/cf/commands/application/files.go index 8584493eb5..bf29118af7 100644 --- a/cf/commands/application/files.go +++ b/cf/commands/application/files.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/appfiles" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/appfiles" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Files struct { diff --git a/cf/commands/application/files_test.go b/cf/commands/application/files_test.go index cf8520b415..307a0316eb 100644 --- a/cf/commands/application/files_test.go +++ b/cf/commands/application/files_test.go @@ -3,19 +3,19 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/appfiles/appfilesfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/appfiles/appfilesfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/get_health_check.go b/cf/commands/application/get_health_check.go index b0dd926cf6..9b8a0d20e1 100644 --- a/cf/commands/application/get_health_check.go +++ b/cf/commands/application/get_health_check.go @@ -3,14 +3,14 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type GetHealthCheck struct { diff --git a/cf/commands/application/get_health_check_test.go b/cf/commands/application/get_health_check_test.go index 33b4071cdf..5550b25916 100644 --- a/cf/commands/application/get_health_check_test.go +++ b/cf/commands/application/get_health_check_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/logs.go b/cf/commands/application/logs.go index 9bed3f1d75..e9de3a3395 100644 --- a/cf/commands/application/logs.go +++ b/cf/commands/application/logs.go @@ -4,15 +4,15 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Logs struct { diff --git a/cf/commands/application/logs_test.go b/cf/commands/application/logs_test.go index e82d6e04d8..20af94a799 100644 --- a/cf/commands/application/logs_test.go +++ b/cf/commands/application/logs_test.go @@ -1,19 +1,19 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/api/logs/logsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/api/logs/logsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/push.go b/cf/commands/application/push.go index 8c48a7839a..1e1726bef8 100644 --- a/cf/commands/application/push.go +++ b/cf/commands/application/push.go @@ -8,24 +8,24 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/appfiles" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/api/stacks" + "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/manifest" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Push struct { @@ -122,17 +122,17 @@ func (cmd *Push) SetDependency(deps commandregistry.Dependency, pluginCall bool) cmd.config = deps.Config cmd.manifestRepo = deps.ManifestRepo - //set appStarter + // set appStarter appCommand := commandregistry.Commands.FindCommand("start") appCommand = appCommand.SetDependency(deps, false) cmd.appStarter = appCommand.(Starter) - //set appStopper + // set appStopper appCommand = commandregistry.Commands.FindCommand("stop") appCommand = appCommand.SetDependency(deps, false) cmd.appStopper = appCommand.(Stopper) - //set serviceBinder + // set serviceBinder appCommand = commandregistry.Commands.FindCommand("bind-service") appCommand = appCommand.SetDependency(deps, false) cmd.serviceBinder = appCommand.(service.Binder) @@ -438,7 +438,7 @@ func (cmd *Push) createAndBindRoute( case host != nil: hostname = *host case UseRandomPort: - //do nothing + // do nothing case UseRandomRoute: hostname = hostNameForString(app.Name) + "-" + cmd.wordGenerator.Babble() default: diff --git a/cf/commands/application/push_test.go b/cf/commands/application/push_test.go index 2447c67551..ca6e01d0af 100644 --- a/cf/commands/application/push_test.go +++ b/cf/commands/application/push_test.go @@ -5,31 +5,31 @@ import ( "path/filepath" "syscall" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/cf/appfiles/appfilesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commandregistry/commandregistryfakes" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/commands/service/servicefakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/manifest/manifestfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v8/cf/appfiles/appfilesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commandregistry/commandregistryfakes" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v8/cf/commands/service/servicefakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/manifest" + "code.cloudfoundry.org/cli/v8/cf/manifest/manifestfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" @@ -68,7 +68,7 @@ var _ = Describe("Push Command", func() { ) BeforeEach(func() { - //save original command dependences and restore later + // save original command dependences and restore later OriginalCommandStart = commandregistry.Commands.FindCommand("start") OriginalCommandStop = commandregistry.Commands.FindCommand("stop") OriginalCommandServiceBind = commandregistry.Commands.FindCommand("bind-service") @@ -83,7 +83,7 @@ var _ = Describe("Push Command", func() { minVersionReq = requirements.Passing{Type: "minVersionReq"} requirementsFactory.NewMinAPIVersionRequirementReturns(minVersionReq) - ui = &testterm.FakeUI{} //new(terminalfakes.FakeUI) + ui = &testterm.FakeUI{} // new(terminalfakes.FakeUI) configRepo = testconfig.NewRepositoryWithDefaults() manifestRepo = new(manifestfakes.FakeRepository) wordGenerator = new(commandregistryfakes.FakeRandomWordGenerator) @@ -117,7 +117,7 @@ var _ = Describe("Push Command", func() { deps.RepoLocator = deps.RepoLocator.SetStackRepository(stackRepo) deps.RepoLocator = deps.RepoLocator.SetAuthenticationRepository(authRepo) - //setup fake commands (counterfeiter) to correctly interact with commandregistry + // setup fake commands (counterfeiter) to correctly interact with commandregistry starter = new(applicationfakes.FakeStarter) starter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return starter @@ -132,7 +132,7 @@ var _ = Describe("Push Command", func() { stopper.MetaDataReturns(commandregistry.CommandMetadata{Name: "stop"}) commandregistry.Register(stopper) - //inject fake commands dependencies into registry + // inject fake commands dependencies into registry serviceBinder = new(servicefakes.OldFakeAppBinder) commandregistry.Register(serviceBinder) diff --git a/cf/commands/application/rename.go b/cf/commands/application/rename.go index 870217f839..afb49cc5a1 100644 --- a/cf/commands/application/rename.go +++ b/cf/commands/application/rename.go @@ -3,14 +3,14 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RenameApp struct { diff --git a/cf/commands/application/rename_test.go b/cf/commands/application/rename_test.go index eda7d25bcc..03691b9ffb 100644 --- a/cf/commands/application/rename_test.go +++ b/cf/commands/application/rename_test.go @@ -1,17 +1,17 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/restage.go b/cf/commands/application/restage.go index 248a2b0453..c969e973af 100644 --- a/cf/commands/application/restage.go +++ b/cf/commands/application/restage.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Restage struct { @@ -55,7 +55,7 @@ func (cmd *Restage) SetDependency(deps commandregistry.Dependency, pluginCall bo cmd.config = deps.Config cmd.appRepo = deps.RepoLocator.GetApplicationRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("start") commandDep = commandDep.SetDependency(deps, false) cmd.appStagingWatcher = commandDep.(StagingWatcher) diff --git a/cf/commands/application/restage_test.go b/cf/commands/application/restage_test.go index e55890f7ba..bc20b3b9b0 100644 --- a/cf/commands/application/restage_test.go +++ b/cf/commands/application/restage_test.go @@ -1,18 +1,18 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -34,7 +34,7 @@ var _ = Describe("restage command", func() { deps.RepoLocator = deps.RepoLocator.SetApplicationRepository(appRepo) deps.Config = configRepo - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(stagingWatcher) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("restage").SetDependency(deps, pluginCall)) @@ -54,7 +54,7 @@ var _ = Describe("restage command", func() { requirementsFactory.NewLoginRequirementReturns(requirements.Passing{}) requirementsFactory.NewTargetedSpaceRequirementReturns(requirements.Passing{}) - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("start") stagingWatcher = &fakeStagingWatcher{} diff --git a/cf/commands/application/restart.go b/cf/commands/application/restart.go index 2668be291c..cf9f8cf5d7 100644 --- a/cf/commands/application/restart.go +++ b/cf/commands/application/restart.go @@ -3,13 +3,13 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Restarter @@ -63,12 +63,12 @@ func (cmd *Restart) SetDependency(deps commandregistry.Dependency, pluginCall bo cmd.ui = deps.UI cmd.config = deps.Config - //get start for dependency + // get start for dependency starter := commandregistry.Commands.FindCommand("start") starter = starter.SetDependency(deps, false) cmd.starter = starter.(Starter) - //get stop for dependency + // get stop for dependency stopper := commandregistry.Commands.FindCommand("stop") stopper = stopper.SetDependency(deps, false) cmd.stopper = stopper.(Stopper) diff --git a/cf/commands/application/restart_app_instance.go b/cf/commands/application/restart_app_instance.go index c19dd6af3f..db544a1eb8 100644 --- a/cf/commands/application/restart_app_instance.go +++ b/cf/commands/application/restart_app_instance.go @@ -5,13 +5,13 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RestartAppInstance struct { diff --git a/cf/commands/application/restart_app_instance_test.go b/cf/commands/application/restart_app_instance_test.go index b7e5f3545e..ffe4d9dbba 100644 --- a/cf/commands/application/restart_app_instance_test.go +++ b/cf/commands/application/restart_app_instance_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/appinstances/appinstancesfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances/appinstancesfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 c4d2ba48cd..49f18fab89 100644 --- a/cf/commands/application/restart_test.go +++ b/cf/commands/application/restart_test.go @@ -3,18 +3,18 @@ package application_test import ( "os" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -37,7 +37,7 @@ var _ = Describe("restart command", func() { deps.UI = ui deps.Config = config - //inject fake 'stopper and starter' into registry + // inject fake 'stopper and starter' into registry commandregistry.Register(starter) commandregistry.Register(stopper) @@ -63,11 +63,11 @@ var _ = Describe("restart command", func() { applicationReq = new(requirementsfakes.FakeApplicationRequirement) applicationReq.GetApplicationReturns(app) - //save original command and restore later + // save original command and restore later originalStart = commandregistry.Commands.FindCommand("start") originalStop = commandregistry.Commands.FindCommand("stop") - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry starter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return starter } diff --git a/cf/commands/application/scale.go b/cf/commands/application/scale.go index b6bc67957f..05485e10d7 100644 --- a/cf/commands/application/scale.go +++ b/cf/commands/application/scale.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Scale struct { @@ -66,7 +66,7 @@ func (cmd *Scale) SetDependency(deps commandregistry.Dependency, pluginCall bool cmd.config = deps.Config cmd.appRepo = deps.RepoLocator.GetApplicationRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("restart") commandDep = commandDep.SetDependency(deps, false) cmd.restarter = commandDep.(Restarter) diff --git a/cf/commands/application/scale_test.go b/cf/commands/application/scale_test.go index 368e6241e4..131b88be0f 100644 --- a/cf/commands/application/scale_test.go +++ b/cf/commands/application/scale_test.go @@ -1,20 +1,20 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("scale command", func() { @@ -34,7 +34,7 @@ var _ = Describe("scale command", func() { deps.RepoLocator = deps.RepoLocator.SetApplicationRepository(appRepo) deps.Config = config - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(restarter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("scale").SetDependency(deps, pluginCall)) @@ -45,11 +45,11 @@ var _ = Describe("scale command", func() { requirementsFactory.NewLoginRequirementReturns(requirements.Passing{}) requirementsFactory.NewTargetedSpaceRequirementReturns(requirements.Passing{}) - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("restart") restarter = new(applicationfakes.FakeRestarter) - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry restarter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return restarter } diff --git a/cf/commands/application/set_env.go b/cf/commands/application/set_env.go index 30363830d6..104e61b8b9 100644 --- a/cf/commands/application/set_env.go +++ b/cf/commands/application/set_env.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SetEnv struct { diff --git a/cf/commands/application/set_env_test.go b/cf/commands/application/set_env_test.go index 6089e95721..526f208709 100644 --- a/cf/commands/application/set_env_test.go +++ b/cf/commands/application/set_env_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/set_health_check.go b/cf/commands/application/set_health_check.go index 6a744a23de..50ecaf9039 100644 --- a/cf/commands/application/set_health_check.go +++ b/cf/commands/application/set_health_check.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SetHealthCheck struct { diff --git a/cf/commands/application/set_health_check_test.go b/cf/commands/application/set_health_check_test.go index 18c1fc2694..234a321ff5 100644 --- a/cf/commands/application/set_health_check_test.go +++ b/cf/commands/application/set_health_check_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/ssh.go b/cf/commands/application/ssh.go index f2a8e24481..931a062521 100644 --- a/cf/commands/application/ssh.go +++ b/cf/commands/application/ssh.go @@ -8,17 +8,17 @@ import ( "golang.org/x/crypto/ssh" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/requirements" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" - "code.cloudfoundry.org/cli/cf/ssh/options" - sshTerminal "code.cloudfoundry.org/cli/cf/ssh/terminal" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/requirements" + sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" + "code.cloudfoundry.org/cli/v8/cf/ssh/options" + sshTerminal "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SSH struct { @@ -95,7 +95,7 @@ func (cmd *SSH) SetDependency(deps commandregistry.Dependency, pluginCall bool) cmd.secureShell = deps.WildcardDependency.(sshCmd.SecureShell) } - //get ssh-code for dependency + // get ssh-code for dependency sshCodeGetter := commandregistry.Commands.FindCommand("ssh-code") sshCodeGetter = sshCodeGetter.SetDependency(deps, false) cmd.sshCodeGetter = sshCodeGetter.(commands.SSHCodeGetter) @@ -125,7 +125,7 @@ func (cmd *SSH) Execute(fc flags.FlagContext) error { return errors.New(T("Error getting one time auth code: ") + err.Error()) } - //init secureShell if it is not already set by SetDependency() with fakes + // init secureShell if it is not already set by SetDependency() with fakes if cmd.secureShell == nil { cmd.secureShell = sshCmd.NewSecureShell( sshCmd.DefaultSecureDialer(), diff --git a/cf/commands/application/ssh_enabled.go b/cf/commands/application/ssh_enabled.go index 7152209b90..d49e209af2 100644 --- a/cf/commands/application/ssh_enabled.go +++ b/cf/commands/application/ssh_enabled.go @@ -3,12 +3,12 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SSHEnabled struct { diff --git a/cf/commands/application/ssh_enabled_test.go b/cf/commands/application/ssh_enabled_test.go index a5ef948be2..d41c3e00e3 100644 --- a/cf/commands/application/ssh_enabled_test.go +++ b/cf/commands/application/ssh_enabled_test.go @@ -1,16 +1,16 @@ package application_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 99c93cc322..38993dff18 100644 --- a/cf/commands/application/ssh_test.go +++ b/cf/commands/application/ssh_test.go @@ -6,22 +6,22 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/commandsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/ssh/sshfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/commandsfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/ssh/sshfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -47,12 +47,12 @@ var _ = Describe("SSH command", func() { requirementsFactory = new(requirementsfakes.FakeFactory) deps.Gateways = make(map[string]net.Gateway) - //save original command and restore later + // save original command and restore later originalSSHCodeGetter = commandregistry.Commands.FindCommand("ssh-code") sshCodeGetter = new(commandsfakes.FakeSSHCodeGetter) - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry sshCodeGetter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return sshCodeGetter } @@ -60,7 +60,7 @@ var _ = Describe("SSH command", func() { }) AfterEach(func() { - //restore original command + // restore original command commandregistry.Register(originalSSHCodeGetter) }) @@ -68,7 +68,7 @@ var _ = Describe("SSH command", func() { deps.UI = ui deps.Config = configRepo - //inject fake 'sshCodeGetter' into registry + // inject fake 'sshCodeGetter' into registry commandregistry.Register(sshCodeGetter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("ssh").SetDependency(deps, pluginCall)) diff --git a/cf/commands/application/start.go b/cf/commands/application/start.go index ee78184b8e..3abeb405ab 100644 --- a/cf/commands/application/start.go +++ b/cf/commands/application/start.go @@ -10,17 +10,17 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) const ( @@ -195,7 +195,7 @@ func (cmd *Start) WatchStaging(app models.Application, orgName, spaceName string } cmd.ui.Ok() - //detectedstartcommand on first push is not present until starting completes + // detectedstartcommand on first push is not present until starting completes startedApp, err := cmd.appRepo.GetApp(updatedApp.GUID) if err != nil { return models.Application{}, err diff --git a/cf/commands/application/start_test.go b/cf/commands/application/start_test.go index 9ed242e620..67f5feb874 100644 --- a/cf/commands/application/start_test.go +++ b/cf/commands/application/start_test.go @@ -5,26 +5,26 @@ import ( "runtime" "time" - . "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - - "code.cloudfoundry.org/cli/cf/api/appinstances/appinstancesfakes" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/api/logs" - "code.cloudfoundry.org/cli/cf/api/logs/logsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + + "code.cloudfoundry.org/cli/v8/cf/api/appinstances/appinstancesfakes" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v8/cf/api/logs/logsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" "sync" @@ -59,7 +59,7 @@ var _ = Describe("start command", func() { deps.RepoLocator = deps.RepoLocator.SetApplicationRepository(appRepo) deps.RepoLocator = deps.RepoLocator.SetAppInstancesRepository(appInstancesRepo) - //inject fake 'Start' into registry + // inject fake 'Start' into registry commandregistry.Register(displayApp) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("start").SetDependency(deps, false)) @@ -104,7 +104,7 @@ var _ = Describe("start command", func() { displayApp = new(applicationfakes.FakeAppDisplayer) - //save original command dependency and restore later + // save original command dependency and restore later originalAppCommand = commandregistry.Commands.FindCommand("app") defaultInstanceErrorCodes = []string{"", ""} @@ -291,14 +291,14 @@ var _ = Describe("start command", func() { }) Context("when the timeout happens exactly when the connection is established", func() { - //var startWait *sync.WaitGroup + // var startWait *sync.WaitGroup BeforeEach(func() { requirementsFactory.NewLoginRequirementReturns(requirements.Passing{}) requirementsFactory.NewTargetedSpaceRequirementReturns(requirements.Passing{}) configRepo = testconfig.NewRepositoryWithDefaults() logRepo.TailLogsForStub = func(appGUID string, onConnect func(), logChan chan<- logs.Loggable, errChan chan<- error) { - //startWait.Wait() + // startWait.Wait() onConnect() } }) diff --git a/cf/commands/application/stop.go b/cf/commands/application/stop.go index c78385ae9f..fa260899f4 100644 --- a/cf/commands/application/stop.go +++ b/cf/commands/application/stop.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Stopper diff --git a/cf/commands/application/stop_test.go b/cf/commands/application/stop_test.go index d118e219df..391e7711ff 100644 --- a/cf/commands/application/stop_test.go +++ b/cf/commands/application/stop_test.go @@ -3,18 +3,18 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/application" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/unset_env.go b/cf/commands/application/unset_env.go index f3754350cb..92b261ff8a 100644 --- a/cf/commands/application/unset_env.go +++ b/cf/commands/application/unset_env.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UnsetEnv struct { diff --git a/cf/commands/application/unset_env_test.go b/cf/commands/application/unset_env_test.go index 64fca2773e..640801fe5f 100644 --- a/cf/commands/application/unset_env_test.go +++ b/cf/commands/application/unset_env_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/auth.go b/cf/commands/auth.go index f65539edff..7e294a0f3e 100644 --- a/cf/commands/auth.go +++ b/cf/commands/auth.go @@ -3,14 +3,14 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Authenticate struct { diff --git a/cf/commands/auth_test.go b/cf/commands/auth_test.go index 0320214567..26b14b1aaf 100644 --- a/cf/commands/auth_test.go +++ b/cf/commands/auth_test.go @@ -3,22 +3,22 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("auth command", func() { diff --git a/cf/commands/buildpack/buildpack_suite_test.go b/cf/commands/buildpack/buildpack_suite_test.go index a5d02389fc..8b93e4ee8e 100644 --- a/cf/commands/buildpack/buildpack_suite_test.go +++ b/cf/commands/buildpack/buildpack_suite_test.go @@ -1,8 +1,8 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/buildpack/buildpacks.go b/cf/commands/buildpack/buildpacks.go index 9971cce213..33f657ecd6 100644 --- a/cf/commands/buildpack/buildpacks.go +++ b/cf/commands/buildpack/buildpacks.go @@ -4,14 +4,14 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListBuildpacks struct { diff --git a/cf/commands/buildpack/buildpacks_test.go b/cf/commands/buildpack/buildpacks_test.go index 2b9c00fc95..b4d9f1e926 100644 --- a/cf/commands/buildpack/buildpacks_test.go +++ b/cf/commands/buildpack/buildpacks_test.go @@ -1,17 +1,17 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "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" - - "code.cloudfoundry.org/cli/cf/commands/buildpack" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commands/buildpack" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/buildpack/create_buildpack.go b/cf/commands/buildpack/create_buildpack.go index b04eceb9f0..5aff5c7e46 100644 --- a/cf/commands/buildpack/create_buildpack.go +++ b/cf/commands/buildpack/create_buildpack.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateBuildpack struct { diff --git a/cf/commands/buildpack/create_buildpack_test.go b/cf/commands/buildpack/create_buildpack_test.go index 8a5870fbb4..38ca11c1ab 100644 --- a/cf/commands/buildpack/create_buildpack_test.go +++ b/cf/commands/buildpack/create_buildpack_test.go @@ -3,16 +3,16 @@ package buildpack_test import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/buildpack/delete_buildpack.go b/cf/commands/buildpack/delete_buildpack.go index d46f119b5e..3d49ce1f1b 100644 --- a/cf/commands/buildpack/delete_buildpack.go +++ b/cf/commands/buildpack/delete_buildpack.go @@ -3,14 +3,14 @@ package buildpack import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteBuildpack struct { @@ -87,7 +87,7 @@ func (cmd *DeleteBuildpack) Execute(c flags.FlagContext) error { } switch err.(type) { - case nil: //do nothing + case nil: // do nothing case *errors.ModelNotFoundError: cmd.ui.Ok() if stack == "" { diff --git a/cf/commands/buildpack/delete_buildpack_test.go b/cf/commands/buildpack/delete_buildpack_test.go index 4829e1c82b..8a80e69666 100644 --- a/cf/commands/buildpack/delete_buildpack_test.go +++ b/cf/commands/buildpack/delete_buildpack_test.go @@ -1,18 +1,18 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("delete-buildpack command", func() { diff --git a/cf/commands/buildpack/rename_buildpack.go b/cf/commands/buildpack/rename_buildpack.go index d9341db19d..cc3ca0fa11 100644 --- a/cf/commands/buildpack/rename_buildpack.go +++ b/cf/commands/buildpack/rename_buildpack.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RenameBuildpack struct { diff --git a/cf/commands/buildpack/rename_buildpack_test.go b/cf/commands/buildpack/rename_buildpack_test.go index d6cc833325..17449c44c0 100644 --- a/cf/commands/buildpack/rename_buildpack_test.go +++ b/cf/commands/buildpack/rename_buildpack_test.go @@ -1,18 +1,18 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("rename-buildpack command", func() { diff --git a/cf/commands/buildpack/update_buildpack.go b/cf/commands/buildpack/update_buildpack.go index a6d50a0bcc..121e2ba019 100644 --- a/cf/commands/buildpack/update_buildpack.go +++ b/cf/commands/buildpack/update_buildpack.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UpdateBuildpack struct { diff --git a/cf/commands/buildpack/update_buildpack_test.go b/cf/commands/buildpack/update_buildpack_test.go index 64c572985d..591eb1c75b 100644 --- a/cf/commands/buildpack/update_buildpack_test.go +++ b/cf/commands/buildpack/update_buildpack_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 c3529d26ed..d2f20fe01f 100644 --- a/cf/commands/commands_suite_test.go +++ b/cf/commands/commands_suite_test.go @@ -1,9 +1,9 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/cf/commands/commandsfakes/fake_sshcode_getter.go b/cf/commands/commandsfakes/fake_sshcode_getter.go index f7b1615709..ff6d9a42ba 100644 --- a/cf/commands/commandsfakes/fake_sshcode_getter.go +++ b/cf/commands/commandsfakes/fake_sshcode_getter.go @@ -4,10 +4,10 @@ package commandsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeSSHCodeGetter struct { diff --git a/cf/commands/config.go b/cf/commands/config.go index 83d003e59d..ffceaecae6 100644 --- a/cf/commands/config.go +++ b/cf/commands/config.go @@ -4,13 +4,13 @@ import ( "errors" "sort" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type ConfigCommands struct { diff --git a/cf/commands/config_test.go b/cf/commands/config_test.go index a2f4630dd5..6d9b4f84e2 100644 --- a/cf/commands/config_test.go +++ b/cf/commands/config_test.go @@ -1,14 +1,14 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/create_app_manifest.go b/cf/commands/create_app_manifest.go index b70141873d..3be17b30f6 100644 --- a/cf/commands/create_app_manifest.go +++ b/cf/commands/create_app_manifest.go @@ -6,18 +6,18 @@ import ( "os" "sort" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/appinstances" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/appinstances" + "code.cloudfoundry.org/cli/v8/cf/api/stacks" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/manifest" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateAppManifest struct { @@ -157,7 +157,7 @@ func (cmd *CreateAppManifest) createManifest(app models.Application) error { default: return errors.New(T("Failed to create manifest, unable to parse environment variable: ") + envVarKey) case float64: - //json.Unmarshal turn all numbers to float64 + // json.Unmarshal turn all numbers to float64 value := int(app.EnvironmentVars[envVarKey].(float64)) cmd.manifest.EnvironmentVars(app.Name, envVarKey, fmt.Sprintf("%d", value)) case bool: diff --git a/cf/commands/create_app_manifest_test.go b/cf/commands/create_app_manifest_test.go index ad3b71d9b7..06902be18c 100644 --- a/cf/commands/create_app_manifest_test.go +++ b/cf/commands/create_app_manifest_test.go @@ -4,23 +4,23 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/manifest/manifestfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/manifest/manifestfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" uuid "github.com/nu7hatch/gouuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/curl.go b/cf/commands/curl.go index 783577c3aa..ed53cd2350 100644 --- a/cf/commands/curl.go +++ b/cf/commands/curl.go @@ -10,17 +10,17 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/cf/flagcontext" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cfErrors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v8/cf/flagcontext" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + cfErrors "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" ) type Curl struct { diff --git a/cf/commands/curl_test.go b/cf/commands/curl_test.go index 870836436e..4de1023c19 100644 --- a/cf/commands/curl_test.go +++ b/cf/commands/curl_test.go @@ -5,19 +5,19 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" "code.cloudfoundry.org/gofileutils/fileutils" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/trace" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/trace" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/create_domain.go b/cf/commands/domain/create_domain.go index b818e8540d..1b2bbf090d 100644 --- a/cf/commands/domain/create_domain.go +++ b/cf/commands/domain/create_domain.go @@ -3,13 +3,13 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateDomain struct { diff --git a/cf/commands/domain/create_domain_test.go b/cf/commands/domain/create_domain_test.go index c2fd102c87..69e960f55c 100644 --- a/cf/commands/domain/create_domain_test.go +++ b/cf/commands/domain/create_domain_test.go @@ -1,17 +1,17 @@ package domain_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/create_shared_domain.go b/cf/commands/domain/create_shared_domain.go index ef6a1cae14..fb3a8871f6 100644 --- a/cf/commands/domain/create_shared_domain.go +++ b/cf/commands/domain/create_shared_domain.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateSharedDomain struct { diff --git a/cf/commands/domain/create_shared_domain_test.go b/cf/commands/domain/create_shared_domain_test.go index 33ee11a100..04129e75c0 100644 --- a/cf/commands/domain/create_shared_domain_test.go +++ b/cf/commands/domain/create_shared_domain_test.go @@ -3,20 +3,20 @@ package domain_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/cf/commands/domain" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/commands/domain" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/delete_domain.go b/cf/commands/domain/delete_domain.go index 09c650ba6b..db7d43387f 100644 --- a/cf/commands/domain/delete_domain.go +++ b/cf/commands/domain/delete_domain.go @@ -3,14 +3,14 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteDomain struct { diff --git a/cf/commands/domain/delete_domain_test.go b/cf/commands/domain/delete_domain_test.go index a4af8db6a7..2a73296fe1 100644 --- a/cf/commands/domain/delete_domain_test.go +++ b/cf/commands/domain/delete_domain_test.go @@ -1,20 +1,20 @@ package domain_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("delete-domain command", func() { diff --git a/cf/commands/domain/delete_shared_domain.go b/cf/commands/domain/delete_shared_domain.go index c8f966a1c8..9cd4d9048c 100644 --- a/cf/commands/domain/delete_shared_domain.go +++ b/cf/commands/domain/delete_shared_domain.go @@ -3,14 +3,14 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteSharedDomain struct { diff --git a/cf/commands/domain/delete_shared_domain_test.go b/cf/commands/domain/delete_shared_domain_test.go index c3517a09c4..4eb18b779e 100644 --- a/cf/commands/domain/delete_shared_domain_test.go +++ b/cf/commands/domain/delete_shared_domain_test.go @@ -1,18 +1,18 @@ package domain_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 1134db11e9..28f90a83a6 100644 --- a/cf/commands/domain/domain_suite_test.go +++ b/cf/commands/domain/domain_suite_test.go @@ -1,8 +1,8 @@ package domain_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/domain/domains.go b/cf/commands/domain/domains.go index 8956bc4284..b62bc116d0 100644 --- a/cf/commands/domain/domains.go +++ b/cf/commands/domain/domains.go @@ -3,14 +3,14 @@ package domain import ( "errors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListDomains struct { diff --git a/cf/commands/domain/domains_test.go b/cf/commands/domain/domains_test.go index 4c0e07406a..c1ff8d8cf8 100644 --- a/cf/commands/domain/domains_test.go +++ b/cf/commands/domain/domains_test.go @@ -3,21 +3,21 @@ package domain_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/cf/commands/domain" + "code.cloudfoundry.org/cli/v8/cf/commands/domain" . "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 1390d46535..b387681840 100644 --- a/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go +++ b/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go @@ -1,8 +1,8 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/environmentvariablegroup/running_environment_variable_group.go b/cf/commands/environmentvariablegroup/running_environment_variable_group.go index d123fcd468..c1e210dd83 100644 --- a/cf/commands/environmentvariablegroup/running_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/running_environment_variable_group.go @@ -3,14 +3,14 @@ package environmentvariablegroup import ( "sort" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RunningEnvironmentVariableGroup struct { diff --git a/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go index 51a06ebf13..bbc8f3855c 100644 --- a/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go @@ -1,18 +1,18 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go b/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go index 45430d558c..10911a5aaf 100644 --- a/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SetRunningEnvironmentVariableGroup struct { 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 ebe73f6c22..8c66fe9f8d 100644 --- a/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go @@ -1,16 +1,16 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go index e995b8cf2e..084e488507 100644 --- a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SetStagingEnvironmentVariableGroup struct { 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 a5c3a05a2b..dac48a7c4a 100644 --- a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go @@ -1,16 +1,16 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/staging_environment_variable_group.go b/cf/commands/environmentvariablegroup/staging_environment_variable_group.go index ba246d57fe..f6d0ecbb59 100644 --- a/cf/commands/environmentvariablegroup/staging_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/staging_environment_variable_group.go @@ -3,14 +3,14 @@ package environmentvariablegroup import ( "sort" - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type StagingEnvironmentVariableGroup struct { diff --git a/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go index affe625540..d2e109d37a 100644 --- a/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go @@ -1,18 +1,18 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/disable_feature_flag.go b/cf/commands/featureflag/disable_feature_flag.go index 2ae884c2df..c4d1e719b9 100644 --- a/cf/commands/featureflag/disable_feature_flag.go +++ b/cf/commands/featureflag/disable_feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DisableFeatureFlag struct { diff --git a/cf/commands/featureflag/disable_feature_flag_test.go b/cf/commands/featureflag/disable_feature_flag_test.go index c5a33a98a5..f94304a86d 100644 --- a/cf/commands/featureflag/disable_feature_flag_test.go +++ b/cf/commands/featureflag/disable_feature_flag_test.go @@ -3,15 +3,15 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/enable_feature_flag.go b/cf/commands/featureflag/enable_feature_flag.go index 196dc9cafc..3493fbd52e 100644 --- a/cf/commands/featureflag/enable_feature_flag.go +++ b/cf/commands/featureflag/enable_feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type EnableFeatureFlag struct { diff --git a/cf/commands/featureflag/enable_feature_flag_test.go b/cf/commands/featureflag/enable_feature_flag_test.go index f08ebdcdc9..203780e883 100644 --- a/cf/commands/featureflag/enable_feature_flag_test.go +++ b/cf/commands/featureflag/enable_feature_flag_test.go @@ -3,15 +3,15 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/feature_flag.go b/cf/commands/featureflag/feature_flag.go index 284fc95c7c..14df38e35a 100644 --- a/cf/commands/featureflag/feature_flag.go +++ b/cf/commands/featureflag/feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ShowFeatureFlag struct { diff --git a/cf/commands/featureflag/feature_flag_test.go b/cf/commands/featureflag/feature_flag_test.go index bb7a483ee1..f32622b49a 100644 --- a/cf/commands/featureflag/feature_flag_test.go +++ b/cf/commands/featureflag/feature_flag_test.go @@ -3,16 +3,16 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/feature_flags.go b/cf/commands/featureflag/feature_flags.go index 045e5575bc..fa0a7c2176 100644 --- a/cf/commands/featureflag/feature_flags.go +++ b/cf/commands/featureflag/feature_flags.go @@ -1,13 +1,13 @@ package featureflag import ( - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListFeatureFlags struct { diff --git a/cf/commands/featureflag/feature_flags_test.go b/cf/commands/featureflag/feature_flags_test.go index 1c0599416c..e564e6ad5b 100644 --- a/cf/commands/featureflag/feature_flags_test.go +++ b/cf/commands/featureflag/feature_flags_test.go @@ -3,18 +3,18 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/featureflag" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/featureflag" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "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 29d5706507..9b6f42effc 100644 --- a/cf/commands/featureflag/featureflag_suite_test.go +++ b/cf/commands/featureflag/featureflag_suite_test.go @@ -1,8 +1,8 @@ package featureflag_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/help.go b/cf/commands/help.go index 4415d7de93..0a6366786a 100644 --- a/cf/commands/help.go +++ b/cf/commands/help.go @@ -4,14 +4,14 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/help" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/help" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type Help struct { @@ -53,7 +53,7 @@ func (cmd *Help) Execute(c flags.FlagContext) error { if commandregistry.Commands.CommandExists(cmdName) { cmd.ui.Say(commandregistry.Commands.CommandUsage(cmdName)) } else { - //check plugin commands + // check plugin commands found := false for _, meta := range cmd.config.Plugins() { for _, c := range meta.Commands { @@ -72,7 +72,7 @@ func (cmd *Help) Execute(c flags.FlagContext) error { if len(c.UsageDetails.Options) > 0 { output += "\n" + T("OPTIONS:") + "\n" - //find longest name length + // find longest name length l := 0 for n := range c.UsageDetails.Options { if len(n) > l { diff --git a/cf/commands/help_test.go b/cf/commands/help_test.go index b9e838d3f4..17f84a5090 100644 --- a/cf/commands/help_test.go +++ b/cf/commands/help_test.go @@ -3,16 +3,16 @@ package commands_test import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/commandsloader" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/plugin" - - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/commandsloader" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/plugin" + + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/cf/commands/login.go b/cf/commands/login.go index 4dbea14d2e..1f2fd7a9aa 100644 --- a/cf/commands/login.go +++ b/cf/commands/login.go @@ -4,20 +4,20 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) const maxLoginTries = 3 diff --git a/cf/commands/login_test.go b/cf/commands/login_test.go index 09d81bcc94..04542d6d38 100644 --- a/cf/commands/login_test.go +++ b/cf/commands/login_test.go @@ -3,21 +3,21 @@ package commands_test import ( "strconv" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("Login Command", func() { diff --git a/cf/commands/logout.go b/cf/commands/logout.go index e74e6d58ae..2b2dc6373b 100644 --- a/cf/commands/logout.go +++ b/cf/commands/logout.go @@ -1,12 +1,12 @@ package commands import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Logout struct { diff --git a/cf/commands/logout_test.go b/cf/commands/logout_test.go index 1ac2947ed2..d45c21067f 100644 --- a/cf/commands/logout_test.go +++ b/cf/commands/logout_test.go @@ -1,12 +1,12 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - 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" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/oauth_token.go b/cf/commands/oauth_token.go index 3013e9d976..e2fc11de24 100644 --- a/cf/commands/oauth_token.go +++ b/cf/commands/oauth_token.go @@ -1,14 +1,14 @@ package commands import ( - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" ) type OAuthToken struct { diff --git a/cf/commands/oauth_token_test.go b/cf/commands/oauth_token_test.go index 4e74a28de3..9d21b5c141 100644 --- a/cf/commands/oauth_token_test.go +++ b/cf/commands/oauth_token_test.go @@ -3,20 +3,20 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/create_org.go b/cf/commands/organization/create_org.go index 598c20fc4d..e9c37c1b1d 100644 --- a/cf/commands/organization/create_org.go +++ b/cf/commands/organization/create_org.go @@ -3,19 +3,19 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateOrg struct { @@ -66,7 +66,7 @@ func (cmd *CreateOrg) SetDependency(deps commandregistry.Dependency, pluginCall cmd.quotaRepo = deps.RepoLocator.GetQuotaRepository() cmd.flagRepo = deps.RepoLocator.GetFeatureFlagRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("set-org-role") commandDep = commandDep.SetDependency(deps, false) cmd.orgRoleSetter = commandDep.(user.OrgRoleSetter) diff --git a/cf/commands/organization/create_org_test.go b/cf/commands/organization/create_org_test.go index d4f7857614..f912d2c2e2 100644 --- a/cf/commands/organization/create_org_test.go +++ b/cf/commands/organization/create_org_test.go @@ -1,22 +1,22 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/commands/user/userfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands/user/userfakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -41,7 +41,7 @@ var _ = Describe("create-org command", func() { deps.RepoLocator = deps.RepoLocator.SetFeatureFlagRepository(flagRepo) deps.Config = config - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(orgRoleSetter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("create-org").SetDependency(deps, pluginCall)) @@ -58,13 +58,13 @@ var _ = Describe("create-org command", func() { config.SetAPIVersion("2.36.9") orgRoleSetter = new(userfakes.FakeOrgRoleSetter) - //setup fakes to correctly interact with commandregistry + // setup fakes to correctly interact with commandregistry orgRoleSetter.SetDependencyStub = func(_ commandregistry.Dependency, _ bool) commandregistry.Command { return orgRoleSetter } orgRoleSetter.MetaDataReturns(commandregistry.CommandMetadata{Name: "set-org-role"}) - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("set-org-role") }) diff --git a/cf/commands/organization/delete_org.go b/cf/commands/organization/delete_org.go index de15697f96..6a2f1f3798 100644 --- a/cf/commands/organization/delete_org.go +++ b/cf/commands/organization/delete_org.go @@ -3,15 +3,15 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteOrg struct { diff --git a/cf/commands/organization/delete_org_test.go b/cf/commands/organization/delete_org_test.go index f0fea1a9d6..beaf416fca 100644 --- a/cf/commands/organization/delete_org_test.go +++ b/cf/commands/organization/delete_org_test.go @@ -1,19 +1,19 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/org.go b/cf/commands/organization/org.go index c8d2034267..08365f833a 100644 --- a/cf/commands/organization/org.go +++ b/cf/commands/organization/org.go @@ -5,16 +5,16 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" ) type ShowOrg struct { diff --git a/cf/commands/organization/org_test.go b/cf/commands/organization/org_test.go index f310f83184..0237c1bb5c 100644 --- a/cf/commands/organization/org_test.go +++ b/cf/commands/organization/org_test.go @@ -1,18 +1,18 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commands/organization" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commands/organization" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 6f809a00db..23cc24193f 100644 --- a/cf/commands/organization/organization_suite_test.go +++ b/cf/commands/organization/organization_suite_test.go @@ -1,8 +1,8 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/organization/orgs.go b/cf/commands/organization/orgs.go index 6168ccfc97..86e5ce8dc8 100644 --- a/cf/commands/organization/orgs.go +++ b/cf/commands/organization/orgs.go @@ -3,15 +3,15 @@ package organization import ( "errors" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" ) const orgLimit = 0 diff --git a/cf/commands/organization/orgs_test.go b/cf/commands/organization/orgs_test.go index ae0d7822ba..bbe42e981a 100644 --- a/cf/commands/organization/orgs_test.go +++ b/cf/commands/organization/orgs_test.go @@ -3,23 +3,23 @@ package organization_test import ( "os" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commands/organization" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands/organization" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("orgs command", func() { diff --git a/cf/commands/organization/rename_org.go b/cf/commands/organization/rename_org.go index cbbf929bd2..5ae28e0042 100644 --- a/cf/commands/organization/rename_org.go +++ b/cf/commands/organization/rename_org.go @@ -3,13 +3,13 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RenameOrg struct { diff --git a/cf/commands/organization/rename_org_test.go b/cf/commands/organization/rename_org_test.go index 8d9fe048cd..ae507c61de 100644 --- a/cf/commands/organization/rename_org_test.go +++ b/cf/commands/organization/rename_org_test.go @@ -1,19 +1,19 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("rename-org command", func() { diff --git a/cf/commands/organization/set_quota.go b/cf/commands/organization/set_quota.go index b743579a57..6eb0b766e5 100644 --- a/cf/commands/organization/set_quota.go +++ b/cf/commands/organization/set_quota.go @@ -3,13 +3,13 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SetQuota struct { diff --git a/cf/commands/organization/set_quota_test.go b/cf/commands/organization/set_quota_test.go index 166bc33525..56271a5a49 100644 --- a/cf/commands/organization/set_quota_test.go +++ b/cf/commands/organization/set_quota_test.go @@ -1,17 +1,17 @@ package organization_test import ( - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/share_private_domain.go b/cf/commands/organization/share_private_domain.go index 0e254c8efe..99b19e6acc 100644 --- a/cf/commands/organization/share_private_domain.go +++ b/cf/commands/organization/share_private_domain.go @@ -3,14 +3,14 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SharePrivateDomain struct { diff --git a/cf/commands/organization/unshare_private_domain.go b/cf/commands/organization/unshare_private_domain.go index 0f60dd0739..2ab0eb147e 100644 --- a/cf/commands/organization/unshare_private_domain.go +++ b/cf/commands/organization/unshare_private_domain.go @@ -3,14 +3,14 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UnsharePrivateDomain struct { diff --git a/cf/commands/passwd.go b/cf/commands/passwd.go index 51c9b1fa80..fcfb2ed224 100644 --- a/cf/commands/passwd.go +++ b/cf/commands/passwd.go @@ -1,14 +1,14 @@ package commands import ( - "code.cloudfoundry.org/cli/cf/api/password" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/password" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Password struct { diff --git a/cf/commands/passwd_test.go b/cf/commands/passwd_test.go index 2a7b9a2502..911b662958 100644 --- a/cf/commands/passwd_test.go +++ b/cf/commands/passwd_test.go @@ -1,19 +1,19 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("password command", func() { diff --git a/cf/commands/plugin/install_plugin.go b/cf/commands/plugin/install_plugin.go index ac9c21d567..e8ee1844c0 100644 --- a/cf/commands/plugin/install_plugin.go +++ b/cf/commands/plugin/install_plugin.go @@ -8,21 +8,21 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/cf/actors/plugininstaller" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/downloader" - "code.cloudfoundry.org/cli/plugin" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/cf/actors/plugininstaller" + "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/downloader" + "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v8/util" "code.cloudfoundry.org/gofileutils/fileutils" - pluginRPCService "code.cloudfoundry.org/cli/plugin/rpc" + pluginRPCService "code.cloudfoundry.org/cli/v8/plugin/rpc" ) type PluginInstall struct { @@ -78,8 +78,8 @@ func (cmd *PluginInstall) SetDependency(deps commandregistry.Dependency, pluginC cmd.pluginRepo = deps.PluginRepo cmd.checksum = deps.ChecksumUtil - //reset rpc registration in case there is other running instance, - //each service can only be registered once + // reset rpc registration in case there is other running instance, + // each service can only be registered once server := rpc.NewServer() rpcService, err := pluginRPCService.NewRpcService(deps.TeePrinter, deps.TeePrinter, deps.Config, deps.RepoLocator, pluginRPCService.NewCommandRunner(), deps.Logger, cmd.ui.Writer(), server) @@ -220,7 +220,7 @@ func (cmd *PluginInstall) ensurePluginIsSafeForInstallation(pluginMetadata *plug } for _, pluginCmd := range pluginMetadata.Commands { - //check for command conflicting core commands/alias + // check for command conflicting core commands/alias if pluginCmd.Name == "help" || commandregistry.Commands.CommandExists(pluginCmd.Name) { return errors.New(T( "Command `{{.Command}}` in the plugin being installed is a native CF command/alias. Rename the `{{.Command}}` command in the plugin being installed in order to enable its installation and use.", @@ -230,7 +230,7 @@ func (cmd *PluginInstall) ensurePluginIsSafeForInstallation(pluginMetadata *plug ) } - //check for alias conflicting core command/alias + // check for alias conflicting core command/alias if pluginCmd.Alias == "help" || commandregistry.Commands.CommandExists(pluginCmd.Alias) { return errors.New(T( "Alias `{{.Command}}` in the plugin being installed is a native CF command/alias. Rename the `{{.Command}}` command in the plugin being installed in order to enable its installation and use.", @@ -243,7 +243,7 @@ func (cmd *PluginInstall) ensurePluginIsSafeForInstallation(pluginMetadata *plug for installedPluginName, installedPlugin := range plugins { for _, installedPluginCmd := range installedPlugin.Commands { - //check for command conflicting other plugin commands/alias + // check for command conflicting other plugin commands/alias if installedPluginCmd.Name == pluginCmd.Name || installedPluginCmd.Alias == pluginCmd.Name { return errors.New(T( "Command `{{.Command}}` is a command/alias in plugin '{{.PluginName}}'. You could try uninstalling plugin '{{.PluginName}}' and then install this plugin in order to invoke the `{{.Command}}` command. However, you should first fully understand the impact of uninstalling the existing '{{.PluginName}}' plugin.", @@ -254,7 +254,7 @@ func (cmd *PluginInstall) ensurePluginIsSafeForInstallation(pluginMetadata *plug ) } - //check for alias conflicting other plugin commands/alias + // check for alias conflicting other plugin commands/alias if pluginCmd.Alias != "" && (installedPluginCmd.Name == pluginCmd.Alias || installedPluginCmd.Alias == pluginCmd.Alias) { return errors.New(T( "Alias `{{.Command}}` is a command/alias in plugin '{{.PluginName}}'. You could try uninstalling plugin '{{.PluginName}}' and then install this plugin in order to invoke the `{{.Command}}` command. However, you should first fully understand the impact of uninstalling the existing '{{.PluginName}}' plugin.", diff --git a/cf/commands/plugin/install_plugin_test.go b/cf/commands/plugin/install_plugin_test.go index ca8df3139e..f9d22d80dc 100644 --- a/cf/commands/plugin/install_plugin_test.go +++ b/cf/commands/plugin/install_plugin_test.go @@ -10,25 +10,25 @@ import ( "runtime" "sync" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo/pluginrepofakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commandregistry/commandregistryfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - "code.cloudfoundry.org/cli/cf/util/utilfakes" - "code.cloudfoundry.org/cli/plugin" - - clipr "code.cloudfoundry.org/cli-plugin-repo/web" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo/pluginrepofakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commandregistry/commandregistryfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/utilfakes" + "code.cloudfoundry.org/cli/v8/plugin" + + clipr "code.cloudfoundry.org/cli/v8-plugin-repo/web" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 c970694347..54a1a3931d 100644 --- a/cf/commands/plugin/plugin_suite_test.go +++ b/cf/commands/plugin/plugin_suite_test.go @@ -3,10 +3,10 @@ package plugin_test import ( "path/filepath" - "code.cloudfoundry.org/cli/cf/commands/plugin" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v8/cf/commands/plugin" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/plugin/plugins.go b/cf/commands/plugin/plugins.go index 844b1ff576..ad5cd0ad18 100644 --- a/cf/commands/plugin/plugins.go +++ b/cf/commands/plugin/plugins.go @@ -4,14 +4,14 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v8/util/sorting" ) type Plugins struct { diff --git a/cf/commands/plugin/plugins_test.go b/cf/commands/plugin/plugins_test.go index 3f9caea8fd..5425c22c2b 100644 --- a/cf/commands/plugin/plugins_test.go +++ b/cf/commands/plugin/plugins_test.go @@ -3,16 +3,16 @@ package plugin_test import ( "net/rpc" - "code.cloudfoundry.org/cli/cf/commandregistry" - plugincmd "code.cloudfoundry.org/cli/cf/commands/plugin" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + plugincmd "code.cloudfoundry.org/cli/v8/cf/commands/plugin" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/plugin/uninstall_plugin.go b/cf/commands/plugin/uninstall_plugin.go index 5d7574d743..92ce488e04 100644 --- a/cf/commands/plugin/uninstall_plugin.go +++ b/cf/commands/plugin/uninstall_plugin.go @@ -8,13 +8,13 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - rpcService "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + rpcService "code.cloudfoundry.org/cli/v8/plugin/rpc" ) type PluginUninstall struct { @@ -51,8 +51,8 @@ func (cmd *PluginUninstall) SetDependency(deps commandregistry.Dependency, plugi cmd.ui = deps.UI cmd.config = deps.PluginConfig - //reset rpc registration in case there is other running instance, - //each service can only be registered once + // reset rpc registration in case there is other running instance, + // each service can only be registered once server := rpc.NewServer() RPCService, err := rpcService.NewRpcService(deps.TeePrinter, deps.TeePrinter, deps.Config, deps.RepoLocator, rpcService.NewCommandRunner(), deps.Logger, cmd.ui.Writer(), server) @@ -87,7 +87,7 @@ func (cmd *PluginUninstall) Execute(c flags.FlagContext) error { cmd.ui.Say("Error invoking plugin: " + warn.Error() + ". Process to uninstall ...") } - time.Sleep(500 * time.Millisecond) //prevent 'process being used' error in Windows + time.Sleep(500 * time.Millisecond) // prevent 'process being used' error in Windows err = os.Remove(pluginMetadata.Location) if err != nil { diff --git a/cf/commands/plugin/uninstall_plugin_test.go b/cf/commands/plugin/uninstall_plugin_test.go index eccf500ad6..df350e51ee 100644 --- a/cf/commands/plugin/uninstall_plugin_test.go +++ b/cf/commands/plugin/uninstall_plugin_test.go @@ -5,17 +5,17 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" "code.cloudfoundry.org/gofileutils/fileutils" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/pluginrepo/add_plugin_repo.go b/cf/commands/pluginrepo/add_plugin_repo.go index b91f44bb42..d5f699f1d8 100644 --- a/cf/commands/pluginrepo/add_plugin_repo.go +++ b/cf/commands/pluginrepo/add_plugin_repo.go @@ -10,16 +10,16 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type AddPluginRepo struct { diff --git a/cf/commands/pluginrepo/add_plugin_repo_test.go b/cf/commands/pluginrepo/add_plugin_repo_test.go index 4c1189e7c7..0577cce61b 100644 --- a/cf/commands/pluginrepo/add_plugin_repo_test.go +++ b/cf/commands/pluginrepo/add_plugin_repo_test.go @@ -5,15 +5,15 @@ import ( "net/http" "net/http/httptest" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/list_plugin_repos.go b/cf/commands/pluginrepo/list_plugin_repos.go index d7a1b0a629..179a2c0a11 100644 --- a/cf/commands/pluginrepo/list_plugin_repos.go +++ b/cf/commands/pluginrepo/list_plugin_repos.go @@ -1,13 +1,13 @@ package pluginrepo import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type ListPluginRepos struct { diff --git a/cf/commands/pluginrepo/list_plugin_repos_test.go b/cf/commands/pluginrepo/list_plugin_repos_test.go index 246ddfb412..34573931ff 100644 --- a/cf/commands/pluginrepo/list_plugin_repos_test.go +++ b/cf/commands/pluginrepo/list_plugin_repos_test.go @@ -1,16 +1,16 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - 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" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 eb1596a24e..c1ebd911a8 100644 --- a/cf/commands/pluginrepo/plugin_repo_suite_test.go +++ b/cf/commands/pluginrepo/plugin_repo_suite_test.go @@ -1,9 +1,9 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/remove_plugin_repo.go b/cf/commands/pluginrepo/remove_plugin_repo.go index 6d4aa411e0..7a6b544f78 100644 --- a/cf/commands/pluginrepo/remove_plugin_repo.go +++ b/cf/commands/pluginrepo/remove_plugin_repo.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type RemovePluginRepo struct { diff --git a/cf/commands/pluginrepo/remove_plugin_repo_test.go b/cf/commands/pluginrepo/remove_plugin_repo_test.go index 679f75bdca..ef2e41b129 100644 --- a/cf/commands/pluginrepo/remove_plugin_repo_test.go +++ b/cf/commands/pluginrepo/remove_plugin_repo_test.go @@ -1,15 +1,15 @@ package pluginrepo_test 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" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/repo_plugins.go b/cf/commands/pluginrepo/repo_plugins.go index dd0af956b9..a2966c1b6e 100644 --- a/cf/commands/pluginrepo/repo_plugins.go +++ b/cf/commands/pluginrepo/repo_plugins.go @@ -4,17 +4,17 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type RepoPlugins struct { diff --git a/cf/commands/pluginrepo/repo_plugins_test.go b/cf/commands/pluginrepo/repo_plugins_test.go index d1cc91420a..f9a41651d2 100644 --- a/cf/commands/pluginrepo/repo_plugins_test.go +++ b/cf/commands/pluginrepo/repo_plugins_test.go @@ -1,20 +1,20 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/cf/actors/pluginrepo/pluginrepofakes" - "code.cloudfoundry.org/cli/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo/pluginrepofakes" + "code.cloudfoundry.org/cli/v8/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - clipr "code.cloudfoundry.org/cli-plugin-repo/web" + clipr "code.cloudfoundry.org/cli/v8-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/create_quota.go b/cf/commands/quota/create_quota.go index bfcce94986..d5733ec927 100644 --- a/cf/commands/quota/create_quota.go +++ b/cf/commands/quota/create_quota.go @@ -5,17 +5,17 @@ import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateQuota struct { diff --git a/cf/commands/quota/create_quota_test.go b/cf/commands/quota/create_quota_test.go index 4baad81905..824d58760a 100644 --- a/cf/commands/quota/create_quota_test.go +++ b/cf/commands/quota/create_quota_test.go @@ -1,24 +1,24 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "encoding/json" - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commands/quota" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/commands/quota" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" ) var _ = Describe("create-quota command", func() { diff --git a/cf/commands/quota/delete_quota.go b/cf/commands/quota/delete_quota.go index d8e08d7fbb..cd77cbbf25 100644 --- a/cf/commands/quota/delete_quota.go +++ b/cf/commands/quota/delete_quota.go @@ -3,14 +3,14 @@ package quota import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteQuota struct { diff --git a/cf/commands/quota/delete_quota_test.go b/cf/commands/quota/delete_quota_test.go index 936521414b..3ba0f048eb 100644 --- a/cf/commands/quota/delete_quota_test.go +++ b/cf/commands/quota/delete_quota_test.go @@ -1,18 +1,18 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/quota.go b/cf/commands/quota/quota.go index d1e91e8b5d..e8ff2ee310 100644 --- a/cf/commands/quota/quota.go +++ b/cf/commands/quota/quota.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type showQuota struct { diff --git a/cf/commands/quota/quota_suite_test.go b/cf/commands/quota/quota_suite_test.go index 87b6847303..3a9948a836 100644 --- a/cf/commands/quota/quota_suite_test.go +++ b/cf/commands/quota/quota_suite_test.go @@ -1,8 +1,8 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/quota/quota_test.go b/cf/commands/quota/quota_test.go index bc1a7ff6c1..dcdba474fd 100644 --- a/cf/commands/quota/quota_test.go +++ b/cf/commands/quota/quota_test.go @@ -4,18 +4,18 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("quota", func() { diff --git a/cf/commands/quota/quotas.go b/cf/commands/quota/quotas.go index ef9396576a..bee2a80087 100644 --- a/cf/commands/quota/quotas.go +++ b/cf/commands/quota/quotas.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListQuotas struct { diff --git a/cf/commands/quota/quotas_test.go b/cf/commands/quota/quotas_test.go index 2d74520bac..9adec4fd71 100644 --- a/cf/commands/quota/quotas_test.go +++ b/cf/commands/quota/quotas_test.go @@ -1,21 +1,21 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/commands/quota" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/terminal" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v8/cf/commands/quota" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/terminal" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/update_quota.go b/cf/commands/quota/update_quota.go index ead549e379..4a159215d7 100644 --- a/cf/commands/quota/update_quota.go +++ b/cf/commands/quota/update_quota.go @@ -6,14 +6,14 @@ import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/api/quotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/quotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UpdateQuota struct { diff --git a/cf/commands/quota/update_quota_test.go b/cf/commands/quota/update_quota_test.go index d149aa4e64..df369d573a 100644 --- a/cf/commands/quota/update_quota_test.go +++ b/cf/commands/quota/update_quota_test.go @@ -1,23 +1,23 @@ package quota_test import ( - "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - cmdsQuota "code.cloudfoundry.org/cli/cf/commands/quota" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + cmdsQuota "code.cloudfoundry.org/cli/v8/cf/commands/quota" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" "encoding/json" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/check_route.go b/cf/commands/route/check_route.go index 846d09ceeb..4788ab890b 100644 --- a/cf/commands/route/check_route.go +++ b/cf/commands/route/check_route.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CheckRoute struct { diff --git a/cf/commands/route/check_route_test.go b/cf/commands/route/check_route_test.go index 960c7b7aff..89f49677e9 100644 --- a/cf/commands/route/check_route_test.go +++ b/cf/commands/route/check_route_test.go @@ -3,20 +3,20 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/create_route.go b/cf/commands/route/create_route.go index d9c0cd3c70..87a73ff09a 100644 --- a/cf/commands/route/create_route.go +++ b/cf/commands/route/create_route.go @@ -3,14 +3,14 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Creator diff --git a/cf/commands/route/create_route_test.go b/cf/commands/route/create_route_test.go index e68a88bdc5..e5ea63c64d 100644 --- a/cf/commands/route/create_route_test.go +++ b/cf/commands/route/create_route_test.go @@ -3,19 +3,19 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/route/delete_orphaned_routes.go b/cf/commands/route/delete_orphaned_routes.go index 7eb1ec04a2..ee12115034 100644 --- a/cf/commands/route/delete_orphaned_routes.go +++ b/cf/commands/route/delete_orphaned_routes.go @@ -3,14 +3,14 @@ package route import ( "errors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteOrphanedRoutes struct { diff --git a/cf/commands/route/delete_orphaned_routes_test.go b/cf/commands/route/delete_orphaned_routes_test.go index dcc43843bb..c887547eb8 100644 --- a/cf/commands/route/delete_orphaned_routes_test.go +++ b/cf/commands/route/delete_orphaned_routes_test.go @@ -1,19 +1,19 @@ package route_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/delete_route.go b/cf/commands/route/delete_route.go index 99eee02add..07f9cec6f6 100644 --- a/cf/commands/route/delete_route.go +++ b/cf/commands/route/delete_route.go @@ -3,15 +3,15 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteRoute struct { diff --git a/cf/commands/route/delete_route_test.go b/cf/commands/route/delete_route_test.go index 44be4ba9ea..455c359797 100644 --- a/cf/commands/route/delete_route_test.go +++ b/cf/commands/route/delete_route_test.go @@ -3,21 +3,21 @@ package route_test import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/map_route.go b/cf/commands/route/map_route.go index 4c0c1f2a43..f8a21354b5 100644 --- a/cf/commands/route/map_route.go +++ b/cf/commands/route/map_route.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type MapRoute struct { @@ -100,7 +100,7 @@ func (cmd *MapRoute) SetDependency(deps commandregistry.Dependency, pluginCall b cmd.config = deps.Config cmd.routeRepo = deps.RepoLocator.GetRouteRepository() - //get create-route for dependency + // get create-route for dependency createRoute := commandregistry.Commands.FindCommand("create-route") createRoute = createRoute.SetDependency(deps, false) cmd.routeCreator = createRoute.(Creator) diff --git a/cf/commands/route/map_route_test.go b/cf/commands/route/map_route_test.go index ed11581b32..573d8e505e 100644 --- a/cf/commands/route/map_route_test.go +++ b/cf/commands/route/map_route_test.go @@ -3,23 +3,23 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/commands/route/routefakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/commands/route/routefakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 c08170a366..1afd5fa0a3 100644 --- a/cf/commands/route/route_suite_test.go +++ b/cf/commands/route/route_suite_test.go @@ -1,8 +1,8 @@ package route_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/route/routefakes/fake_creator.go b/cf/commands/route/routefakes/fake_creator.go index b0118b6c41..9996eef3b3 100644 --- a/cf/commands/route/routefakes/fake_creator.go +++ b/cf/commands/route/routefakes/fake_creator.go @@ -4,8 +4,8 @@ package routefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeCreator struct { diff --git a/cf/commands/route/routefakes/old_fake_route_creator.go b/cf/commands/route/routefakes/old_fake_route_creator.go index c95e3c09e2..fcadde7ba0 100644 --- a/cf/commands/route/routefakes/old_fake_route_creator.go +++ b/cf/commands/route/routefakes/old_fake_route_creator.go @@ -3,11 +3,11 @@ package routefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type OldFakeRouteCreator struct { diff --git a/cf/commands/route/routes.go b/cf/commands/route/routes.go index 1c2c1ed139..dcd5513171 100644 --- a/cf/commands/route/routes.go +++ b/cf/commands/route/routes.go @@ -5,15 +5,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListRoutes struct { diff --git a/cf/commands/route/routes_test.go b/cf/commands/route/routes_test.go index bf61c97991..57f1195fc2 100644 --- a/cf/commands/route/routes_test.go +++ b/cf/commands/route/routes_test.go @@ -3,22 +3,22 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/terminal" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/terminal" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commands/route" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("routes command", func() { diff --git a/cf/commands/route/unmap_route.go b/cf/commands/route/unmap_route.go index a49f850d7e..355d9ddf57 100644 --- a/cf/commands/route/unmap_route.go +++ b/cf/commands/route/unmap_route.go @@ -3,13 +3,13 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UnmapRoute struct { diff --git a/cf/commands/route/unmap_route_test.go b/cf/commands/route/unmap_route_test.go index 1784e8ee0c..9c3d11582b 100644 --- a/cf/commands/route/unmap_route_test.go +++ b/cf/commands/route/unmap_route_test.go @@ -3,22 +3,22 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/routergroups/router_groups.go b/cf/commands/routergroups/router_groups.go index 71f8fc8f62..a3f3a39827 100644 --- a/cf/commands/routergroups/router_groups.go +++ b/cf/commands/routergroups/router_groups.go @@ -3,14 +3,14 @@ package routergroups import ( "errors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RouterGroups struct { diff --git a/cf/commands/routergroups/router_groups_test.go b/cf/commands/routergroups/router_groups_test.go index 4377182cd0..bf1d7f5f25 100644 --- a/cf/commands/routergroups/router_groups_test.go +++ b/cf/commands/routergroups/router_groups_test.go @@ -3,18 +3,18 @@ package routergroups_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commands/routergroups" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commands/routergroups" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 2c07f499db..6b3262689c 100644 --- a/cf/commands/routergroups/routergroups_suite_test.go +++ b/cf/commands/routergroups/routergroups_suite_test.go @@ -1,8 +1,8 @@ package routergroups_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/securitygroup/bind_running_security_group.go b/cf/commands/securitygroup/bind_running_security_group.go index c2258fd452..8d337fef36 100644 --- a/cf/commands/securitygroup/bind_running_security_group.go +++ b/cf/commands/securitygroup/bind_running_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type bindToRunningGroup struct { diff --git a/cf/commands/securitygroup/bind_running_security_group_test.go b/cf/commands/securitygroup/bind_running_security_group_test.go index 79a2fcedb0..0a7605c6b0 100644 --- a/cf/commands/securitygroup/bind_running_security_group_test.go +++ b/cf/commands/securitygroup/bind_running_security_group_test.go @@ -3,18 +3,18 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running/runningfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running/runningfakes" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/bind_security_group.go b/cf/commands/securitygroup/bind_security_group.go index 0f6d97f996..d62bdfc619 100644 --- a/cf/commands/securitygroup/bind_security_group.go +++ b/cf/commands/securitygroup/bind_security_group.go @@ -3,17 +3,17 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - sgbinder "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + sgbinder "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type BindSecurityGroup struct { diff --git a/cf/commands/securitygroup/bind_security_group_test.go b/cf/commands/securitygroup/bind_security_group_test.go index d7b26669a3..1c4bf383d9 100644 --- a/cf/commands/securitygroup/bind_security_group_test.go +++ b/cf/commands/securitygroup/bind_security_group_test.go @@ -1,21 +1,21 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces/spacesfakes" - spacesapifakes "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces/spacesfakes" + spacesapifakes "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/bind_staging_security_group.go b/cf/commands/securitygroup/bind_staging_security_group.go index cb9daaa463..dc14cec886 100644 --- a/cf/commands/securitygroup/bind_staging_security_group.go +++ b/cf/commands/securitygroup/bind_staging_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type bindToStagingGroup struct { diff --git a/cf/commands/securitygroup/bind_staging_security_group_test.go b/cf/commands/securitygroup/bind_staging_security_group_test.go index 9b38fa6f7e..011ac8caf5 100644 --- a/cf/commands/securitygroup/bind_staging_security_group_test.go +++ b/cf/commands/securitygroup/bind_staging_security_group_test.go @@ -3,18 +3,18 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging/stagingfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging/stagingfakes" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/create_security_group.go b/cf/commands/securitygroup/create_security_group.go index 03b0cb7265..315b8c9400 100644 --- a/cf/commands/securitygroup/create_security_group.go +++ b/cf/commands/securitygroup/create_security_group.go @@ -3,16 +3,16 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/json" ) type CreateSecurityGroup struct { diff --git a/cf/commands/securitygroup/create_security_group_test.go b/cf/commands/securitygroup/create_security_group_test.go index a3b07f3578..2b6cb84c59 100644 --- a/cf/commands/securitygroup/create_security_group_test.go +++ b/cf/commands/securitygroup/create_security_group_test.go @@ -4,17 +4,17 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/delete_security_group.go b/cf/commands/securitygroup/delete_security_group.go index 5b650d2cd0..d912c58eab 100644 --- a/cf/commands/securitygroup/delete_security_group.go +++ b/cf/commands/securitygroup/delete_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteSecurityGroup struct { diff --git a/cf/commands/securitygroup/delete_security_group_test.go b/cf/commands/securitygroup/delete_security_group_test.go index bba0e5a592..d5acac43aa 100644 --- a/cf/commands/securitygroup/delete_security_group_test.go +++ b/cf/commands/securitygroup/delete_security_group_test.go @@ -1,18 +1,18 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/running_security_groups.go b/cf/commands/securitygroup/running_security_groups.go index ea1d979668..fc1b4af4a2 100644 --- a/cf/commands/securitygroup/running_security_groups.go +++ b/cf/commands/securitygroup/running_security_groups.go @@ -1,13 +1,13 @@ package securitygroup import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type listRunningSecurityGroups struct { diff --git a/cf/commands/securitygroup/running_security_groups_test.go b/cf/commands/securitygroup/running_security_groups_test.go index 519c5281f0..d1d3017948 100644 --- a/cf/commands/securitygroup/running_security_groups_test.go +++ b/cf/commands/securitygroup/running_security_groups_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running/runningfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running/runningfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/security_group.go b/cf/commands/securitygroup/security_group.go index 8027bbceec..fa5cfb79b0 100644 --- a/cf/commands/securitygroup/security_group.go +++ b/cf/commands/securitygroup/security_group.go @@ -4,14 +4,14 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ShowSecurityGroup struct { diff --git a/cf/commands/securitygroup/security_group_test.go b/cf/commands/securitygroup/security_group_test.go index dfdb9034a0..690e2277a9 100644 --- a/cf/commands/securitygroup/security_group_test.go +++ b/cf/commands/securitygroup/security_group_test.go @@ -1,18 +1,18 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/security_groups.go b/cf/commands/securitygroup/security_groups.go index e72e63370f..3e9515fdec 100644 --- a/cf/commands/securitygroup/security_groups.go +++ b/cf/commands/securitygroup/security_groups.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SecurityGroups struct { diff --git a/cf/commands/securitygroup/security_groups_test.go b/cf/commands/securitygroup/security_groups_test.go index a7ee40ee96..8c288505be 100644 --- a/cf/commands/securitygroup/security_groups_test.go +++ b/cf/commands/securitygroup/security_groups_test.go @@ -1,20 +1,20 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commands/securitygroup" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commands/securitygroup" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/staging_security_groups.go b/cf/commands/securitygroup/staging_security_groups.go index bdf730f1c0..be4c6e7eab 100644 --- a/cf/commands/securitygroup/staging_security_groups.go +++ b/cf/commands/securitygroup/staging_security_groups.go @@ -1,13 +1,13 @@ package securitygroup import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type listStagingSecurityGroups struct { diff --git a/cf/commands/securitygroup/staging_security_groups_test.go b/cf/commands/securitygroup/staging_security_groups_test.go index 65dc53ad1e..23feb1a0fb 100644 --- a/cf/commands/securitygroup/staging_security_groups_test.go +++ b/cf/commands/securitygroup/staging_security_groups_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging/stagingfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging/stagingfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 e0607c6b75..92a8043bbc 100644 --- a/cf/commands/securitygroup/suite_test.go +++ b/cf/commands/securitygroup/suite_test.go @@ -1,8 +1,8 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/securitygroup/unbind_running_security_group.go b/cf/commands/securitygroup/unbind_running_security_group.go index 2e4bbc4192..25c6080175 100644 --- a/cf/commands/securitygroup/unbind_running_security_group.go +++ b/cf/commands/securitygroup/unbind_running_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type unbindFromRunningGroup struct { diff --git a/cf/commands/securitygroup/unbind_running_security_group_test.go b/cf/commands/securitygroup/unbind_running_security_group_test.go index 18a5860cce..a88725e1ee 100644 --- a/cf/commands/securitygroup/unbind_running_security_group_test.go +++ b/cf/commands/securitygroup/unbind_running_security_group_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running/runningfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running/runningfakes" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/unbind_security_group.go b/cf/commands/securitygroup/unbind_security_group.go index ca1159d28c..d56a34bf69 100644 --- a/cf/commands/securitygroup/unbind_security_group.go +++ b/cf/commands/securitygroup/unbind_security_group.go @@ -3,16 +3,16 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - sgbinder "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + sgbinder "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UnbindSecurityGroup struct { diff --git a/cf/commands/securitygroup/unbind_security_group_test.go b/cf/commands/securitygroup/unbind_security_group_test.go index 14eafedec9..e9db0e205c 100644 --- a/cf/commands/securitygroup/unbind_security_group_test.go +++ b/cf/commands/securitygroup/unbind_security_group_test.go @@ -3,20 +3,20 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces/spacesfakes" - spacesapifakes "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces/spacesfakes" + spacesapifakes "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/unbind_staging_security_group.go b/cf/commands/securitygroup/unbind_staging_security_group.go index c47897625e..a81ed3f353 100644 --- a/cf/commands/securitygroup/unbind_staging_security_group.go +++ b/cf/commands/securitygroup/unbind_staging_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type unbindFromStagingGroup struct { diff --git a/cf/commands/securitygroup/unbind_staging_security_group_test.go b/cf/commands/securitygroup/unbind_staging_security_group_test.go index df832815cc..1d4f942bce 100644 --- a/cf/commands/securitygroup/unbind_staging_security_group_test.go +++ b/cf/commands/securitygroup/unbind_staging_security_group_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/staging/stagingfakes" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging/stagingfakes" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/update_security_group.go b/cf/commands/securitygroup/update_security_group.go index d249bded6c..c43e0d9821 100644 --- a/cf/commands/securitygroup/update_security_group.go +++ b/cf/commands/securitygroup/update_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/cf/api/securitygroups" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/json" ) type UpdateSecurityGroup struct { diff --git a/cf/commands/securitygroup/update_security_group_test.go b/cf/commands/securitygroup/update_security_group_test.go index 477092709e..cfbd9da6f1 100644 --- a/cf/commands/securitygroup/update_security_group_test.go +++ b/cf/commands/securitygroup/update_security_group_test.go @@ -4,18 +4,18 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/bind_route_service.go b/cf/commands/service/bind_route_service.go index 6cf791376c..4818f339c3 100644 --- a/cf/commands/service/bind_route_service.go +++ b/cf/commands/service/bind_route_service.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flagcontext" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flagcontext" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type BindRouteService struct { diff --git a/cf/commands/service/bind_route_service_test.go b/cf/commands/service/bind_route_service_test.go index fcdd8264d6..631b01513d 100644 --- a/cf/commands/service/bind_route_service_test.go +++ b/cf/commands/service/bind_route_service_test.go @@ -5,20 +5,20 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/bind_service.go b/cf/commands/service/bind_service.go index 7acdb3c875..aec4cd7c4a 100644 --- a/cf/commands/service/bind_service.go +++ b/cf/commands/service/bind_service.go @@ -3,17 +3,17 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/json" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Binder diff --git a/cf/commands/service/bind_service_test.go b/cf/commands/service/bind_service_test.go index f87e080aae..c0c2065c99 100644 --- a/cf/commands/service/bind_service_test.go +++ b/cf/commands/service/bind_service_test.go @@ -5,20 +5,20 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("bind-service command", func() { diff --git a/cf/commands/service/create_service.go b/cf/commands/service/create_service.go index 62b75952d3..e1a7510d70 100644 --- a/cf/commands/service/create_service.go +++ b/cf/commands/service/create_service.go @@ -3,18 +3,18 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/uihelpers" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/uihelpers" + "code.cloudfoundry.org/cli/v8/cf/util/json" ) type CreateService struct { diff --git a/cf/commands/service/create_service_test.go b/cf/commands/service/create_service_test.go index c794355e53..59cb61572d 100644 --- a/cf/commands/service/create_service_test.go +++ b/cf/commands/service/create_service_test.go @@ -5,24 +5,24 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("create-service command", func() { diff --git a/cf/commands/service/create_user_provided_service.go b/cf/commands/service/create_user_provided_service.go index c56846f61b..bf3ec4a7a0 100644 --- a/cf/commands/service/create_user_provided_service.go +++ b/cf/commands/service/create_user_provided_service.go @@ -4,19 +4,19 @@ import ( "encoding/json" "strings" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/flagcontext" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/uihelpers" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/flagcontext" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/uihelpers" "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateUserProvidedService struct { diff --git a/cf/commands/service/create_user_provided_service_test.go b/cf/commands/service/create_user_provided_service_test.go index 6db247a792..e37564419f 100644 --- a/cf/commands/service/create_user_provided_service_test.go +++ b/cf/commands/service/create_user_provided_service_test.go @@ -5,19 +5,19 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/delete_service.go b/cf/commands/service/delete_service.go index c069134ade..a4356e6da1 100644 --- a/cf/commands/service/delete_service.go +++ b/cf/commands/service/delete_service.go @@ -3,14 +3,14 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteService struct { diff --git a/cf/commands/service/delete_service_test.go b/cf/commands/service/delete_service_test.go index 40717f1196..f757112c49 100644 --- a/cf/commands/service/delete_service_test.go +++ b/cf/commands/service/delete_service_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("delete-service command", func() { diff --git a/cf/commands/service/marketplace.go b/cf/commands/service/marketplace.go index 83df62512e..3d563c0ab4 100644 --- a/cf/commands/service/marketplace.go +++ b/cf/commands/service/marketplace.go @@ -6,15 +6,15 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type MarketplaceServices struct { diff --git a/cf/commands/service/marketplace_test.go b/cf/commands/service/marketplace_test.go index 06d236443a..42f7f85a94 100644 --- a/cf/commands/service/marketplace_test.go +++ b/cf/commands/service/marketplace_test.go @@ -1,21 +1,21 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commands/service" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("marketplace command", func() { diff --git a/cf/commands/service/migrate_service_instances.go b/cf/commands/service/migrate_service_instances.go index 6424d85884..9b626954f9 100644 --- a/cf/commands/service/migrate_service_instances.go +++ b/cf/commands/service/migrate_service_instances.go @@ -3,17 +3,17 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type MigrateServiceInstances struct { diff --git a/cf/commands/service/migrate_service_instances_test.go b/cf/commands/service/migrate_service_instances_test.go index 6cb83874d7..050a14849a 100644 --- a/cf/commands/service/migrate_service_instances_test.go +++ b/cf/commands/service/migrate_service_instances_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("migrating service instances from v1 to v2", func() { diff --git a/cf/commands/service/purge_service_instance.go b/cf/commands/service/purge_service_instance.go index 3a29865c96..56a90e4869 100644 --- a/cf/commands/service/purge_service_instance.go +++ b/cf/commands/service/purge_service_instance.go @@ -3,13 +3,13 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type PurgeServiceInstance struct { diff --git a/cf/commands/service/purge_service_instance_test.go b/cf/commands/service/purge_service_instance_test.go index dc7e845030..e8c2cb9643 100644 --- a/cf/commands/service/purge_service_instance_test.go +++ b/cf/commands/service/purge_service_instance_test.go @@ -3,21 +3,21 @@ package service_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - cferrors "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + cferrors "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/service/purge_service_offering.go b/cf/commands/service/purge_service_offering.go index 4c55e772b8..de11a529cd 100644 --- a/cf/commands/service/purge_service_offering.go +++ b/cf/commands/service/purge_service_offering.go @@ -3,15 +3,15 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type PurgeServiceOffering struct { diff --git a/cf/commands/service/purge_service_offering_test.go b/cf/commands/service/purge_service_offering_test.go index b114e6d0e2..3b4c777ebf 100644 --- a/cf/commands/service/purge_service_offering_test.go +++ b/cf/commands/service/purge_service_offering_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/rename_service.go b/cf/commands/service/rename_service.go index 9557ebe3e5..e3e8461d6a 100644 --- a/cf/commands/service/rename_service.go +++ b/cf/commands/service/rename_service.go @@ -3,15 +3,15 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RenameService struct { diff --git a/cf/commands/service/rename_service_test.go b/cf/commands/service/rename_service_test.go index cb6c9bc127..ac043a6777 100644 --- a/cf/commands/service/rename_service_test.go +++ b/cf/commands/service/rename_service_test.go @@ -1,17 +1,17 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/service.go b/cf/commands/service/service.go index ce9faaa8a6..d4f19f5e2a 100644 --- a/cf/commands/service/service.go +++ b/cf/commands/service/service.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" ) type ShowService struct { diff --git a/cf/commands/service/service_suite_test.go b/cf/commands/service/service_suite_test.go index c61fa706b2..c089fb54b4 100644 --- a/cf/commands/service/service_suite_test.go +++ b/cf/commands/service/service_suite_test.go @@ -1,8 +1,8 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/service/service_test.go b/cf/commands/service/service_test.go index 5c0bd774f8..5df35ba828 100644 --- a/cf/commands/service/service_test.go +++ b/cf/commands/service/service_test.go @@ -1,21 +1,21 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" "fmt" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/servicefakes/fake_app_binder.go b/cf/commands/service/servicefakes/fake_app_binder.go index 6ac63f8dc6..748e437417 100644 --- a/cf/commands/service/servicefakes/fake_app_binder.go +++ b/cf/commands/service/servicefakes/fake_app_binder.go @@ -1,10 +1,10 @@ package servicefakes import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type OldFakeAppBinder struct { diff --git a/cf/commands/service/servicefakes/fake_binder.go b/cf/commands/service/servicefakes/fake_binder.go index b6ad688476..52b5ebc9ae 100644 --- a/cf/commands/service/servicefakes/fake_binder.go +++ b/cf/commands/service/servicefakes/fake_binder.go @@ -4,8 +4,8 @@ package servicefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeBinder struct { diff --git a/cf/commands/service/servicefakes/fake_route_service_unbinder.go b/cf/commands/service/servicefakes/fake_route_service_unbinder.go index a8790fdbe7..fe7d6575fd 100644 --- a/cf/commands/service/servicefakes/fake_route_service_unbinder.go +++ b/cf/commands/service/servicefakes/fake_route_service_unbinder.go @@ -4,8 +4,8 @@ package servicefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeRouteServiceUnbinder struct { diff --git a/cf/commands/service/services.go b/cf/commands/service/services.go index e13ab149fa..0c8a04732c 100644 --- a/cf/commands/service/services.go +++ b/cf/commands/service/services.go @@ -3,15 +3,15 @@ package service import ( "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/plugin/models" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListServices struct { diff --git a/cf/commands/service/services_test.go b/cf/commands/service/services_test.go index 1093af7034..b7fa202c08 100644 --- a/cf/commands/service/services_test.go +++ b/cf/commands/service/services_test.go @@ -3,23 +3,23 @@ package service_test import ( "os" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - - "code.cloudfoundry.org/cli/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" + + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + + "code.cloudfoundry.org/cli/v8/cf/commands/service" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/unbind_route_service.go b/cf/commands/service/unbind_route_service.go index 258cfa9d53..6e650da219 100644 --- a/cf/commands/service/unbind_route_service.go +++ b/cf/commands/service/unbind_route_service.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteServiceUnbinder diff --git a/cf/commands/service/unbind_route_service_test.go b/cf/commands/service/unbind_route_service_test.go index 8c0fa50d3f..65a5068b15 100644 --- a/cf/commands/service/unbind_route_service_test.go +++ b/cf/commands/service/unbind_route_service_test.go @@ -3,20 +3,20 @@ package service_test import ( "net/http" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/unbind_service.go b/cf/commands/service/unbind_service.go index 7f3f0a9c85..eeb67a4dc7 100644 --- a/cf/commands/service/unbind_service.go +++ b/cf/commands/service/unbind_service.go @@ -3,13 +3,13 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UnbindService struct { diff --git a/cf/commands/service/unbind_service_test.go b/cf/commands/service/unbind_service_test.go index 026d88ed30..8aa2a9b5b9 100644 --- a/cf/commands/service/unbind_service_test.go +++ b/cf/commands/service/unbind_service_test.go @@ -1,19 +1,19 @@ package service_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("unbind-service command", func() { diff --git a/cf/commands/service/update_service.go b/cf/commands/service/update_service.go index 25eecda7a9..6b9f2019bc 100644 --- a/cf/commands/service/update_service.go +++ b/cf/commands/service/update_service.go @@ -1,21 +1,21 @@ package service import ( - "code.cloudfoundry.org/cli/cf/uihelpers" + "code.cloudfoundry.org/cli/v8/cf/uihelpers" "errors" "fmt" "strings" - "code.cloudfoundry.org/cli/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/json" ) type UpdateService struct { diff --git a/cf/commands/service/update_service_test.go b/cf/commands/service/update_service_test.go index 029d2fb276..6548f5d0c3 100644 --- a/cf/commands/service/update_service_test.go +++ b/cf/commands/service/update_service_test.go @@ -5,20 +5,20 @@ import ( "io/ioutil" "os" - planbuilderfakes "code.cloudfoundry.org/cli/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + planbuilderfakes "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("update-service command", func() { diff --git a/cf/commands/service/update_user_provided_service.go b/cf/commands/service/update_user_provided_service.go index 1c91365f71..50772b9ee4 100644 --- a/cf/commands/service/update_user_provided_service.go +++ b/cf/commands/service/update_user_provided_service.go @@ -6,17 +6,17 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/flagcontext" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/uihelpers" - - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flagcontext" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/uihelpers" + + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UpdateUserProvidedService struct { diff --git a/cf/commands/service/update_user_provided_service_test.go b/cf/commands/service/update_user_provided_service_test.go index 36aa4c6dea..bcf516ab00 100644 --- a/cf/commands/service/update_user_provided_service_test.go +++ b/cf/commands/service/update_user_provided_service_test.go @@ -5,20 +5,20 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/disable_service_access.go b/cf/commands/serviceaccess/disable_service_access.go index ae0fa27bf2..712e57c80a 100644 --- a/cf/commands/serviceaccess/disable_service_access.go +++ b/cf/commands/serviceaccess/disable_service_access.go @@ -3,14 +3,14 @@ package serviceaccess import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DisableServiceAccess struct { diff --git a/cf/commands/serviceaccess/disable_service_access_test.go b/cf/commands/serviceaccess/disable_service_access_test.go index 7f99ec062e..07d346da24 100644 --- a/cf/commands/serviceaccess/disable_service_access_test.go +++ b/cf/commands/serviceaccess/disable_service_access_test.go @@ -3,16 +3,16 @@ package serviceaccess_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - "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" + "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/enable_service_access.go b/cf/commands/serviceaccess/enable_service_access.go index 17a2edfdb9..bb8a12a543 100644 --- a/cf/commands/serviceaccess/enable_service_access.go +++ b/cf/commands/serviceaccess/enable_service_access.go @@ -3,15 +3,15 @@ package serviceaccess import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type EnableServiceAccess struct { diff --git a/cf/commands/serviceaccess/enable_service_access_test.go b/cf/commands/serviceaccess/enable_service_access_test.go index a182f38252..4a8223000a 100644 --- a/cf/commands/serviceaccess/enable_service_access_test.go +++ b/cf/commands/serviceaccess/enable_service_access_test.go @@ -3,17 +3,17 @@ package serviceaccess_test import ( "errors" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/service_access.go b/cf/commands/serviceaccess/service_access.go index 0a3ecf6289..77c0ce5fb0 100644 --- a/cf/commands/serviceaccess/service_access.go +++ b/cf/commands/serviceaccess/service_access.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/actors" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ServiceAccess struct { diff --git a/cf/commands/serviceaccess/service_access_test.go b/cf/commands/serviceaccess/service_access_test.go index 99e579e942..74bb134834 100644 --- a/cf/commands/serviceaccess/service_access_test.go +++ b/cf/commands/serviceaccess/service_access_test.go @@ -4,20 +4,20 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/serviceaccess" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/serviceaccess" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 0907c997e6..a1fd82a962 100644 --- a/cf/commands/serviceaccess/serviceaccess_suite_test.go +++ b/cf/commands/serviceaccess/serviceaccess_suite_test.go @@ -1,8 +1,8 @@ package serviceaccess_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/serviceauthtoken/create_service_auth_token.go b/cf/commands/serviceauthtoken/create_service_auth_token.go index 1adfd140eb..7b8fdeadb6 100644 --- a/cf/commands/serviceauthtoken/create_service_auth_token.go +++ b/cf/commands/serviceauthtoken/create_service_auth_token.go @@ -3,15 +3,15 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/create_service_auth_token_test.go b/cf/commands/serviceauthtoken/create_service_auth_token_test.go index 541e3169c2..ecb5297b85 100644 --- a/cf/commands/serviceauthtoken/create_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/create_service_auth_token_test.go @@ -1,17 +1,17 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceauthtoken/delete_service_auth_token.go b/cf/commands/serviceauthtoken/delete_service_auth_token.go index c83b981416..7206bc9018 100644 --- a/cf/commands/serviceauthtoken/delete_service_auth_token.go +++ b/cf/commands/serviceauthtoken/delete_service_auth_token.go @@ -3,16 +3,16 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/delete_service_auth_token_test.go b/cf/commands/serviceauthtoken/delete_service_auth_token_test.go index 87f971ac1c..90080b775f 100644 --- a/cf/commands/serviceauthtoken/delete_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/delete_service_auth_token_test.go @@ -1,21 +1,21 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - 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" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("delete-service-auth-token command", func() { diff --git a/cf/commands/serviceauthtoken/service_auth_tokens.go b/cf/commands/serviceauthtoken/service_auth_tokens.go index d9b3898b43..c592dba41b 100644 --- a/cf/commands/serviceauthtoken/service_auth_tokens.go +++ b/cf/commands/serviceauthtoken/service_auth_tokens.go @@ -1,14 +1,14 @@ package serviceauthtoken import ( - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListServiceAuthTokens struct { diff --git a/cf/commands/serviceauthtoken/service_auth_tokens_test.go b/cf/commands/serviceauthtoken/service_auth_tokens_test.go index 3c6d7f8fb4..188b2c18f2 100644 --- a/cf/commands/serviceauthtoken/service_auth_tokens_test.go +++ b/cf/commands/serviceauthtoken/service_auth_tokens_test.go @@ -1,19 +1,19 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commands/serviceauthtoken" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commands/serviceauthtoken" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 c58e9859ee..dee6aa7910 100644 --- a/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go +++ b/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go @@ -1,8 +1,8 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/serviceauthtoken/update_service_auth_token.go b/cf/commands/serviceauthtoken/update_service_auth_token.go index 744f00a978..42b6f50906 100644 --- a/cf/commands/serviceauthtoken/update_service_auth_token.go +++ b/cf/commands/serviceauthtoken/update_service_auth_token.go @@ -3,14 +3,14 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UpdateServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/update_service_auth_token_test.go b/cf/commands/serviceauthtoken/update_service_auth_token_test.go index f671dbabfc..c29490d586 100644 --- a/cf/commands/serviceauthtoken/update_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/update_service_auth_token_test.go @@ -1,17 +1,17 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/create_service_broker.go b/cf/commands/servicebroker/create_service_broker.go index db3aaf3ae0..1fdccee90e 100644 --- a/cf/commands/servicebroker/create_service_broker.go +++ b/cf/commands/servicebroker/create_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateServiceBroker struct { diff --git a/cf/commands/servicebroker/create_service_broker_test.go b/cf/commands/servicebroker/create_service_broker_test.go index 6742386d3b..c06f9056fc 100644 --- a/cf/commands/servicebroker/create_service_broker_test.go +++ b/cf/commands/servicebroker/create_service_broker_test.go @@ -3,18 +3,18 @@ package servicebroker_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/servicebroker" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/servicebroker" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/delete_service_broker.go b/cf/commands/servicebroker/delete_service_broker.go index 4695179397..35cc4f551b 100644 --- a/cf/commands/servicebroker/delete_service_broker.go +++ b/cf/commands/servicebroker/delete_service_broker.go @@ -3,14 +3,14 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteServiceBroker struct { diff --git a/cf/commands/servicebroker/delete_service_broker_test.go b/cf/commands/servicebroker/delete_service_broker_test.go index 09a9115070..a9bf55ec95 100644 --- a/cf/commands/servicebroker/delete_service_broker_test.go +++ b/cf/commands/servicebroker/delete_service_broker_test.go @@ -1,17 +1,17 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/rename_service_broker.go b/cf/commands/servicebroker/rename_service_broker.go index 0f367b2a55..25558d3061 100644 --- a/cf/commands/servicebroker/rename_service_broker.go +++ b/cf/commands/servicebroker/rename_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RenameServiceBroker struct { diff --git a/cf/commands/servicebroker/rename_service_broker_test.go b/cf/commands/servicebroker/rename_service_broker_test.go index aeea99f96a..939d12498a 100644 --- a/cf/commands/servicebroker/rename_service_broker_test.go +++ b/cf/commands/servicebroker/rename_service_broker_test.go @@ -1,16 +1,16 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/service_brokers.go b/cf/commands/servicebroker/service_brokers.go index 72a20de68c..d2c20847f0 100644 --- a/cf/commands/servicebroker/service_brokers.go +++ b/cf/commands/servicebroker/service_brokers.go @@ -3,14 +3,14 @@ package servicebroker import ( "sort" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListServiceBrokers struct { diff --git a/cf/commands/servicebroker/service_brokers_test.go b/cf/commands/servicebroker/service_brokers_test.go index ccf77690f9..18948f48ce 100644 --- a/cf/commands/servicebroker/service_brokers_test.go +++ b/cf/commands/servicebroker/service_brokers_test.go @@ -3,23 +3,23 @@ package servicebroker_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "strings" - "code.cloudfoundry.org/cli/cf/commands/servicebroker" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands/servicebroker" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("service-brokers command", func() { diff --git a/cf/commands/servicebroker/servicebroker_suite_test.go b/cf/commands/servicebroker/servicebroker_suite_test.go index b47a081abb..a2a5a19307 100644 --- a/cf/commands/servicebroker/servicebroker_suite_test.go +++ b/cf/commands/servicebroker/servicebroker_suite_test.go @@ -1,8 +1,8 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicebroker/update_service_broker.go b/cf/commands/servicebroker/update_service_broker.go index 375111bd05..bf713c1400 100644 --- a/cf/commands/servicebroker/update_service_broker.go +++ b/cf/commands/servicebroker/update_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UpdateServiceBroker struct { diff --git a/cf/commands/servicebroker/update_service_broker_test.go b/cf/commands/servicebroker/update_service_broker_test.go index fe69c995f2..8da871cbb2 100644 --- a/cf/commands/servicebroker/update_service_broker_test.go +++ b/cf/commands/servicebroker/update_service_broker_test.go @@ -1,19 +1,19 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("update-service-broker command", func() { diff --git a/cf/commands/servicekey/create_service_key.go b/cf/commands/servicekey/create_service_key.go index 1c202774f9..c6f1b1c1f6 100644 --- a/cf/commands/servicekey/create_service_key.go +++ b/cf/commands/servicekey/create_service_key.go @@ -3,16 +3,16 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/util/json" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/util/json" + + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type CreateServiceKey struct { diff --git a/cf/commands/servicekey/create_service_key_test.go b/cf/commands/servicekey/create_service_key_test.go index 39526952d0..e90eadb814 100644 --- a/cf/commands/servicekey/create_service_key_test.go +++ b/cf/commands/servicekey/create_service_key_test.go @@ -4,19 +4,19 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/delete_service_key.go b/cf/commands/servicekey/delete_service_key.go index 9ad4934b2e..c2fec0e559 100644 --- a/cf/commands/servicekey/delete_service_key.go +++ b/cf/commands/servicekey/delete_service_key.go @@ -3,15 +3,15 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type DeleteServiceKey struct { diff --git a/cf/commands/servicekey/delete_service_key_test.go b/cf/commands/servicekey/delete_service_key_test.go index 4fe1dbb8ee..5bc7ff1563 100644 --- a/cf/commands/servicekey/delete_service_key_test.go +++ b/cf/commands/servicekey/delete_service_key_test.go @@ -1,19 +1,19 @@ package servicekey_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - 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" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/service_key.go b/cf/commands/servicekey/service_key.go index df3101514c..96624da661 100644 --- a/cf/commands/servicekey/service_key.go +++ b/cf/commands/servicekey/service_key.go @@ -4,15 +4,15 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type ServiceKey struct { diff --git a/cf/commands/servicekey/service_key_test.go b/cf/commands/servicekey/service_key_test.go index eaf178a604..e7d3fdcaba 100644 --- a/cf/commands/servicekey/service_key_test.go +++ b/cf/commands/servicekey/service_key_test.go @@ -1,19 +1,19 @@ package servicekey_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/service_keys.go b/cf/commands/servicekey/service_keys.go index 8289c83b7e..7d7ee2a0b9 100644 --- a/cf/commands/servicekey/service_keys.go +++ b/cf/commands/servicekey/service_keys.go @@ -3,14 +3,14 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type ServiceKeys struct { diff --git a/cf/commands/servicekey/service_keys_test.go b/cf/commands/servicekey/service_keys_test.go index f657caf066..5165daad9d 100644 --- a/cf/commands/servicekey/service_keys_test.go +++ b/cf/commands/servicekey/service_keys_test.go @@ -3,18 +3,18 @@ package servicekey_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 37d3752718..c6c7919aca 100644 --- a/cf/commands/servicekey/servicekey_suite_test.go +++ b/cf/commands/servicekey/servicekey_suite_test.go @@ -3,8 +3,8 @@ package servicekey_test import ( "testing" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/space/allow_space_ssh.go b/cf/commands/space/allow_space_ssh.go index 7254ddf933..180dfd2e0b 100644 --- a/cf/commands/space/allow_space_ssh.go +++ b/cf/commands/space/allow_space_ssh.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type AllowSpaceSSH struct { diff --git a/cf/commands/space/allow_space_ssh_test.go b/cf/commands/space/allow_space_ssh_test.go index 141a556dfb..330d966f44 100644 --- a/cf/commands/space/allow_space_ssh_test.go +++ b/cf/commands/space/allow_space_ssh_test.go @@ -3,17 +3,17 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/create_space.go b/cf/commands/space/create_space.go index bb862ee4db..0e29f2d100 100644 --- a/cf/commands/space/create_space.go +++ b/cf/commands/space/create_space.go @@ -3,20 +3,20 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateSpace struct { @@ -73,7 +73,7 @@ func (cmd *CreateSpace) SetDependency(deps commandregistry.Dependency, pluginCal cmd.userRepo = deps.RepoLocator.GetUserRepository() cmd.spaceQuotaRepo = deps.RepoLocator.GetSpaceQuotaRepository() - //get command from registry for dependency + // get command from registry for dependency commandDep := commandregistry.Commands.FindCommand("set-space-role") commandDep = commandDep.SetDependency(deps, false) cmd.spaceRoleSetter = commandDep.(user.SpaceRoleSetter) diff --git a/cf/commands/space/create_space_test.go b/cf/commands/space/create_space_test.go index 2f52b59372..a86eeed6d0 100644 --- a/cf/commands/space/create_space_test.go +++ b/cf/commands/space/create_space_test.go @@ -1,23 +1,23 @@ package space_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -47,7 +47,7 @@ var _ = Describe("create-space command", func() { deps.RepoLocator = deps.RepoLocator.SetUserRepository(userRepo) deps.Config = configRepo - //inject fake 'command dependency' into registry + // inject fake 'command dependency' into registry commandregistry.Register(spaceRoleSetter) commandregistry.Commands.SetCommand(commandregistry.Commands.FindCommand("create-space").SetDependency(deps, pluginCall)) @@ -75,7 +75,7 @@ var _ = Describe("create-space command", func() { GUID: "my-org-guid", } - //save original command and restore later + // save original command and restore later OriginalCommand = commandregistry.Commands.FindCommand("set-space-role") spaceRepo = new(spacesfakes.FakeSpaceRepository) diff --git a/cf/commands/space/delete_space.go b/cf/commands/space/delete_space.go index 90268df5b0..370d1fa578 100644 --- a/cf/commands/space/delete_space.go +++ b/cf/commands/space/delete_space.go @@ -3,16 +3,16 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteSpace struct { diff --git a/cf/commands/space/delete_space_test.go b/cf/commands/space/delete_space_test.go index 38d0880439..de7236b632 100644 --- a/cf/commands/space/delete_space_test.go +++ b/cf/commands/space/delete_space_test.go @@ -3,20 +3,20 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("delete-space command", func() { diff --git a/cf/commands/space/disallow_space_ssh.go b/cf/commands/space/disallow_space_ssh.go index 8095f19a8f..840e3eef56 100644 --- a/cf/commands/space/disallow_space_ssh.go +++ b/cf/commands/space/disallow_space_ssh.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DisallowSpaceSSH struct { diff --git a/cf/commands/space/disallow_space_ssh_test.go b/cf/commands/space/disallow_space_ssh_test.go index 0cc82512ed..b5356f96f9 100644 --- a/cf/commands/space/disallow_space_ssh_test.go +++ b/cf/commands/space/disallow_space_ssh_test.go @@ -3,17 +3,17 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/rename_space.go b/cf/commands/space/rename_space.go index 92bfdb4778..e6a03e764d 100644 --- a/cf/commands/space/rename_space.go +++ b/cf/commands/space/rename_space.go @@ -3,13 +3,13 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type RenameSpace struct { diff --git a/cf/commands/space/rename_space_test.go b/cf/commands/space/rename_space_test.go index 2b82fbac5b..5ff5d43ae9 100644 --- a/cf/commands/space/rename_space_test.go +++ b/cf/commands/space/rename_space_test.go @@ -3,19 +3,19 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("rename-space command", func() { diff --git a/cf/commands/space/space.go b/cf/commands/space/space.go index e169568d62..d777b6f1b5 100644 --- a/cf/commands/space/space.go +++ b/cf/commands/space/space.go @@ -4,17 +4,17 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/plugin/models" + + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ShowSpace struct { diff --git a/cf/commands/space/space_ssh_allowed.go b/cf/commands/space/space_ssh_allowed.go index bf4c70ec3b..fe86fda48c 100644 --- a/cf/commands/space/space_ssh_allowed.go +++ b/cf/commands/space/space_ssh_allowed.go @@ -3,13 +3,13 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SSHAllowed struct { diff --git a/cf/commands/space/space_ssh_allowed_test.go b/cf/commands/space/space_ssh_allowed_test.go index 028ec8c5dd..ddc3ca7c95 100644 --- a/cf/commands/space/space_ssh_allowed_test.go +++ b/cf/commands/space/space_ssh_allowed_test.go @@ -3,13 +3,13 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "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 74d0383eec..ac4e524c32 100644 --- a/cf/commands/space/space_suite_test.go +++ b/cf/commands/space/space_suite_test.go @@ -1,8 +1,8 @@ package space_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/space/space_test.go b/cf/commands/space/space_test.go index f0d6301e77..025e7a8548 100644 --- a/cf/commands/space/space_test.go +++ b/cf/commands/space/space_test.go @@ -1,22 +1,22 @@ package space_test import ( - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/plugin/models" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commands/space" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commands/space" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("space command", func() { diff --git a/cf/commands/space/spaces.go b/cf/commands/space/spaces.go index 951c40c026..bd88551534 100644 --- a/cf/commands/space/spaces.go +++ b/cf/commands/space/spaces.go @@ -3,15 +3,15 @@ package space import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" ) type ListSpaces struct { diff --git a/cf/commands/space/spaces_test.go b/cf/commands/space/spaces_test.go index dc19e7ab0a..426532a5c0 100644 --- a/cf/commands/space/spaces_test.go +++ b/cf/commands/space/spaces_test.go @@ -4,21 +4,21 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" - "code.cloudfoundry.org/cli/plugin/models" - - "code.cloudfoundry.org/cli/cf/commands/space" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" + + "code.cloudfoundry.org/cli/v8/cf/commands/space" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/create_space_quota.go b/cf/commands/spacequota/create_space_quota.go index 876c580c53..a9ffa7fa32 100644 --- a/cf/commands/spacequota/create_space_quota.go +++ b/cf/commands/spacequota/create_space_quota.go @@ -5,17 +5,17 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateSpaceQuota struct { diff --git a/cf/commands/spacequota/create_space_quota_test.go b/cf/commands/spacequota/create_space_quota_test.go index 337d450785..2675257e3e 100644 --- a/cf/commands/spacequota/create_space_quota_test.go +++ b/cf/commands/spacequota/create_space_quota_test.go @@ -3,21 +3,21 @@ package spacequota_test import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - - "code.cloudfoundry.org/cli/cf/api/resources" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commands/spacequota" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + + "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/delete_space_quota.go b/cf/commands/spacequota/delete_space_quota.go index d23a6b04e4..63287a5a1a 100644 --- a/cf/commands/spacequota/delete_space_quota.go +++ b/cf/commands/spacequota/delete_space_quota.go @@ -3,15 +3,15 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type DeleteSpaceQuota struct { diff --git a/cf/commands/spacequota/delete_space_quota_test.go b/cf/commands/spacequota/delete_space_quota_test.go index e58f51eae5..eaff703925 100644 --- a/cf/commands/spacequota/delete_space_quota_test.go +++ b/cf/commands/spacequota/delete_space_quota_test.go @@ -1,19 +1,19 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/set_space_quota.go b/cf/commands/spacequota/set_space_quota.go index 0829c3734a..2069fd2140 100644 --- a/cf/commands/spacequota/set_space_quota.go +++ b/cf/commands/spacequota/set_space_quota.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SetSpaceQuota struct { diff --git a/cf/commands/spacequota/set_space_quota_test.go b/cf/commands/spacequota/set_space_quota_test.go index eafc3503e7..9d8cb51aaa 100644 --- a/cf/commands/spacequota/set_space_quota_test.go +++ b/cf/commands/spacequota/set_space_quota_test.go @@ -1,19 +1,19 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commands/spacequota" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/space_quota.go b/cf/commands/spacequota/space_quota.go index 52d134a9f2..3f3a0224fa 100644 --- a/cf/commands/spacequota/space_quota.go +++ b/cf/commands/spacequota/space_quota.go @@ -3,14 +3,14 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type SpaceQuota struct { diff --git a/cf/commands/spacequota/space_quota_test.go b/cf/commands/spacequota/space_quota_test.go index 7a83b45de2..c8a40f9da8 100644 --- a/cf/commands/spacequota/space_quota_test.go +++ b/cf/commands/spacequota/space_quota_test.go @@ -1,18 +1,18 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/space_quotas.go b/cf/commands/spacequota/space_quotas.go index 563b449f78..40baae6cef 100644 --- a/cf/commands/spacequota/space_quotas.go +++ b/cf/commands/spacequota/space_quotas.go @@ -4,14 +4,14 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListSpaceQuotas struct { diff --git a/cf/commands/spacequota/space_quotas_test.go b/cf/commands/spacequota/space_quotas_test.go index a2efb46bd5..58ec0a231a 100644 --- a/cf/commands/spacequota/space_quotas_test.go +++ b/cf/commands/spacequota/space_quotas_test.go @@ -1,20 +1,20 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - "code.cloudfoundry.org/cli/cf/commands/spacequota" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v8/cf/commands/spacequota" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 ca6f9b0722..821c0186f8 100644 --- a/cf/commands/spacequota/spacequota_suite_test.go +++ b/cf/commands/spacequota/spacequota_suite_test.go @@ -1,8 +1,8 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/spacequota/unset_space_quota.go b/cf/commands/spacequota/unset_space_quota.go index d603e4a7b7..7fcdfc09dc 100644 --- a/cf/commands/spacequota/unset_space_quota.go +++ b/cf/commands/spacequota/unset_space_quota.go @@ -3,14 +3,14 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UnsetSpaceQuota struct { diff --git a/cf/commands/spacequota/unset_space_quota_test.go b/cf/commands/spacequota/unset_space_quota_test.go index 9b348503d4..1938e840e0 100644 --- a/cf/commands/spacequota/unset_space_quota_test.go +++ b/cf/commands/spacequota/unset_space_quota_test.go @@ -3,18 +3,18 @@ package spacequota_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/update_space_quota.go b/cf/commands/spacequota/update_space_quota.go index e006966cc6..716e250feb 100644 --- a/cf/commands/spacequota/update_space_quota.go +++ b/cf/commands/spacequota/update_space_quota.go @@ -6,14 +6,14 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/cf/api/spacequotas" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UpdateSpaceQuota struct { diff --git a/cf/commands/spacequota/update_space_quota_test.go b/cf/commands/spacequota/update_space_quota_test.go index a984e36c21..f9eb0a253c 100644 --- a/cf/commands/spacequota/update_space_quota_test.go +++ b/cf/commands/spacequota/update_space_quota_test.go @@ -3,17 +3,17 @@ package spacequota_test import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/ssh_code.go b/cf/commands/ssh_code.go index 57d3e3a2f4..75fca00045 100644 --- a/cf/commands/ssh_code.go +++ b/cf/commands/ssh_code.go @@ -3,14 +3,14 @@ package commands import ( "errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHCodeGetter diff --git a/cf/commands/ssh_code_test.go b/cf/commands/ssh_code_test.go index 34f2d49d69..15cf61a112 100644 --- a/cf/commands/ssh_code_test.go +++ b/cf/commands/ssh_code_test.go @@ -3,19 +3,19 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/stack.go b/cf/commands/stack.go index 8374503ba4..e064aec817 100644 --- a/cf/commands/stack.go +++ b/cf/commands/stack.go @@ -3,13 +3,13 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/stacks" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListStack struct { diff --git a/cf/commands/stack_test.go b/cf/commands/stack_test.go index 51138196b9..f62822eb59 100644 --- a/cf/commands/stack_test.go +++ b/cf/commands/stack_test.go @@ -3,20 +3,20 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("stack command", func() { diff --git a/cf/commands/stacks.go b/cf/commands/stacks.go index a2899eac90..d7606b2d3a 100644 --- a/cf/commands/stacks.go +++ b/cf/commands/stacks.go @@ -1,13 +1,13 @@ package commands import ( - "code.cloudfoundry.org/cli/cf/api/stacks" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/stacks" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ListStacks struct { diff --git a/cf/commands/stacks_test.go b/cf/commands/stacks_test.go index 0cae63393a..b45c23f5f2 100644 --- a/cf/commands/stacks_test.go +++ b/cf/commands/stacks_test.go @@ -1,21 +1,21 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commands" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("stacks command", func() { diff --git a/cf/commands/target.go b/cf/commands/target.go index 107ddb96fa..d52960c55e 100644 --- a/cf/commands/target.go +++ b/cf/commands/target.go @@ -3,16 +3,16 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type Target struct { diff --git a/cf/commands/target_test.go b/cf/commands/target_test.go index 0867626016..2480c13df9 100644 --- a/cf/commands/target_test.go +++ b/cf/commands/target_test.go @@ -1,24 +1,24 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - 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" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/commands" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commands" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("target command", func() { diff --git a/cf/commands/user/create_user.go b/cf/commands/user/create_user.go index 9076dd1d6e..f198019e7b 100644 --- a/cf/commands/user/create_user.go +++ b/cf/commands/user/create_user.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type CreateUser struct { diff --git a/cf/commands/user/create_user_test.go b/cf/commands/user/create_user_test.go index 7e964fc1a3..38351dce55 100644 --- a/cf/commands/user/create_user_test.go +++ b/cf/commands/user/create_user_test.go @@ -1,19 +1,19 @@ package user_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("Create user command", func() { diff --git a/cf/commands/user/delete_user.go b/cf/commands/user/delete_user.go index 2d5dbd1685..980a5d47cd 100644 --- a/cf/commands/user/delete_user.go +++ b/cf/commands/user/delete_user.go @@ -3,14 +3,14 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type DeleteUser struct { diff --git a/cf/commands/user/delete_user_test.go b/cf/commands/user/delete_user_test.go index ce79ef84cb..43608c313f 100644 --- a/cf/commands/user/delete_user_test.go +++ b/cf/commands/user/delete_user_test.go @@ -1,20 +1,20 @@ package user_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - 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" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("delete-user command", func() { diff --git a/cf/commands/user/org_users.go b/cf/commands/user/org_users.go index 3d24c6e94f..158473c288 100644 --- a/cf/commands/user/org_users.go +++ b/cf/commands/user/org_users.go @@ -3,16 +3,16 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors/userprint" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/actors/userprint" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" ) type OrgUsers struct { diff --git a/cf/commands/user/org_users_test.go b/cf/commands/user/org_users_test.go index 942b9597cd..4e83195456 100644 --- a/cf/commands/user/org_users_test.go +++ b/cf/commands/user/org_users_test.go @@ -1,23 +1,23 @@ package user_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("org-users command", func() { diff --git a/cf/commands/user/set_org_role.go b/cf/commands/user/set_org_role.go index d87a84f116..9137bb8158 100644 --- a/cf/commands/user/set_org_role.go +++ b/cf/commands/user/set_org_role.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrgRoleSetter diff --git a/cf/commands/user/set_org_role_test.go b/cf/commands/user/set_org_role_test.go index 33c07a5952..a19140fe1c 100644 --- a/cf/commands/user/set_org_role_test.go +++ b/cf/commands/user/set_org_role_test.go @@ -3,20 +3,20 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/set_space_role.go b/cf/commands/user/set_space_role.go index 14329d26bc..e8ba7636f1 100644 --- a/cf/commands/user/set_space_role.go +++ b/cf/commands/user/set_space_role.go @@ -3,17 +3,17 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRoleSetter diff --git a/cf/commands/user/set_space_role_test.go b/cf/commands/user/set_space_role_test.go index 64d3926662..e6323cfb1f 100644 --- a/cf/commands/user/set_space_role_test.go +++ b/cf/commands/user/set_space_role_test.go @@ -3,21 +3,21 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/space_users.go b/cf/commands/user/space_users.go index 0764b13045..8e10855326 100644 --- a/cf/commands/user/space_users.go +++ b/cf/commands/user/space_users.go @@ -3,17 +3,17 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/actors/userprint" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/actors/userprint" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/plugin/models" ) type SpaceUsers struct { diff --git a/cf/commands/user/space_users_test.go b/cf/commands/user/space_users_test.go index a28f136e98..5faba3b843 100644 --- a/cf/commands/user/space_users_test.go +++ b/cf/commands/user/space_users_test.go @@ -3,24 +3,24 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - 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" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) var _ = Describe("space-users command", func() { diff --git a/cf/commands/user/unset_org_role.go b/cf/commands/user/unset_org_role.go index 7f97312132..f5cd3c8841 100644 --- a/cf/commands/user/unset_org_role.go +++ b/cf/commands/user/unset_org_role.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UnsetOrgRole struct { diff --git a/cf/commands/user/unset_org_role_test.go b/cf/commands/user/unset_org_role_test.go index 32f68ead1f..829c512d7d 100644 --- a/cf/commands/user/unset_org_role_test.go +++ b/cf/commands/user/unset_org_role_test.go @@ -3,20 +3,20 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - testapi "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + testapi "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/unset_space_role.go b/cf/commands/user/unset_space_role.go index 2697e8b57f..bca44206f0 100644 --- a/cf/commands/user/unset_space_role.go +++ b/cf/commands/user/unset_space_role.go @@ -3,16 +3,16 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/featureflags" - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type UnsetSpaceRole struct { diff --git a/cf/commands/user/unset_space_role_test.go b/cf/commands/user/unset_space_role_test.go index cc42cbf4c6..f475b0fcaa 100644 --- a/cf/commands/user/unset_space_role_test.go +++ b/cf/commands/user/unset_space_role_test.go @@ -3,21 +3,21 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 720eecbf23..444c4c2b0f 100644 --- a/cf/commands/user/user_suite_test.go +++ b/cf/commands/user/user_suite_test.go @@ -1,8 +1,8 @@ package user_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/user/userfakes/fake_org_role_setter.go b/cf/commands/user/userfakes/fake_org_role_setter.go index 0acf693660..4aab543899 100644 --- a/cf/commands/user/userfakes/fake_org_role_setter.go +++ b/cf/commands/user/userfakes/fake_org_role_setter.go @@ -4,11 +4,11 @@ package userfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeOrgRoleSetter struct { diff --git a/cf/commands/user/userfakes/fake_space_role_setter.go b/cf/commands/user/userfakes/fake_space_role_setter.go index 5499c3d74a..11d6dc746e 100644 --- a/cf/commands/user/userfakes/fake_space_role_setter.go +++ b/cf/commands/user/userfakes/fake_space_role_setter.go @@ -4,11 +4,11 @@ package userfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands/user" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeSpaceRoleSetter struct { diff --git a/cf/commands/version.go b/cf/commands/version.go index 13c76e8b7d..e954e07c96 100644 --- a/cf/commands/version.go +++ b/cf/commands/version.go @@ -3,13 +3,13 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/version" ) type Version struct { diff --git a/cf/commands/version_test.go b/cf/commands/version_test.go index 5d52a67933..c1afb54bfe 100644 --- a/cf/commands/version_test.go +++ b/cf/commands/version_test.go @@ -1,13 +1,13 @@ package commands_test import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/flags" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf" + "code.cloudfoundry.org/cli/v8/cf" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commandsloader/commands_loader.go b/cf/commandsloader/commands_loader.go index 5e884cb60d..7de27cfd18 100644 --- a/cf/commandsloader/commands_loader.go +++ b/cf/commandsloader/commands_loader.go @@ -1,27 +1,27 @@ package commandsloader import ( - "code.cloudfoundry.org/cli/cf/commands" - "code.cloudfoundry.org/cli/cf/commands/application" - "code.cloudfoundry.org/cli/cf/commands/buildpack" - "code.cloudfoundry.org/cli/cf/commands/domain" - "code.cloudfoundry.org/cli/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/cf/commands/featureflag" - "code.cloudfoundry.org/cli/cf/commands/organization" - "code.cloudfoundry.org/cli/cf/commands/plugin" - "code.cloudfoundry.org/cli/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/cf/commands/quota" - "code.cloudfoundry.org/cli/cf/commands/route" - "code.cloudfoundry.org/cli/cf/commands/routergroups" - "code.cloudfoundry.org/cli/cf/commands/securitygroup" - "code.cloudfoundry.org/cli/cf/commands/service" - "code.cloudfoundry.org/cli/cf/commands/serviceaccess" - "code.cloudfoundry.org/cli/cf/commands/serviceauthtoken" - "code.cloudfoundry.org/cli/cf/commands/servicebroker" - "code.cloudfoundry.org/cli/cf/commands/servicekey" - "code.cloudfoundry.org/cli/cf/commands/space" - "code.cloudfoundry.org/cli/cf/commands/spacequota" - "code.cloudfoundry.org/cli/cf/commands/user" + "code.cloudfoundry.org/cli/v8/cf/commands" + "code.cloudfoundry.org/cli/v8/cf/commands/application" + "code.cloudfoundry.org/cli/v8/cf/commands/buildpack" + "code.cloudfoundry.org/cli/v8/cf/commands/domain" + "code.cloudfoundry.org/cli/v8/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v8/cf/commands/featureflag" + "code.cloudfoundry.org/cli/v8/cf/commands/organization" + "code.cloudfoundry.org/cli/v8/cf/commands/plugin" + "code.cloudfoundry.org/cli/v8/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v8/cf/commands/quota" + "code.cloudfoundry.org/cli/v8/cf/commands/route" + "code.cloudfoundry.org/cli/v8/cf/commands/routergroups" + "code.cloudfoundry.org/cli/v8/cf/commands/securitygroup" + "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v8/cf/commands/serviceaccess" + "code.cloudfoundry.org/cli/v8/cf/commands/serviceauthtoken" + "code.cloudfoundry.org/cli/v8/cf/commands/servicebroker" + "code.cloudfoundry.org/cli/v8/cf/commands/servicekey" + "code.cloudfoundry.org/cli/v8/cf/commands/space" + "code.cloudfoundry.org/cli/v8/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v8/cf/commands/user" ) /******************* diff --git a/cf/commandsloader/commands_loader_test.go b/cf/commandsloader/commands_loader_test.go index 922a84ed28..b543a0729a 100644 --- a/cf/commandsloader/commands_loader_test.go +++ b/cf/commandsloader/commands_loader_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/commandsloader" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/commandsloader" . "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 288486627f..cfb392a479 100644 --- a/cf/configuration/config_disk_persistor_test.go +++ b/cf/configuration/config_disk_persistor_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - . "code.cloudfoundry.org/cli/cf/configuration" + . "code.cloudfoundry.org/cli/v8/cf/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/configurationfakes/fake_data_interface.go b/cf/configuration/configurationfakes/fake_data_interface.go index 3746d42ee7..0fbaeb44c9 100644 --- a/cf/configuration/configurationfakes/fake_data_interface.go +++ b/cf/configuration/configurationfakes/fake_data_interface.go @@ -4,7 +4,7 @@ package configurationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration" ) type FakeDataInterface struct { diff --git a/cf/configuration/configurationfakes/fake_persistor.go b/cf/configuration/configurationfakes/fake_persistor.go index 3283bb555d..2eb88364f4 100644 --- a/cf/configuration/configurationfakes/fake_persistor.go +++ b/cf/configuration/configurationfakes/fake_persistor.go @@ -4,7 +4,7 @@ package configurationfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration" ) type FakePersistor struct { diff --git a/cf/configuration/coreconfig/access_token_test.go b/cf/configuration/coreconfig/access_token_test.go index d9278e8832..0e5277ef17 100644 --- a/cf/configuration/coreconfig/access_token_test.go +++ b/cf/configuration/coreconfig/access_token_test.go @@ -1,7 +1,7 @@ package coreconfig_test import ( - . "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/api_config_refresher.go b/cf/configuration/coreconfig/api_config_refresher.go index 3e933ce477..7923669764 100644 --- a/cf/configuration/coreconfig/api_config_refresher.go +++ b/cf/configuration/coreconfig/api_config_refresher.go @@ -3,7 +3,7 @@ package coreconfig import ( "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . EndpointRepository diff --git a/cf/configuration/coreconfig/api_config_refresher_test.go b/cf/configuration/coreconfig/api_config_refresher_test.go index 2f52d74cae..59034b598c 100644 --- a/cf/configuration/coreconfig/api_config_refresher_test.go +++ b/cf/configuration/coreconfig/api_config_refresher_test.go @@ -1,11 +1,11 @@ package coreconfig_test import ( - . "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v8/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/config_data.go b/cf/configuration/coreconfig/config_data.go index a5314a124c..dfed4c0b5d 100644 --- a/cf/configuration/coreconfig/config_data.go +++ b/cf/configuration/coreconfig/config_data.go @@ -3,8 +3,8 @@ package coreconfig import ( "encoding/json" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type AuthPromptType string diff --git a/cf/configuration/coreconfig/config_data_test.go b/cf/configuration/coreconfig/config_data_test.go index e3f44d726c..07cf8b89c2 100644 --- a/cf/configuration/coreconfig/config_data_test.go +++ b/cf/configuration/coreconfig/config_data_test.go @@ -1,8 +1,8 @@ package coreconfig_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/configuration/coreconfig/config_repository.go b/cf/configuration/coreconfig/config_repository.go index 6da594b364..4e7a90e3d5 100644 --- a/cf/configuration/coreconfig/config_repository.go +++ b/cf/configuration/coreconfig/config_repository.go @@ -4,9 +4,9 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/version" "github.com/blang/semver/v4" ) @@ -40,7 +40,7 @@ func NewRepositoryFromFilepath(filepath string, errorHandler func(error)) Reposi func NewRepositoryFromPersistor(persistor configuration.Persistor, errorHandler func(error)) Repository { data := NewData() if !persistor.Exists() { - //set default plugin repo + // set default plugin repo data.PluginRepos = append(data.PluginRepos, models.PluginRepo{ Name: "CF-Community", URL: "https://plugins.cloudfoundry.org", diff --git a/cf/configuration/coreconfig/config_repository_test.go b/cf/configuration/coreconfig/config_repository_test.go index d71006e4b0..ed6447787a 100644 --- a/cf/configuration/coreconfig/config_repository_test.go +++ b/cf/configuration/coreconfig/config_repository_test.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/configurationfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/configurationfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/version" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go b/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go index aaf2b94c6f..f8d378fd26 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go @@ -4,7 +4,7 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" ) type FakeEndpointRepository struct { diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go b/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go index 1e924f299c..b1eecae3f1 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go @@ -4,8 +4,8 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" "github.com/blang/semver/v4" ) diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go b/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go index 853f44f607..5a452103c5 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go @@ -4,8 +4,8 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" "github.com/blang/semver/v4" ) diff --git a/cf/configuration/pluginconfig/plugin_config.go b/cf/configuration/pluginconfig/plugin_config.go index c2212f7f88..ae82e07547 100644 --- a/cf/configuration/pluginconfig/plugin_config.go +++ b/cf/configuration/pluginconfig/plugin_config.go @@ -3,7 +3,7 @@ package pluginconfig import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginConfiguration @@ -74,7 +74,7 @@ func (c *PluginConfig) ListCommands() []string { } func (c *PluginConfig) init() { - //only read from disk if it was never read + // only read from disk if it was never read c.initOnce.Do(func() { err := c.persistor.Load(c.data) if err != nil { diff --git a/cf/configuration/pluginconfig/plugin_config_test.go b/cf/configuration/pluginconfig/plugin_config_test.go index ffc259781b..1501c8f67b 100644 --- a/cf/configuration/pluginconfig/plugin_config_test.go +++ b/cf/configuration/pluginconfig/plugin_config_test.go @@ -5,12 +5,12 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - . "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" + . "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/plugin" - "code.cloudfoundry.org/cli/cf/configuration/configurationfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/configurationfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/pluginconfig/plugin_data.go b/cf/configuration/pluginconfig/plugin_data.go index 9d9cebe490..a08bc3c81e 100644 --- a/cf/configuration/pluginconfig/plugin_data.go +++ b/cf/configuration/pluginconfig/plugin_data.go @@ -3,7 +3,7 @@ package pluginconfig import ( "encoding/json" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type PluginData struct { diff --git a/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go b/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go index 42220dae93..d3978c6208 100644 --- a/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go +++ b/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go @@ -4,7 +4,7 @@ package pluginconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" ) type FakePluginConfiguration struct { diff --git a/cf/errors/access_denied_error.go b/cf/errors/access_denied_error.go index 36fb366d8a..1d0f755b4e 100644 --- a/cf/errors/access_denied_error.go +++ b/cf/errors/access_denied_error.go @@ -1,6 +1,6 @@ package errors -import . "code.cloudfoundry.org/cli/cf/i18n" +import . "code.cloudfoundry.org/cli/v8/cf/i18n" type AccessDeniedError struct { } diff --git a/cf/errors/ambiguous_model_error.go b/cf/errors/ambiguous_model_error.go index 071745bcf0..03057eee08 100644 --- a/cf/errors/ambiguous_model_error.go +++ b/cf/errors/ambiguous_model_error.go @@ -3,7 +3,7 @@ package errors import ( "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type AmbiguousModelError struct { diff --git a/cf/errors/curl_http_error.go b/cf/errors/curl_http_error.go index 4883e943c4..15894557eb 100644 --- a/cf/errors/curl_http_error.go +++ b/cf/errors/curl_http_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type CurlHTTPError struct { diff --git a/cf/errors/empty_dir_error.go b/cf/errors/empty_dir_error.go index 8cca87afa0..86e270f191 100644 --- a/cf/errors/empty_dir_error.go +++ b/cf/errors/empty_dir_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type EmptyDirError struct { diff --git a/cf/errors/errorsfakes/fake_httperror.go b/cf/errors/errorsfakes/fake_httperror.go index ee993fdd85..fef573f67b 100644 --- a/cf/errors/errorsfakes/fake_httperror.go +++ b/cf/errors/errorsfakes/fake_httperror.go @@ -4,7 +4,7 @@ package errorsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/errors" ) type FakeHTTPError struct { diff --git a/cf/errors/gateway_error.go b/cf/errors/gateway_error.go index 22d908bbed..c0a19243ac 100644 --- a/cf/errors/gateway_error.go +++ b/cf/errors/gateway_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type AsyncTimeoutError struct { diff --git a/cf/errors/http_error.go b/cf/errors/http_error.go index bb8e1f60b0..9979923dfd 100644 --- a/cf/errors/http_error.go +++ b/cf/errors/http_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . HTTPError diff --git a/cf/errors/invalid_ssl_cert_error.go b/cf/errors/invalid_ssl_cert_error.go index 70f81d7af1..61880c1ded 100644 --- a/cf/errors/invalid_ssl_cert_error.go +++ b/cf/errors/invalid_ssl_cert_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type InvalidSSLCert struct { diff --git a/cf/errors/invalid_token_error.go b/cf/errors/invalid_token_error.go index 4860758669..8b9a438655 100644 --- a/cf/errors/invalid_token_error.go +++ b/cf/errors/invalid_token_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type InvalidTokenError struct { diff --git a/cf/errors/model_already_exists_error.go b/cf/errors/model_already_exists_error.go index ef8b832dc6..904d4e7370 100644 --- a/cf/errors/model_already_exists_error.go +++ b/cf/errors/model_already_exists_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type ModelAlreadyExistsError struct { diff --git a/cf/errors/model_not_found_error.go b/cf/errors/model_not_found_error.go index d41611978d..0ca7acf811 100644 --- a/cf/errors/model_not_found_error.go +++ b/cf/errors/model_not_found_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type ModelNotFoundError struct { diff --git a/cf/errors/not_authorized_error.go b/cf/errors/not_authorized_error.go index 4e9160bde1..af012463d6 100644 --- a/cf/errors/not_authorized_error.go +++ b/cf/errors/not_authorized_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type NotAuthorizedError struct { diff --git a/cf/errors/service_association_error.go b/cf/errors/service_association_error.go index 34ae899c03..c0d5d2b2cc 100644 --- a/cf/errors/service_association_error.go +++ b/cf/errors/service_association_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type ServiceAssociationError struct { diff --git a/cf/errors/unbindable_service_error.go b/cf/errors/unbindable_service_error.go index 35a788a9a1..9564a7dc74 100644 --- a/cf/errors/unbindable_service_error.go +++ b/cf/errors/unbindable_service_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type UnbindableServiceError struct { diff --git a/cf/flagcontext/flag_content_helper_test.go b/cf/flagcontext/flag_content_helper_test.go index c57324995b..65b1fd8ea8 100644 --- a/cf/flagcontext/flag_content_helper_test.go +++ b/cf/flagcontext/flag_content_helper_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/flagcontext" + "code.cloudfoundry.org/cli/v8/cf/flagcontext" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/flags/flag_constructor_test.go b/cf/flags/flag_constructor_test.go index fcdd89c291..ca5b124029 100644 --- a/cf/flags/flag_constructor_test.go +++ b/cf/flags/flag_constructor_test.go @@ -1,7 +1,7 @@ package flags_test import ( - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/flags/flags_test.go b/cf/flags/flags_test.go index 1e744afe6b..fb6545a891 100644 --- a/cf/flags/flags_test.go +++ b/cf/flags/flags_test.go @@ -1,7 +1,7 @@ package flags_test import ( - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/flags" . "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 56851007ec..27650bd950 100644 --- a/cf/flags/flags_usage_test.go +++ b/cf/flags/flags_usage_test.go @@ -3,7 +3,7 @@ package flags_test import ( "strings" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bools.go b/cf/formatters/bools.go index 4ce3d0c841..9866429469 100644 --- a/cf/formatters/bools.go +++ b/cf/formatters/bools.go @@ -1,7 +1,7 @@ package formatters import ( - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) func Allowed(allowed bool) string { diff --git a/cf/formatters/bools_test.go b/cf/formatters/bools_test.go index 4074e130d5..183b468b8b 100644 --- a/cf/formatters/bools_test.go +++ b/cf/formatters/bools_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bytes.go b/cf/formatters/bytes.go index bdd76a65c2..50a360564c 100644 --- a/cf/formatters/bytes.go +++ b/cf/formatters/bytes.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) const ( diff --git a/cf/formatters/bytes_test.go b/cf/formatters/bytes_test.go index 0e486e37a5..45c34645ee 100644 --- a/cf/formatters/bytes_test.go +++ b/cf/formatters/bytes_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/formatters" . "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 cfc282f00a..79753b0e76 100644 --- a/cf/formatters/formatters_suite_test.go +++ b/cf/formatters/formatters_suite_test.go @@ -1,8 +1,8 @@ package formatters_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/formatters/memoryLimit_test.go b/cf/formatters/memoryLimit_test.go index 12e1af7f47..5a1cb3233e 100644 --- a/cf/formatters/memoryLimit_test.go +++ b/cf/formatters/memoryLimit_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/help/help.go b/cf/help/help.go index bb992977d6..7f243e4963 100644 --- a/cf/help/help.go +++ b/cf/help/help.go @@ -11,13 +11,13 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/version" ) type appPresenter struct { @@ -64,7 +64,7 @@ func newAppPresenter() appPresenter { pluginConfig := pluginconfig.NewPluginConfig( func(err error) { - //fail silently when running help + // fail silently when running help }, configuration.NewDiskPersistor(filepath.Join(pluginPath, "config.json")), pluginPath, diff --git a/cf/help/help_suite_test.go b/cf/help/help_suite_test.go index 8c631e6d77..c05359e640 100644 --- a/cf/help/help_suite_test.go +++ b/cf/help/help_suite_test.go @@ -1,7 +1,7 @@ package help_test import ( - "code.cloudfoundry.org/cli/cf/commandsloader" + "code.cloudfoundry.org/cli/v8/cf/commandsloader" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/help/help_test.go b/cf/help/help_test.go index 83a2c269be..407f5ab380 100644 --- a/cf/help/help_test.go +++ b/cf/help/help_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/cf/help" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v8/cf/help" - "code.cloudfoundry.org/cli/cf/util/testhelpers/io" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/io" "os" diff --git a/cf/help/template.go b/cf/help/template.go index 850480fd58..f4b57044ec 100644 --- a/cf/help/template.go +++ b/cf/help/template.go @@ -1,6 +1,6 @@ package help -import . "code.cloudfoundry.org/cli/cf/i18n" +import . "code.cloudfoundry.org/cli/v8/cf/i18n" func GetHelpTemplate() string { return `{{.Title "` + T("NAME:") + `"}} diff --git a/cf/i18n/i18n.go b/cf/i18n/i18n.go index 4084738e99..7d680aa6a5 100644 --- a/cf/i18n/i18n.go +++ b/cf/i18n/i18n.go @@ -1,6 +1,6 @@ package i18n -import "code.cloudfoundry.org/cli/util/ui" +import "code.cloudfoundry.org/cli/v8/util/ui" var T ui.TranslateFunc diff --git a/cf/i18n/locale.go b/cf/i18n/locale.go index 3857d1e42d..1db267f2b2 100644 --- a/cf/i18n/locale.go +++ b/cf/i18n/locale.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "code.cloudfoundry.org/cli/i18n/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/i18n/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) const resourceSuffix = ".all.json" diff --git a/cf/i18n/locale_test.go b/cf/i18n/locale_test.go index df8781dd85..9e1242bac0 100644 --- a/cf/i18n/locale_test.go +++ b/cf/i18n/locale_test.go @@ -1,7 +1,7 @@ package i18n_test import ( - "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/manifest/generate_manifest.go b/cf/manifest/generate_manifest.go index 6a8a9eb68c..2667468a86 100644 --- a/cf/manifest/generate_manifest.go +++ b/cf/manifest/generate_manifest.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" "gopkg.in/yaml.v2" "io" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . App diff --git a/cf/manifest/generate_manifest_test.go b/cf/manifest/generate_manifest_test.go index 78e3559926..609e37fdc0 100644 --- a/cf/manifest/generate_manifest_test.go +++ b/cf/manifest/generate_manifest_test.go @@ -5,7 +5,7 @@ import ( "bytes" - . "code.cloudfoundry.org/cli/cf/manifest" + . "code.cloudfoundry.org/cli/v8/cf/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/manifest/manifest.go b/cf/manifest/manifest.go index 4d959ae5a0..5b363c80fe 100644 --- a/cf/manifest/manifest.go +++ b/cf/manifest/manifest.go @@ -7,12 +7,12 @@ import ( "regexp" "strconv" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/util/generic" - "code.cloudfoundry.org/cli/util/randomword" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v8/util/randomword" ) type Manifest struct { diff --git a/cf/manifest/manifest_disk_repository.go b/cf/manifest/manifest_disk_repository.go index 166e3202bd..711e13ad18 100644 --- a/cf/manifest/manifest_disk_repository.go +++ b/cf/manifest/manifest_disk_repository.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/util/generic" "gopkg.in/yaml.v2" ) diff --git a/cf/manifest/manifest_disk_repository_test.go b/cf/manifest/manifest_disk_repository_test.go index b59abaf8a5..f1a5cc95cd 100644 --- a/cf/manifest/manifest_disk_repository_test.go +++ b/cf/manifest/manifest_disk_repository_test.go @@ -3,7 +3,7 @@ package manifest_test import ( "path/filepath" - . "code.cloudfoundry.org/cli/cf/manifest" + . "code.cloudfoundry.org/cli/v8/cf/manifest" . "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 3e0fb18b5c..6568217197 100644 --- a/cf/manifest/manifest_suite_test.go +++ b/cf/manifest/manifest_suite_test.go @@ -1,8 +1,8 @@ package manifest_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/manifest/manifest_test.go b/cf/manifest/manifest_test.go index aa31a10414..24111d6023 100644 --- a/cf/manifest/manifest_test.go +++ b/cf/manifest/manifest_test.go @@ -4,12 +4,12 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/cf/manifest" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" ) func NewManifest(path string, data generic.Map) (m *manifest.Manifest) { diff --git a/cf/manifest/manifestfakes/fake_app.go b/cf/manifest/manifestfakes/fake_app.go index 54860590aa..dba3ad5bb8 100644 --- a/cf/manifest/manifestfakes/fake_app.go +++ b/cf/manifest/manifestfakes/fake_app.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/cf/manifest" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/manifest" + "code.cloudfoundry.org/cli/v8/cf/models" ) type FakeApp struct { diff --git a/cf/manifest/manifestfakes/fake_repository.go b/cf/manifest/manifestfakes/fake_repository.go index a87be0e286..e1783a74de 100644 --- a/cf/manifest/manifestfakes/fake_repository.go +++ b/cf/manifest/manifestfakes/fake_repository.go @@ -4,7 +4,7 @@ package manifestfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/manifest" + "code.cloudfoundry.org/cli/v8/cf/manifest" ) type FakeRepository struct { diff --git a/cf/models/application_test.go b/cf/models/application_test.go index ea7ad0ac17..4fe59542b6 100644 --- a/cf/models/application_test.go +++ b/cf/models/application_test.go @@ -3,7 +3,7 @@ package models_test import ( "os" - . "code.cloudfoundry.org/cli/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/domain_test.go b/cf/models/domain_test.go index 251fa43990..e270b3bff1 100644 --- a/cf/models/domain_test.go +++ b/cf/models/domain_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/route_summary_test.go b/cf/models/route_summary_test.go index 8b69e271ae..33ae0c7451 100644 --- a/cf/models/route_summary_test.go +++ b/cf/models/route_summary_test.go @@ -1,7 +1,7 @@ package models_test import ( - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/models/route_test.go b/cf/models/route_test.go index 9772ba8ac0..a93e1d27ea 100644 --- a/cf/models/route_test.go +++ b/cf/models/route_test.go @@ -1,7 +1,7 @@ package models_test import ( - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/models" . "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 c58f838128..ed211b871d 100644 --- a/cf/models/service_instance_test.go +++ b/cf/models/service_instance_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/models" . "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 af9d8510b9..c666483340 100644 --- a/cf/models/service_plan_test.go +++ b/cf/models/service_plan_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/space_quota.go b/cf/models/space_quota.go index 4edf2992ee..8b2adcc063 100644 --- a/cf/models/space_quota.go +++ b/cf/models/space_quota.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strconv" - "code.cloudfoundry.org/cli/cf/formatters" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type SpaceQuota struct { @@ -36,7 +36,7 @@ func (q SpaceQuota) FormattedInstanceMemoryLimit() string { func (q SpaceQuota) FormattedAppInstanceLimit() string { appInstanceLimit := T(UnlimitedDisplay) - if q.AppInstanceLimit != -1 { //TODO - figure out how to use resources.UnlimitedAppInstances + if q.AppInstanceLimit != -1 { // TODO - figure out how to use resources.UnlimitedAppInstances appInstanceLimit = strconv.Itoa(q.AppInstanceLimit) } diff --git a/cf/net/cloud_controller_gateway.go b/cf/net/cloud_controller_gateway.go index 449ccbf972..6ca8581d8b 100644 --- a/cf/net/cloud_controller_gateway.go +++ b/cf/net/cloud_controller_gateway.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" ) type ccErrorResponse struct { diff --git a/cf/net/cloud_controller_gateway_test.go b/cf/net/cloud_controller_gateway_test.go index cbf72f34db..a43863ea52 100644 --- a/cf/net/cloud_controller_gateway_test.go +++ b/cf/net/cloud_controller_gateway_test.go @@ -8,13 +8,13 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/gateway.go b/cf/net/gateway.go index 9a7ee4f701..4f2f5f2f72 100644 --- a/cf/net/gateway.go +++ b/cf/net/gateway.go @@ -17,13 +17,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v8/version" ) const ( diff --git a/cf/net/gateway_test.go b/cf/net/gateway_test.go index b1926c950f..7f97978e2d 100644 --- a/cf/net/gateway_test.go +++ b/cf/net/gateway_test.go @@ -15,16 +15,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/cf/api/authentication" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/net/netfakes" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "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" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/net/netfakes" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/net/http_client.go b/cf/net/http_client.go index 8f6411cd69..3201f9a14d 100644 --- a/cf/net/http_client.go +++ b/cf/net/http_client.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/i18n" "golang.org/x/net/websocket" ) diff --git a/cf/net/http_client_test.go b/cf/net/http_client_test.go index e1c5ff5c49..9379ebfea0 100644 --- a/cf/net/http_client_test.go +++ b/cf/net/http_client_test.go @@ -7,9 +7,9 @@ import ( "net/url" "syscall" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "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 8c16c8faf7..90ad9b50df 100644 --- a/cf/net/net_suite_test.go +++ b/cf/net/net_suite_test.go @@ -1,8 +1,8 @@ package net_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/net/netfakes/fake_httpclient_interface.go b/cf/net/netfakes/fake_httpclient_interface.go index 9040eef181..9035698a8c 100644 --- a/cf/net/netfakes/fake_httpclient_interface.go +++ b/cf/net/netfakes/fake_httpclient_interface.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/net" ) type FakeHTTPClientInterface struct { diff --git a/cf/net/netfakes/fake_request_dumper_interface.go b/cf/net/netfakes/fake_request_dumper_interface.go index 19350408b1..4f9b99978b 100644 --- a/cf/net/netfakes/fake_request_dumper_interface.go +++ b/cf/net/netfakes/fake_request_dumper_interface.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/net" ) type FakeRequestDumperInterface struct { diff --git a/cf/net/netfakes/fake_warning_producer.go b/cf/net/netfakes/fake_warning_producer.go index d21e536485..8f8d6340d1 100644 --- a/cf/net/netfakes/fake_warning_producer.go +++ b/cf/net/netfakes/fake_warning_producer.go @@ -4,7 +4,7 @@ package netfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/net" + "code.cloudfoundry.org/cli/v8/cf/net" ) type FakeWarningProducer struct { diff --git a/cf/net/progress_reader.go b/cf/net/progress_reader.go index 8716cafd98..61d20f5dcf 100644 --- a/cf/net/progress_reader.go +++ b/cf/net/progress_reader.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/cf/formatters" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/formatters" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type ProgressReader struct { @@ -67,8 +67,8 @@ func (progressReader *ProgressReader) printProgress(quit chan bool) { for { select { case <-quit: - //The spaces are there to ensure we overwrite the entire line - //before using the terminal printer to output Done Uploading + // The spaces are there to ensure we overwrite the entire line + // before using the terminal printer to output Done Uploading progressReader.ui.PrintCapturingNoOutput("\r ") progressReader.ui.Say("\rDone uploading") return diff --git a/cf/net/progress_reader_test.go b/cf/net/progress_reader_test.go index 3f5fecb951..f34e5898dc 100644 --- a/cf/net/progress_reader_test.go +++ b/cf/net/progress_reader_test.go @@ -7,8 +7,8 @@ import ( "os" "time" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" + . "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/request_dumper.go b/cf/net/request_dumper.go index 1867011484..ba8a77b244 100644 --- a/cf/net/request_dumper.go +++ b/cf/net/request_dumper.go @@ -11,10 +11,10 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v8/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestDumperInterface diff --git a/cf/net/request_dumper_test.go b/cf/net/request_dumper_test.go index 97ff4513b4..43db9036be 100644 --- a/cf/net/request_dumper_test.go +++ b/cf/net/request_dumper_test.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/trace" + . "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/trace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/routing_api_gateway.go b/cf/net/routing_api_gateway.go index c186a87c1d..d07e97c8b3 100644 --- a/cf/net/routing_api_gateway.go +++ b/cf/net/routing_api_gateway.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" ) type errorResponse struct { diff --git a/cf/net/routing_api_gateway_test.go b/cf/net/routing_api_gateway_test.go index 86e1d57c71..94d4dcb5a2 100644 --- a/cf/net/routing_api_gateway_test.go +++ b/cf/net/routing_api_gateway_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/uaa_gateway.go b/cf/net/uaa_gateway.go index 29d9105062..ee2b3294b1 100644 --- a/cf/net/uaa_gateway.go +++ b/cf/net/uaa_gateway.go @@ -4,10 +4,10 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" ) type uaaErrorResponse struct { diff --git a/cf/net/uaa_gateway_test.go b/cf/net/uaa_gateway_test.go index 79b92ca1f9..16bc93d9c6 100644 --- a/cf/net/uaa_gateway_test.go +++ b/cf/net/uaa_gateway_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - . "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + . "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/warnings_collector.go b/cf/net/warnings_collector.go index 0ae16613dc..591a096b28 100644 --- a/cf/net/warnings_collector.go +++ b/cf/net/warnings_collector.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) const DeprecatedEndpointWarning = "Endpoint deprecated" diff --git a/cf/net/warnings_collector_test.go b/cf/net/warnings_collector_test.go index 81d434e908..ac6e5527eb 100644 --- a/cf/net/warnings_collector_test.go +++ b/cf/net/warnings_collector_test.go @@ -3,9 +3,9 @@ package net_test import ( "os" - "code.cloudfoundry.org/cli/cf/net" - "code.cloudfoundry.org/cli/cf/net/netfakes" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v8/cf/net/netfakes" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/api_endpoint.go b/cf/requirements/api_endpoint.go index 6208289630..a27d0a68c7 100644 --- a/cf/requirements/api_endpoint.go +++ b/cf/requirements/api_endpoint.go @@ -5,10 +5,10 @@ import ( "errors" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type APIEndpointRequirement struct { diff --git a/cf/requirements/api_endpoint_test.go b/cf/requirements/api_endpoint_test.go index dd8ecd43f6..c4d6a702a2 100644 --- a/cf/requirements/api_endpoint_test.go +++ b/cf/requirements/api_endpoint_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/requirements" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/application.go b/cf/requirements/application.go index 3ce04a99cb..8159a5d00f 100644 --- a/cf/requirements/application.go +++ b/cf/requirements/application.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ApplicationRequirement diff --git a/cf/requirements/application_test.go b/cf/requirements/application_test.go index de87d9fe45..79168699b6 100644 --- a/cf/requirements/application_test.go +++ b/cf/requirements/application_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/buildpack.go b/cf/requirements/buildpack.go index 0f8981e3da..5958260a6d 100644 --- a/cf/requirements/buildpack.go +++ b/cf/requirements/buildpack.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BuildpackRequirement diff --git a/cf/requirements/buildpack_test.go b/cf/requirements/buildpack_test.go index b40e60e323..d6c4957460 100644 --- a/cf/requirements/buildpack_test.go +++ b/cf/requirements/buildpack_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/config_refreshing_requirement.go b/cf/requirements/config_refreshing_requirement.go index a6f46179b7..c14a57f99d 100644 --- a/cf/requirements/config_refreshing_requirement.go +++ b/cf/requirements/config_refreshing_requirement.go @@ -1,6 +1,6 @@ package requirements -import "code.cloudfoundry.org/cli/cf/configuration/coreconfig" +import "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" type configRefreshingRequirement struct { requirement Requirement diff --git a/cf/requirements/config_refreshing_requirement_test.go b/cf/requirements/config_refreshing_requirement_test.go index 3421504cc2..5624a212c6 100644 --- a/cf/requirements/config_refreshing_requirement_test.go +++ b/cf/requirements/config_refreshing_requirement_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v8/cf/requirements" "errors" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/dea_application.go b/cf/requirements/dea_application.go index 747c9d42e4..07cd2d1b28 100644 --- a/cf/requirements/dea_application.go +++ b/cf/requirements/dea_application.go @@ -1,10 +1,10 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api/applications" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/api/applications" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DEAApplicationRequirement diff --git a/cf/requirements/dea_application_test.go b/cf/requirements/dea_application_test.go index bc6b612223..3770ad3753 100644 --- a/cf/requirements/dea_application_test.go +++ b/cf/requirements/dea_application_test.go @@ -3,10 +3,10 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/domain.go b/cf/requirements/domain.go index 72d9d01d21..bbd1746a65 100644 --- a/cf/requirements/domain.go +++ b/cf/requirements/domain.go @@ -1,9 +1,9 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DomainRequirement diff --git a/cf/requirements/domain_test.go b/cf/requirements/domain_test.go index 20d31fc887..ae63f62e15 100644 --- a/cf/requirements/domain_test.go +++ b/cf/requirements/domain_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/factory.go b/cf/requirements/factory.go index 0e3d9cbcdc..cba1dfaccb 100644 --- a/cf/requirements/factory.go +++ b/cf/requirements/factory.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" "github.com/blang/semver/v4" ) diff --git a/cf/requirements/login.go b/cf/requirements/login.go index 05e54315a7..d7f1f724d1 100644 --- a/cf/requirements/login.go +++ b/cf/requirements/login.go @@ -3,8 +3,8 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type LoginRequirement struct { diff --git a/cf/requirements/login_test.go b/cf/requirements/login_test.go index 68e18fd0a9..883113afc6 100644 --- a/cf/requirements/login_test.go +++ b/cf/requirements/login_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" ) var _ = Describe("LoginRequirement", func() { diff --git a/cf/requirements/max_api_version.go b/cf/requirements/max_api_version.go index a93cd92399..9639145c27 100644 --- a/cf/requirements/max_api_version.go +++ b/cf/requirements/max_api_version.go @@ -3,10 +3,10 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" "github.com/blang/semver/v4" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type MaxAPIVersionRequirement struct { diff --git a/cf/requirements/max_api_version_test.go b/cf/requirements/max_api_version_test.go index 00d0465b34..32f0b7d9b9 100644 --- a/cf/requirements/max_api_version_test.go +++ b/cf/requirements/max_api_version_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" "github.com/blang/semver/v4" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/min_api_version.go b/cf/requirements/min_api_version.go index 063b00c7a7..48c6025965 100644 --- a/cf/requirements/min_api_version.go +++ b/cf/requirements/min_api_version.go @@ -3,10 +3,10 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" "github.com/blang/semver/v4" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type MinAPIVersionRequirement struct { diff --git a/cf/requirements/min_api_version_test.go b/cf/requirements/min_api_version_test.go index 4041ed3720..aa1c58b507 100644 --- a/cf/requirements/min_api_version_test.go +++ b/cf/requirements/min_api_version_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" "github.com/blang/semver/v4" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/number_arguments.go b/cf/requirements/number_arguments.go index 36672dabf6..fe21784c1a 100644 --- a/cf/requirements/number_arguments.go +++ b/cf/requirements/number_arguments.go @@ -3,7 +3,7 @@ package requirements import ( "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type NumberArguments struct { diff --git a/cf/requirements/number_arguments_test.go b/cf/requirements/number_arguments_test.go index 6e1e8e82fb..06564365f1 100644 --- a/cf/requirements/number_arguments_test.go +++ b/cf/requirements/number_arguments_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/organization.go b/cf/requirements/organization.go index 96d1c8d800..54dbd02d3f 100644 --- a/cf/requirements/organization.go +++ b/cf/requirements/organization.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api/organizations" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrganizationRequirement diff --git a/cf/requirements/organization_test.go b/cf/requirements/organization_test.go index 6830194f6f..052e50e14f 100644 --- a/cf/requirements/organization_test.go +++ b/cf/requirements/organization_test.go @@ -3,9 +3,9 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "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 410c11929d..7e89ce0829 100644 --- a/cf/requirements/requirements_suite_test.go +++ b/cf/requirements/requirements_suite_test.go @@ -1,8 +1,8 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/requirements_test.go b/cf/requirements/requirements_test.go index bda87e4e11..30cf87780a 100644 --- a/cf/requirements/requirements_test.go +++ b/cf/requirements/requirements_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" "errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/requirementsfakes/fake_application_requirement.go b/cf/requirements/requirementsfakes/fake_application_requirement.go index b165f5a7c2..7762e98631 100644 --- a/cf/requirements/requirementsfakes/fake_application_requirement.go +++ b/cf/requirements/requirementsfakes/fake_application_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeApplicationRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_buildpack_requirement.go b/cf/requirements/requirementsfakes/fake_buildpack_requirement.go index 531ae8e059..1717925f6c 100644 --- a/cf/requirements/requirementsfakes/fake_buildpack_requirement.go +++ b/cf/requirements/requirementsfakes/fake_buildpack_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeBuildpackRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_config_refresher.go b/cf/requirements/requirementsfakes/fake_config_refresher.go index 2a602ba115..e2aa005bec 100644 --- a/cf/requirements/requirementsfakes/fake_config_refresher.go +++ b/cf/requirements/requirementsfakes/fake_config_refresher.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeConfigRefresher struct { diff --git a/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go b/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go index 282f0047e0..7c59dd7840 100644 --- a/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go +++ b/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeDEAApplicationRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_domain_requirement.go b/cf/requirements/requirementsfakes/fake_domain_requirement.go index 0e1bdca81d..e564627414 100644 --- a/cf/requirements/requirementsfakes/fake_domain_requirement.go +++ b/cf/requirements/requirementsfakes/fake_domain_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeDomainRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_factory.go b/cf/requirements/requirementsfakes/fake_factory.go index 2eadc27b03..89ead2c992 100644 --- a/cf/requirements/requirementsfakes/fake_factory.go +++ b/cf/requirements/requirementsfakes/fake_factory.go @@ -4,7 +4,7 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements" "github.com/blang/semver/v4" ) diff --git a/cf/requirements/requirementsfakes/fake_organization_requirement.go b/cf/requirements/requirementsfakes/fake_organization_requirement.go index c9b1752a1e..446af1263f 100644 --- a/cf/requirements/requirementsfakes/fake_organization_requirement.go +++ b/cf/requirements/requirementsfakes/fake_organization_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeOrganizationRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_requirement.go b/cf/requirements/requirementsfakes/fake_requirement.go index 0ebc0b1a93..f5d897c5ec 100644 --- a/cf/requirements/requirementsfakes/fake_requirement.go +++ b/cf/requirements/requirementsfakes/fake_requirement.go @@ -4,7 +4,7 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_service_instance_requirement.go b/cf/requirements/requirementsfakes/fake_service_instance_requirement.go index 52a9c81065..124c0a2275 100644 --- a/cf/requirements/requirementsfakes/fake_service_instance_requirement.go +++ b/cf/requirements/requirementsfakes/fake_service_instance_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeServiceInstanceRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_space_requirement.go b/cf/requirements/requirementsfakes/fake_space_requirement.go index 12758455c7..5943b014a7 100644 --- a/cf/requirements/requirementsfakes/fake_space_requirement.go +++ b/cf/requirements/requirementsfakes/fake_space_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeSpaceRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go b/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go index f4faa3ddb5..7e0fe42cec 100644 --- a/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go +++ b/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeTargetedOrgRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_user_requirement.go b/cf/requirements/requirementsfakes/fake_user_requirement.go index a8df833082..d5b640b015 100644 --- a/cf/requirements/requirementsfakes/fake_user_requirement.go +++ b/cf/requirements/requirementsfakes/fake_user_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeUserRequirement struct { diff --git a/cf/requirements/service_instance.go b/cf/requirements/service_instance.go index 7c4616934d..9df3ddde74 100644 --- a/cf/requirements/service_instance.go +++ b/cf/requirements/service_instance.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceInstanceRequirement diff --git a/cf/requirements/service_instance_test.go b/cf/requirements/service_instance_test.go index da16413408..8be9c42459 100644 --- a/cf/requirements/service_instance_test.go +++ b/cf/requirements/service_instance_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/space.go b/cf/requirements/space.go index 7f56ba5aed..5fd82d1170 100644 --- a/cf/requirements/space.go +++ b/cf/requirements/space.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api/spaces" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api/spaces" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRequirement diff --git a/cf/requirements/space_test.go b/cf/requirements/space_test.go index 99cb6a34c8..6355006389 100644 --- a/cf/requirements/space_test.go +++ b/cf/requirements/space_test.go @@ -3,9 +3,9 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/targeted_organization.go b/cf/requirements/targeted_organization.go index adf4469ecf..872bf3deb4 100644 --- a/cf/requirements/targeted_organization.go +++ b/cf/requirements/targeted_organization.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . TargetedOrgRequirement diff --git a/cf/requirements/targeted_organization_test.go b/cf/requirements/targeted_organization_test.go index 6ffa2bde52..27cfbb4745 100644 --- a/cf/requirements/targeted_organization_test.go +++ b/cf/requirements/targeted_organization_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/targeted_space.go b/cf/requirements/targeted_space.go index 7f0bc55bba..66a3fb2459 100644 --- a/cf/requirements/targeted_space.go +++ b/cf/requirements/targeted_space.go @@ -5,10 +5,10 @@ import ( "errors" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type TargetedSpaceRequirement struct { diff --git a/cf/requirements/targeted_space_test.go b/cf/requirements/targeted_space_test.go index 09e5ecae3d..fbdaa4d13e 100644 --- a/cf/requirements/targeted_space_test.go +++ b/cf/requirements/targeted_space_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - . "code.cloudfoundry.org/cli/cf/requirements" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v8/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/unsupported_legacy_flag.go b/cf/requirements/unsupported_legacy_flag.go index 3b67eacd83..e944a34b4e 100644 --- a/cf/requirements/unsupported_legacy_flag.go +++ b/cf/requirements/unsupported_legacy_flag.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type UnsupportedLegacyFlagRequirement struct { diff --git a/cf/requirements/unsupported_legacy_flag_test.go b/cf/requirements/unsupported_legacy_flag_test.go index 1cd17b8b50..9ff70d2396 100644 --- a/cf/requirements/unsupported_legacy_flag_test.go +++ b/cf/requirements/unsupported_legacy_flag_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/usage_requirement.go b/cf/requirements/usage_requirement.go index ac2f2197d8..37ec7e108b 100644 --- a/cf/requirements/usage_requirement.go +++ b/cf/requirements/usage_requirement.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) type RequirementFunction func() error diff --git a/cf/requirements/usage_requirement_test.go b/cf/requirements/usage_requirement_test.go index 67bfe9d770..5955a82c70 100644 --- a/cf/requirements/usage_requirement_test.go +++ b/cf/requirements/usage_requirement_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v8/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/user.go b/cf/requirements/user.go index 298231fea0..adf1525dbd 100644 --- a/cf/requirements/user.go +++ b/cf/requirements/user.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserRequirement diff --git a/cf/requirements/user_test.go b/cf/requirements/user_test.go index cc3956c168..5e1b2b6e32 100644 --- a/cf/requirements/user_test.go +++ b/cf/requirements/user_test.go @@ -3,10 +3,10 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v8/cf/api/apifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/options/ssh_options.go b/cf/ssh/options/ssh_options.go index a4976a538c..c1b2550fc2 100644 --- a/cf/ssh/options/ssh_options.go +++ b/cf/ssh/options/ssh_options.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/flags" ) type TTYRequest int diff --git a/cf/ssh/options/ssh_options_test.go b/cf/ssh/options/ssh_options_test.go index 914e3fcf35..29a46fd504 100644 --- a/cf/ssh/options/ssh_options_test.go +++ b/cf/ssh/options/ssh_options_test.go @@ -1,8 +1,8 @@ package options_test import ( - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/ssh/options" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/ssh/options" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/ssh.go b/cf/ssh/ssh.go index 68fbd5bf50..ef4c51b28d 100644 --- a/cf/ssh/ssh.go +++ b/cf/ssh/ssh.go @@ -19,10 +19,10 @@ import ( "golang.org/x/crypto/ssh" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/ssh/options" - "code.cloudfoundry.org/cli/cf/ssh/sigwinch" - "code.cloudfoundry.org/cli/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/ssh/options" + "code.cloudfoundry.org/cli/v8/cf/ssh/sigwinch" + "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" "github.com/moby/term" ) diff --git a/cf/ssh/ssh_test.go b/cf/ssh/ssh_test.go index f356f215f7..71f1800dc3 100644 --- a/cf/ssh/ssh_test.go +++ b/cf/ssh/ssh_test.go @@ -16,12 +16,12 @@ import ( "syscall" "time" - "code.cloudfoundry.org/cli/cf/models" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" - "code.cloudfoundry.org/cli/cf/ssh/options" - "code.cloudfoundry.org/cli/cf/ssh/sshfakes" - "code.cloudfoundry.org/cli/cf/ssh/terminal" - "code.cloudfoundry.org/cli/cf/ssh/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/models" + sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" + "code.cloudfoundry.org/cli/v8/cf/ssh/options" + "code.cloudfoundry.org/cli/v8/cf/ssh/sshfakes" + "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v8/cf/ssh/terminal/terminalfakes" "code.cloudfoundry.org/diego-ssh/server" fake_server "code.cloudfoundry.org/diego-ssh/server/fakes" "code.cloudfoundry.org/diego-ssh/test_helpers" diff --git a/cf/ssh/sshfakes/fake_listener_factory.go b/cf/ssh/sshfakes/fake_listener_factory.go index 2f378cdbf8..de9ed83151 100644 --- a/cf/ssh/sshfakes/fake_listener_factory.go +++ b/cf/ssh/sshfakes/fake_listener_factory.go @@ -5,7 +5,7 @@ import ( "net" "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" ) type FakeListenerFactory struct { diff --git a/cf/ssh/sshfakes/fake_secure_client.go b/cf/ssh/sshfakes/fake_secure_client.go index d2df9c7d0a..f2c7c01719 100644 --- a/cf/ssh/sshfakes/fake_secure_client.go +++ b/cf/ssh/sshfakes/fake_secure_client.go @@ -5,7 +5,7 @@ import ( "net" "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" "golang.org/x/crypto/ssh" ) diff --git a/cf/ssh/sshfakes/fake_secure_dialer.go b/cf/ssh/sshfakes/fake_secure_dialer.go index d7fdc1d40d..a483a81e8a 100644 --- a/cf/ssh/sshfakes/fake_secure_dialer.go +++ b/cf/ssh/sshfakes/fake_secure_dialer.go @@ -4,7 +4,7 @@ package sshfakes import ( "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" "golang.org/x/crypto/ssh" ) diff --git a/cf/ssh/sshfakes/fake_secure_session.go b/cf/ssh/sshfakes/fake_secure_session.go index 16a44a3944..c428b59ef9 100644 --- a/cf/ssh/sshfakes/fake_secure_session.go +++ b/cf/ssh/sshfakes/fake_secure_session.go @@ -5,7 +5,7 @@ import ( "io" "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" "golang.org/x/crypto/ssh" ) diff --git a/cf/ssh/sshfakes/fake_secure_shell.go b/cf/ssh/sshfakes/fake_secure_shell.go index 35dfa9f51f..46d02598aa 100644 --- a/cf/ssh/sshfakes/fake_secure_shell.go +++ b/cf/ssh/sshfakes/fake_secure_shell.go @@ -4,8 +4,8 @@ package sshfakes import ( "sync" - sshCmd "code.cloudfoundry.org/cli/cf/ssh" - "code.cloudfoundry.org/cli/cf/ssh/options" + sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" + "code.cloudfoundry.org/cli/v8/cf/ssh/options" ) type FakeSecureShell struct { diff --git a/cf/ssh/terminal/helper_test.go b/cf/ssh/terminal/helper_test.go index 9c24343540..2fa91f14ab 100644 --- a/cf/ssh/terminal/helper_test.go +++ b/cf/ssh/terminal/helper_test.go @@ -1,7 +1,7 @@ package terminal_test import ( - "code.cloudfoundry.org/cli/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go b/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go index 82bb9d228b..e5ab97cabf 100644 --- a/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go +++ b/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" "github.com/moby/term" ) diff --git a/cf/terminal/color_test.go b/cf/terminal/color_test.go index a69a675b6b..717b30ae1f 100644 --- a/cf/terminal/color_test.go +++ b/cf/terminal/color_test.go @@ -3,7 +3,7 @@ package terminal_test import ( "os" - . "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v8/cf/terminal" "github.com/fatih/color" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/terminal/table_test.go b/cf/terminal/table_test.go index 542c1e7bce..0263a591ed 100644 --- a/cf/terminal/table_test.go +++ b/cf/terminal/table_test.go @@ -4,8 +4,8 @@ import ( "bytes" "strings" - . "code.cloudfoundry.org/cli/cf/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/terminal" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 da6d70eb76..c31d7076d1 100644 --- a/cf/terminal/tee_printer_test.go +++ b/cf/terminal/tee_printer_test.go @@ -3,9 +3,9 @@ package terminal_test import ( "os" - . "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v8/cf/terminal" - io_helpers "code.cloudfoundry.org/cli/cf/util/testhelpers/io" + io_helpers "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/io" . "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 611d5c1b14..9d70dd83c1 100644 --- a/cf/terminal/terminal_suite_test.go +++ b/cf/terminal/terminal_suite_test.go @@ -1,8 +1,8 @@ package terminal_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/terminal/terminalfakes/fake_ui.go b/cf/terminal/terminalfakes/fake_ui.go index dda18707b1..de886b060b 100644 --- a/cf/terminal/terminalfakes/fake_ui.go +++ b/cf/terminal/terminalfakes/fake_ui.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type FakeUI struct { diff --git a/cf/terminal/ui.go b/cf/terminal/ui.go index 18df1937bd..4802c418eb 100644 --- a/cf/terminal/ui.go +++ b/cf/terminal/ui.go @@ -5,15 +5,15 @@ import ( "io" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" "bytes" "bufio" - "code.cloudfoundry.org/cli/cf" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/trace" ) type ColoringFunction func(value string, row int, col int) string diff --git a/cf/terminal/ui_test.go b/cf/terminal/ui_test.go index 33e803c49b..4b37f70165 100644 --- a/cf/terminal/ui_test.go +++ b/cf/terminal/ui_test.go @@ -6,18 +6,18 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - io_helpers "code.cloudfoundry.org/cli/cf/util/testhelpers/io" - newUI "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/cf/trace" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + io_helpers "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/io" + newUI "code.cloudfoundry.org/cli/v8/util/ui" + + . "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/trace" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/cf/terminal/ui_unix.go b/cf/terminal/ui_unix.go index 08ccdfbdd4..652ac88f18 100644 --- a/cf/terminal/ui_unix.go +++ b/cf/terminal/ui_unix.go @@ -13,7 +13,7 @@ import ( "strings" "syscall" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) const ( diff --git a/cf/trace/combined_printer_test.go b/cf/trace/combined_printer_test.go index 33d4dc420d..f23f0f2a6a 100644 --- a/cf/trace/combined_printer_test.go +++ b/cf/trace/combined_printer_test.go @@ -1,9 +1,9 @@ package trace_test import ( - . "code.cloudfoundry.org/cli/cf/trace" + . "code.cloudfoundry.org/cli/v8/cf/trace" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/trace/logger_provider.go b/cf/trace/logger_provider.go index 6337b0dbd5..61a0da76b0 100644 --- a/cf/trace/logger_provider.go +++ b/cf/trace/logger_provider.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) func NewLogger(writer io.Writer, verbose bool, boolsOrPaths ...string) Printer { diff --git a/cf/trace/logger_provider_test.go b/cf/trace/logger_provider_test.go index 2e1198fd44..3850af0623 100644 --- a/cf/trace/logger_provider_test.go +++ b/cf/trace/logger_provider_test.go @@ -5,7 +5,7 @@ import ( "path" "runtime" - . "code.cloudfoundry.org/cli/cf/trace" + . "code.cloudfoundry.org/cli/v8/cf/trace" "code.cloudfoundry.org/gofileutils/fileutils" "os" diff --git a/cf/trace/trace.go b/cf/trace/trace.go index 25addf1c26..701ea4c023 100644 --- a/cf/trace/trace.go +++ b/cf/trace/trace.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" ) var LoggingToStdout bool diff --git a/cf/trace/trace_suite_test.go b/cf/trace/trace_suite_test.go index c8c3731a11..528b61ef60 100644 --- a/cf/trace/trace_suite_test.go +++ b/cf/trace/trace_suite_test.go @@ -1,8 +1,8 @@ package trace_test import ( - "code.cloudfoundry.org/cli/cf/i18n" - "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/trace/trace_test.go b/cf/trace/trace_test.go index 3d5aa9f628..5994272e1a 100644 --- a/cf/trace/trace_test.go +++ b/cf/trace/trace_test.go @@ -1,7 +1,7 @@ package trace_test import ( - . "code.cloudfoundry.org/cli/cf/trace" + . "code.cloudfoundry.org/cli/v8/cf/trace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/trace/tracefakes/fake_printer.go b/cf/trace/tracefakes/fake_printer.go index af366fefc7..0d833d911c 100644 --- a/cf/trace/tracefakes/fake_printer.go +++ b/cf/trace/tracefakes/fake_printer.go @@ -4,7 +4,7 @@ package tracefakes import ( "sync" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v8/cf/trace" ) type FakePrinter struct { diff --git a/cf/uihelpers/tags_parser_test.go b/cf/uihelpers/tags_parser_test.go index 11e01e09f2..1660a04111 100644 --- a/cf/uihelpers/tags_parser_test.go +++ b/cf/uihelpers/tags_parser_test.go @@ -1,7 +1,7 @@ package uihelpers_test import ( - . "code.cloudfoundry.org/cli/cf/uihelpers" + . "code.cloudfoundry.org/cli/v8/cf/uihelpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/uihelpers/ui.go b/cf/uihelpers/ui.go index ca43771236..4aa24bf89e 100644 --- a/cf/uihelpers/ui.go +++ b/cf/uihelpers/ui.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) func ColoredAppState(app models.ApplicationFields) string { diff --git a/cf/util/downloader/file_download.go b/cf/util/downloader/file_download.go index 8f5c41e0e7..a6a71f80f4 100644 --- a/cf/util/downloader/file_download.go +++ b/cf/util/downloader/file_download.go @@ -1,7 +1,7 @@ package downloader import ( - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/util" "fmt" "io" "net/http" @@ -38,7 +38,7 @@ func (d *downloader) DownloadFile(url string) (int64, string, error) { CheckRedirect: func(r *http.Request, via []*http.Request) error { r.URL.Opaque = r.URL.Path - //some redirect return '/' as url + // some redirect return '/' as url if strings.Trim(r.URL.Opaque, "/") != "" { url = r.URL.Opaque } diff --git a/cf/util/downloader/file_download_test.go b/cf/util/downloader/file_download_test.go index 1cf3a440c8..19efd72b96 100644 --- a/cf/util/downloader/file_download_test.go +++ b/cf/util/downloader/file_download_test.go @@ -6,7 +6,7 @@ import ( "os" "path" - "code.cloudfoundry.org/cli/cf/util/downloader" + "code.cloudfoundry.org/cli/v8/cf/util/downloader" "github.com/onsi/gomega/ghttp" diff --git a/cf/util/json/json_parser_test.go b/cf/util/json/json_parser_test.go index 2a79a289ca..29c9f61854 100644 --- a/cf/util/json/json_parser_test.go +++ b/cf/util/json/json_parser_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/cf/util/json" + "code.cloudfoundry.org/cli/v8/cf/util/json" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/spellcheck/spellcheck_test.go b/cf/util/spellcheck/spellcheck_test.go index 40e4cb8cc2..970ac563f3 100644 --- a/cf/util/spellcheck/spellcheck_test.go +++ b/cf/util/spellcheck/spellcheck_test.go @@ -1,7 +1,7 @@ package spellcheck_test import ( - . "code.cloudfoundry.org/cli/cf/util/spellcheck" + . "code.cloudfoundry.org/cli/v8/cf/util/spellcheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/commands/requirements.go b/cf/util/testhelpers/commands/requirements.go index d000c04096..46cb966792 100644 --- a/cf/util/testhelpers/commands/requirements.go +++ b/cf/util/testhelpers/commands/requirements.go @@ -1,6 +1,6 @@ package commands -import "code.cloudfoundry.org/cli/cf/requirements" +import "code.cloudfoundry.org/cli/v8/cf/requirements" func RunRequirements(reqs []requirements.Requirement) error { var retErr error diff --git a/cf/util/testhelpers/commands/runner.go b/cf/util/testhelpers/commands/runner.go index 627ccd1fb6..56b30d0765 100644 --- a/cf/util/testhelpers/commands/runner.go +++ b/cf/util/testhelpers/commands/runner.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" ) type RunCommandResult int diff --git a/cf/util/testhelpers/configuration/access_token.go b/cf/util/testhelpers/configuration/access_token.go index 40819751fd..e57de6ff6f 100644 --- a/cf/util/testhelpers/configuration/access_token.go +++ b/cf/util/testhelpers/configuration/access_token.go @@ -9,7 +9,7 @@ import ( "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" ) func EncodeAccessToken(tokenInfo coreconfig.TokenInfo) (accessToken string, err error) { diff --git a/cf/util/testhelpers/configuration/fake_config_persistance.go b/cf/util/testhelpers/configuration/fake_config_persistance.go index 358217b660..e9222e60ce 100644 --- a/cf/util/testhelpers/configuration/fake_config_persistance.go +++ b/cf/util/testhelpers/configuration/fake_config_persistance.go @@ -1,8 +1,8 @@ package configuration import ( - "code.cloudfoundry.org/cli/cf/configuration" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" ) type FakePersistor struct { diff --git a/cf/util/testhelpers/configuration/test_config.go b/cf/util/testhelpers/configuration/test_config.go index 0c7f0341bc..3b3b8994f1 100644 --- a/cf/util/testhelpers/configuration/test_config.go +++ b/cf/util/testhelpers/configuration/test_config.go @@ -1,8 +1,8 @@ package configuration import ( - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" ) func NewRepository() coreconfig.Repository { diff --git a/cf/util/testhelpers/io/io_test.go b/cf/util/testhelpers/io/io_test.go index 505ee413ed..9fe0772c74 100644 --- a/cf/util/testhelpers/io/io_test.go +++ b/cf/util/testhelpers/io/io_test.go @@ -4,7 +4,7 @@ import ( "os" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/io" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/io" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/all_requests_called_matcher.go b/cf/util/testhelpers/matchers/all_requests_called_matcher.go index fe425529a5..e98bb9c7b6 100644 --- a/cf/util/testhelpers/matchers/all_requests_called_matcher.go +++ b/cf/util/testhelpers/matchers/all_requests_called_matcher.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - "code.cloudfoundry.org/cli/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/be_in_display_order.go b/cf/util/testhelpers/matchers/be_in_display_order.go index ed52746c5d..d58bb99f46 100644 --- a/cf/util/testhelpers/matchers/be_in_display_order.go +++ b/cf/util/testhelpers/matchers/be_in_display_order.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/terminal" "github.com/onsi/gomega" ) @@ -25,11 +25,11 @@ func (matcher *OrderMatcher) Match(actualStr interface{}) (success bool, err err return false, nil } - //loop and match, stop at last actual[0] line + // loop and match, stop at last actual[0] line for len(actual) > 1 { if matched, msg := matchSingleLine(actual[0], matcher.expected[0]); matched { if len(matcher.expected) == 1 { - return true, nil //no more expected to match, all passed + return true, nil // no more expected to match, all passed } matcher.expected = matcher.expected[1:] } else if msg != "" { @@ -39,7 +39,7 @@ func (matcher *OrderMatcher) Match(actualStr interface{}) (success bool, err err actual = actual[1:] } - //match the last actual line with the rest of expected + // match the last actual line with the rest of expected matched, msg := matchSingleLine(actual[0], matcher.expected[0]) if matched && len(matcher.expected) == 1 { return true, nil 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 168ddd8ec6..abf20f4c68 100644 --- a/cf/util/testhelpers/matchers/be_in_display_order_test.go +++ b/cf/util/testhelpers/matchers/be_in_display_order_test.go @@ -3,7 +3,7 @@ package matchers_test import ( "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 3d9ab6b1e9..606ad12196 100644 --- a/cf/util/testhelpers/matchers/contain_element_times_test.go +++ b/cf/util/testhelpers/matchers/contain_element_times_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 55f3363c1b..0500ff628a 100644 --- a/cf/util/testhelpers/matchers/contain_elements_in_order_test.go +++ b/cf/util/testhelpers/matchers/contain_elements_in_order_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/contain_substrings.go b/cf/util/testhelpers/matchers/contain_substrings.go index bc31c2149b..c1209d9362 100644 --- a/cf/util/testhelpers/matchers/contain_substrings.go +++ b/cf/util/testhelpers/matchers/contain_substrings.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/terminal" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/have_succeeded.go b/cf/util/testhelpers/matchers/have_succeeded.go index 1537fb7c48..917944400f 100644 --- a/cf/util/testhelpers/matchers/have_succeeded.go +++ b/cf/util/testhelpers/matchers/have_succeeded.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" "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 a058e4ea6e..127612e9cc 100644 --- a/cf/util/testhelpers/matchers/have_type_of_test.go +++ b/cf/util/testhelpers/matchers/have_type_of_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 723ebdc964..2a06e9f189 100644 --- a/cf/util/testhelpers/matchers/match_func_name_test.go +++ b/cf/util/testhelpers/matchers/match_func_name_test.go @@ -3,7 +3,7 @@ package matchers_test import ( "errors" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 aaaf2ec90c..a7f2dcdbc2 100644 --- a/cf/util/testhelpers/matchers/match_path_test.go +++ b/cf/util/testhelpers/matchers/match_path_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" "errors" . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/matchers/passed_requirements.go b/cf/util/testhelpers/matchers/passed_requirements.go index 0fce782996..1756c375bd 100644 --- a/cf/util/testhelpers/matchers/passed_requirements.go +++ b/cf/util/testhelpers/matchers/passed_requirements.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" + testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go b/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go index b234743de4..df15686d3f 100644 --- a/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go +++ b/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go @@ -4,9 +4,9 @@ package rpcserverfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/plugin" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v8/plugin" + plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" ) type FakeHandlers struct { diff --git a/cf/util/testhelpers/rpcserver/server.go b/cf/util/testhelpers/rpcserver/server.go index 8933195911..72eba1f645 100644 --- a/cf/util/testhelpers/rpcserver/server.go +++ b/cf/util/testhelpers/rpcserver/server.go @@ -9,8 +9,8 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/plugin" - "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v8/plugin/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Handlers diff --git a/cf/util/testhelpers/terminal/ui.go b/cf/util/testhelpers/terminal/ui.go index ec8a0cbd9c..2ac3ed5765 100644 --- a/cf/util/testhelpers/terminal/ui.go +++ b/cf/util/testhelpers/terminal/ui.go @@ -9,8 +9,8 @@ import ( "os" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - term "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + term "code.cloudfoundry.org/cli/v8/cf/terminal" ) type FakeUI struct { diff --git a/cf/util/utilfakes/fake_sha1checksum.go b/cf/util/utilfakes/fake_sha1checksum.go index 977e7cc7d4..1d9d065300 100644 --- a/cf/util/utilfakes/fake_sha1checksum.go +++ b/cf/util/utilfakes/fake_sha1checksum.go @@ -4,7 +4,7 @@ package utilfakes import ( "sync" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/util" ) type FakeSha1Checksum struct { diff --git a/command/api_version_warning.go b/command/api_version_warning.go index e4bb564f56..e53946fdf5 100644 --- a/command/api_version_warning.go +++ b/command/api_version_warning.go @@ -1,8 +1,8 @@ package command import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/version" "github.com/blang/semver/v4" ) diff --git a/command/api_version_warning_test.go b/command/api_version_warning_test.go index c8cd96b58f..6282e44f31 100644 --- a/command/api_version_warning_test.go +++ b/command/api_version_warning_test.go @@ -4,11 +4,11 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/version" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/commandfakes/fake_config.go b/command/commandfakes/fake_config.go index 2b7f1fe401..af04e7cb3a 100644 --- a/command/commandfakes/fake_config.go +++ b/command/commandfakes/fake_config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type FakeConfig struct { diff --git a/command/commandfakes/fake_shared_actor.go b/command/commandfakes/fake_shared_actor.go index fec3b1b77d..948372c2d7 100644 --- a/command/commandfakes/fake_shared_actor.go +++ b/command/commandfakes/fake_shared_actor.go @@ -4,7 +4,7 @@ package commandfakes import ( "sync" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v8/command" ) type FakeSharedActor struct { diff --git a/command/commandfakes/fake_ui.go b/command/commandfakes/fake_ui.go index d91cb62527..931226c8c2 100644 --- a/command/commandfakes/fake_ui.go +++ b/command/commandfakes/fake_ui.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/util/ui" ) type FakeUI struct { diff --git a/command/common/command_list_v7.go b/command/common/command_list_v7.go index f752d224ae..4bb960c8e3 100644 --- a/command/common/command_list_v7.go +++ b/command/common/command_list_v7.go @@ -3,8 +3,8 @@ package common import ( "reflect" - "code.cloudfoundry.org/cli/command/plugin" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/command/plugin" + v7 "code.cloudfoundry.org/cli/v8/command/v7" ) var Commands commandList diff --git a/command/common/command_list_v7_test.go b/command/common/command_list_v7_test.go index 23bfe58082..92fffb0f37 100644 --- a/command/common/command_list_v7_test.go +++ b/command/common/command_list_v7_test.go @@ -1,7 +1,7 @@ package common_test import ( - . "code.cloudfoundry.org/cli/command/common" + . "code.cloudfoundry.org/cli/v8/command/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/commonfakes/fake_help_actor.go b/command/common/commonfakes/fake_help_actor.go index ac130fb2f4..d982a9f618 100644 --- a/command/common/commonfakes/fake_help_actor.go +++ b/command/common/commonfakes/fake_help_actor.go @@ -4,8 +4,8 @@ package commonfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/command/common" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/command/common" ) type FakeHelpActor struct { diff --git a/command/common/commonfakes/fake_install_plugin_actor.go b/command/common/commonfakes/fake_install_plugin_actor.go index 3f6de0cf1d..8d5eeae77b 100644 --- a/command/common/commonfakes/fake_install_plugin_actor.go +++ b/command/common/commonfakes/fake_install_plugin_actor.go @@ -4,10 +4,10 @@ package commonfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type FakeInstallPluginActor struct { diff --git a/command/common/help_command.go b/command/common/help_command.go index 60aea1586d..41d337f371 100644 --- a/command/common/help_command.go +++ b/command/common/help_command.go @@ -5,12 +5,12 @@ import ( "math" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/common/internal" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/common/internal" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . HelpActor diff --git a/command/common/install_plugin_command.go b/command/common/install_plugin_command.go index b119bb6d1e..d176b56f9d 100644 --- a/command/common/install_plugin_command.go +++ b/command/common/install_plugin_command.go @@ -6,16 +6,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/plugin/shared" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/plugin/shared" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v8/util/configv3" log "github.com/sirupsen/logrus" ) diff --git a/command/common/install_plugin_command_test.go b/command/common/install_plugin_command_test.go index af2a80b01e..dd8f75504e 100644 --- a/command/common/install_plugin_command_test.go +++ b/command/common/install_plugin_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/common/commonfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/command/common/commonfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "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 a6d49af0ca..d7227281c2 100644 --- a/command/common/install_plugin_from_repo_command_test.go +++ b/command/common/install_plugin_from_repo_command_test.go @@ -8,18 +8,18 @@ import ( "os" "runtime" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/common/commonfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/command/common/commonfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/common/internal/help_all_display_test.go b/command/common/internal/help_all_display_test.go index bb93ffb9ce..8e0dd0e34a 100644 --- a/command/common/internal/help_all_display_test.go +++ b/command/common/internal/help_all_display_test.go @@ -4,8 +4,8 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/common/internal" + "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/command/common/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/internal/help_display.go b/command/common/internal/help_display.go index 55eb2c8748..d2b309a83e 100644 --- a/command/common/internal/help_display.go +++ b/command/common/internal/help_display.go @@ -5,9 +5,9 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/sorting" ) type HelpCategory struct { diff --git a/command/common/version_command.go b/command/common/version_command.go index 2b1e2ba867..9d5fe25a35 100644 --- a/command/common/version_command.go +++ b/command/common/version_command.go @@ -1,6 +1,6 @@ package common -import "code.cloudfoundry.org/cli/command" +import "code.cloudfoundry.org/cli/v8/command" type VersionCommand struct { usage interface{} `usage:"CF_NAME version\n\n 'cf -v' and 'cf --version' are also accepted."` diff --git a/command/common/version_command_test.go b/command/common/version_command_test.go index 9db08671ad..52c7a6295c 100644 --- a/command/common/version_command_test.go +++ b/command/common/version_command_test.go @@ -1,9 +1,9 @@ package common_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/config.go b/command/config.go index 676223c792..57f480e467 100644 --- a/command/config.go +++ b/command/config.go @@ -3,7 +3,7 @@ package command import ( "time" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/command/flag/app_type_test.go b/command/flag/app_type_test.go index cceaba6bea..017df82a18 100644 --- a/command/flag/app_type_test.go +++ b/command/flag/app_type_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "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 6bba5ef984..a0bc0596da 100644 --- a/command/flag/binding_name_test.go +++ b/command/flag/binding_name_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/buildpack.go b/command/flag/buildpack.go index 4dd9d9330b..2426791ad0 100644 --- a/command/flag/buildpack.go +++ b/command/flag/buildpack.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" ) type Buildpack struct { diff --git a/command/flag/buildpack_test.go b/command/flag/buildpack_test.go index 2910227b64..7fad2d7ab8 100644 --- a/command/flag/buildpack_test.go +++ b/command/flag/buildpack_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/bytes_with_unlimited.go b/command/flag/bytes_with_unlimited.go index 544378fdf4..4eeb64079f 100644 --- a/command/flag/bytes_with_unlimited.go +++ b/command/flag/bytes_with_unlimited.go @@ -6,7 +6,7 @@ import ( "strings" "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/bytes_with_unlimited_test.go b/command/flag/bytes_with_unlimited_test.go index 1a52f41216..15a5ce369b 100644 --- a/command/flag/bytes_with_unlimited_test.go +++ b/command/flag/bytes_with_unlimited_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/color_test.go b/command/flag/color_test.go index 2a007ba620..5851725384 100644 --- a/command/flag/color_test.go +++ b/command/flag/color_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/command.go b/command/flag/command.go index d041895392..1556e7353a 100644 --- a/command/flag/command.go +++ b/command/flag/command.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" ) type Command struct { diff --git a/command/flag/command_test.go b/command/flag/command_test.go index 522e43c56f..fb5f970329 100644 --- a/command/flag/command_test.go +++ b/command/flag/command_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/credentials_or_json.go b/command/flag/credentials_or_json.go index af667374f9..f4396cc60a 100644 --- a/command/flag/credentials_or_json.go +++ b/command/flag/credentials_or_json.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/credentials_or_json_test.go b/command/flag/credentials_or_json_test.go index aff6b28cf1..6631521b4e 100644 --- a/command/flag/credentials_or_json_test.go +++ b/command/flag/credentials_or_json_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/command/flag/deployment_strategy.go b/command/flag/deployment_strategy.go index 47ee1b52ee..0c034f8b37 100644 --- a/command/flag/deployment_strategy.go +++ b/command/flag/deployment_strategy.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" "github.com/jessevdk/go-flags" ) diff --git a/command/flag/deployment_strategy_test.go b/command/flag/deployment_strategy_test.go index 90ac3c0b1d..2ee856181f 100644 --- a/command/flag/deployment_strategy_test.go +++ b/command/flag/deployment_strategy_test.go @@ -1,8 +1,8 @@ package flag_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/docker_test.go b/command/flag/docker_test.go index ddfb59c896..c9d9a59f06 100644 --- a/command/flag/docker_test.go +++ b/command/flag/docker_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/droplet_test.go b/command/flag/droplet_test.go index 1d3f2562bb..714f6f4346 100644 --- a/command/flag/droplet_test.go +++ b/command/flag/droplet_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" . "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 30249af345..377b15a3ab 100644 --- a/command/flag/environment_variable_test.go +++ b/command/flag/environment_variable_test.go @@ -8,7 +8,7 @@ import ( "os" "strings" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/health_check_type.go b/command/flag/health_check_type.go index 203f36017c..e80834dc5a 100644 --- a/command/flag/health_check_type.go +++ b/command/flag/health_check_type.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/health_check_type_test.go b/command/flag/health_check_type_test.go index c381233924..f01aa4eaa0 100644 --- a/command/flag/health_check_type_test.go +++ b/command/flag/health_check_type_test.go @@ -1,8 +1,8 @@ package flag_test import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "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 21fbb12238..eb18d882e9 100644 --- a/command/flag/health_check_type_with_deprecated_value_test.go +++ b/command/flag/health_check_type_with_deprecated_value_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/instances.go b/command/flag/instances.go index 437042a903..d7ea3226b9 100644 --- a/command/flag/instances.go +++ b/command/flag/instances.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/instances_test.go b/command/flag/instances_test.go index 10dd691de6..5d53994f2e 100644 --- a/command/flag/instances_test.go +++ b/command/flag/instances_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/integer_limit.go b/command/flag/integer_limit.go index 1f5c925341..91df9f3997 100644 --- a/command/flag/integer_limit.go +++ b/command/flag/integer_limit.go @@ -3,7 +3,7 @@ package flag import ( "strconv" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/integer_limit_test.go b/command/flag/integer_limit_test.go index 9fae1ecc6b..1414e983a5 100644 --- a/command/flag/integer_limit_test.go +++ b/command/flag/integer_limit_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/locale.go b/command/flag/locale.go index d2cf1871ff..92b70ed2ee 100644 --- a/command/flag/locale.go +++ b/command/flag/locale.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v8/cf/i18n" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/locale_test.go b/command/flag/locale_test.go index 5209068bda..775e4a0c4c 100644 --- a/command/flag/locale_test.go +++ b/command/flag/locale_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/megabytes.go b/command/flag/megabytes.go index edb780c9b7..68b338a6cb 100644 --- a/command/flag/megabytes.go +++ b/command/flag/megabytes.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/bytefmt" flags "github.com/jessevdk/go-flags" diff --git a/command/flag/megabytes_test.go b/command/flag/megabytes_test.go index 6a43936dd3..117ee09a7c 100644 --- a/command/flag/megabytes_test.go +++ b/command/flag/megabytes_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/megabytes_with_unlimited.go b/command/flag/megabytes_with_unlimited.go index de5595cc99..f421a9df14 100644 --- a/command/flag/megabytes_with_unlimited.go +++ b/command/flag/megabytes_with_unlimited.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" ) type MegabytesWithUnlimited types.NullInt diff --git a/command/flag/megabytes_with_unlimited_test.go b/command/flag/megabytes_with_unlimited_test.go index cd4550df06..580924cd9e 100644 --- a/command/flag/megabytes_with_unlimited_test.go +++ b/command/flag/megabytes_with_unlimited_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "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 5f709893e9..0c055b6057 100644 --- a/command/flag/network_port_test.go +++ b/command/flag/network_port_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "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 ae7e99135e..a58f4177c2 100644 --- a/command/flag/network_protocol_test.go +++ b/command/flag/network_protocol_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/optional_string.go b/command/flag/optional_string.go index 030abed631..2ca8f7e403 100644 --- a/command/flag/optional_string.go +++ b/command/flag/optional_string.go @@ -1,6 +1,6 @@ package flag -import "code.cloudfoundry.org/cli/types" +import "code.cloudfoundry.org/cli/v8/types" type OptionalString types.OptionalString diff --git a/command/flag/optional_string_test.go b/command/flag/optional_string_test.go index 971337a7bc..098ca5116c 100644 --- a/command/flag/optional_string_test.go +++ b/command/flag/optional_string_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" . "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 6419d6ef93..a06f3f2eaa 100644 --- a/command/flag/org_role_test.go +++ b/command/flag/org_role_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/path.go b/command/flag/path.go index 610c2ddccc..9aa463a390 100644 --- a/command/flag/path.go +++ b/command/flag/path.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/manifestparser" "github.com/jessevdk/go-flags" ) diff --git a/command/flag/path_test.go b/command/flag/path_test.go index ddbb6f688e..e28c11e1a1 100644 --- a/command/flag/path_test.go +++ b/command/flag/path_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/port.go b/command/flag/port.go index 17d430ed36..e7bc7b6384 100644 --- a/command/flag/port.go +++ b/command/flag/port.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/port_test.go b/command/flag/port_test.go index 3a4c6e182f..a8d40839f3 100644 --- a/command/flag/port_test.go +++ b/command/flag/port_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" . "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 9154fb9ec9..8fb2774829 100644 --- a/command/flag/positive_integer_test.go +++ b/command/flag/positive_integer_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" ) var _ = Describe("Positive Integer", func() { diff --git a/command/flag/revision.go b/command/flag/revision.go index f800f8f955..ce4f15edcc 100644 --- a/command/flag/revision.go +++ b/command/flag/revision.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/revision_test.go b/command/flag/revision_test.go index 9fb898ec14..60a97c789e 100644 --- a/command/flag/revision_test.go +++ b/command/flag/revision_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" . "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 cbdc440c3f..0982b368ab 100644 --- a/command/flag/route_path_test.go +++ b/command/flag/route_path_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" . "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 1f7a61d075..238ac21073 100644 --- a/command/flag/security_group_lifecycle_test.go +++ b/command/flag/security_group_lifecycle_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "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 7a01de22c3..a630510cf2 100644 --- a/command/flag/space_role_test.go +++ b/command/flag/space_role_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "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 3d9c79708a..6070c60323 100644 --- a/command/flag/ssh_port_forwarding_test.go +++ b/command/flag/ssh_port_forwarding_test.go @@ -3,7 +3,7 @@ package flag_test import ( "fmt" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/command/flag/tags.go b/command/flag/tags.go index 961c94773c..5208dbdfb1 100644 --- a/command/flag/tags.go +++ b/command/flag/tags.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" ) type Tags types.OptionalStringSlice diff --git a/command/flag/tags_test.go b/command/flag/tags_test.go index 71a133cff3..de055e8d37 100644 --- a/command/flag/tags_test.go +++ b/command/flag/tags_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/timeout.go b/command/flag/timeout.go index 42250a543d..36fdcdc9c5 100644 --- a/command/flag/timeout.go +++ b/command/flag/timeout.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/timeout_test.go b/command/flag/timeout_test.go index 82245063c2..1ba970fbd0 100644 --- a/command/flag/timeout_test.go +++ b/command/flag/timeout_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" ) var _ = Describe("Timeout", func() { diff --git a/command/flag/trimmed_string_test.go b/command/flag/trimmed_string_test.go index c1345e32cb..803d73646d 100644 --- a/command/flag/trimmed_string_test.go +++ b/command/flag/trimmed_string_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v8/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/minimum_version_check.go b/command/minimum_version_check.go index 9fa7aebf7a..9cfbcd5737 100644 --- a/command/minimum_version_check.go +++ b/command/minimum_version_check.go @@ -1,7 +1,7 @@ package command import ( - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror" log "github.com/sirupsen/logrus" ) diff --git a/command/minimum_version_check_test.go b/command/minimum_version_check_test.go index 61aaa94450..4c06641ab5 100644 --- a/command/minimum_version_check_test.go +++ b/command/minimum_version_check_test.go @@ -1,9 +1,9 @@ package command_test import ( - . "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/version" + . "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/plugin/add_plugin_repo_command.go b/command/plugin/add_plugin_repo_command.go index 8c699b03a2..3f65777877 100644 --- a/command/plugin/add_plugin_repo_command.go +++ b/command/plugin/add_plugin_repo_command.go @@ -1,11 +1,11 @@ package plugin import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/plugin/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/plugin/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . AddPluginRepoActor diff --git a/command/plugin/add_plugin_repo_command_test.go b/command/plugin/add_plugin_repo_command_test.go index 1197642d20..f632d271a4 100644 --- a/command/plugin/add_plugin_repo_command_test.go +++ b/command/plugin/add_plugin_repo_command_test.go @@ -1,11 +1,11 @@ package plugin_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/plugin" - "code.cloudfoundry.org/cli/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/plugin" + "code.cloudfoundry.org/cli/v8/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/plugin/list_plugin_repos_command.go b/command/plugin/list_plugin_repos_command.go index a4f1288fd0..090e58687b 100644 --- a/command/plugin/list_plugin_repos_command.go +++ b/command/plugin/list_plugin_repos_command.go @@ -1,8 +1,8 @@ package plugin import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type ListPluginReposCommand struct { diff --git a/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go b/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go index 30a8dac4fc..8342afe78b 100644 --- a/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go +++ b/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go @@ -4,7 +4,7 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/command/plugin" + "code.cloudfoundry.org/cli/v8/command/plugin" ) type FakeAddPluginRepoActor struct { diff --git a/command/plugin/pluginfakes/fake_plugins_actor.go b/command/plugin/pluginfakes/fake_plugins_actor.go index d16659bf10..a72bda695f 100644 --- a/command/plugin/pluginfakes/fake_plugins_actor.go +++ b/command/plugin/pluginfakes/fake_plugins_actor.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command/plugin" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/command/plugin" ) type FakePluginsActor struct { diff --git a/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go b/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go index 45ea909241..33721abd80 100644 --- a/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go +++ b/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command/plugin" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/command/plugin" ) type FakeUninstallPluginActor struct { diff --git a/command/plugin/plugins_command.go b/command/plugin/plugins_command.go index 7c1a626c26..5c62a5968c 100644 --- a/command/plugin/plugins_command.go +++ b/command/plugin/plugins_command.go @@ -3,12 +3,12 @@ package plugin import ( "strings" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/plugin/shared" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/plugin/shared" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginsActor diff --git a/command/plugin/plugins_command_test.go b/command/plugin/plugins_command_test.go index 381a51a565..0505fe5a12 100644 --- a/command/plugin/plugins_command_test.go +++ b/command/plugin/plugins_command_test.go @@ -3,14 +3,14 @@ package plugin_test import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/plugin" - "code.cloudfoundry.org/cli/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/plugin" + "code.cloudfoundry.org/cli/v8/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/plugin/remove_plugin_repo_command.go b/command/plugin/remove_plugin_repo_command.go index db5c6d042c..6cb1800f55 100644 --- a/command/plugin/remove_plugin_repo_command.go +++ b/command/plugin/remove_plugin_repo_command.go @@ -1,9 +1,9 @@ package plugin import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type RemovePluginRepoCommand struct { diff --git a/command/plugin/repo_plugins_command.go b/command/plugin/repo_plugins_command.go index bbc825bddc..48f5f84362 100644 --- a/command/plugin/repo_plugins_command.go +++ b/command/plugin/repo_plugins_command.go @@ -1,8 +1,8 @@ package plugin import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type RepoPluginsCommand struct { diff --git a/command/plugin/shared/new_client.go b/command/plugin/shared/new_client.go index 01db4719a8..95e753a2a6 100644 --- a/command/plugin/shared/new_client.go +++ b/command/plugin/shared/new_client.go @@ -1,9 +1,9 @@ package shared import ( - "code.cloudfoundry.org/cli/api/plugin" - "code.cloudfoundry.org/cli/api/plugin/wrapper" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v8/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v8/command" ) // NewClient creates a new V2 Cloud Controller client and UAA client using the diff --git a/command/plugin/shared/rpc.go b/command/plugin/shared/rpc.go index 0565fc5b00..aeb631af69 100644 --- a/command/plugin/shared/rpc.go +++ b/command/plugin/shared/rpc.go @@ -8,10 +8,10 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/trace" - "code.cloudfoundry.org/cli/plugin/rpc" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v8/plugin/rpc" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type Config interface { diff --git a/command/plugin/uninstall_plugin_command.go b/command/plugin/uninstall_plugin_command.go index 05a32d962d..7a729f6ffa 100644 --- a/command/plugin/uninstall_plugin_command.go +++ b/command/plugin/uninstall_plugin_command.go @@ -1,12 +1,12 @@ package plugin import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/pluginaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/plugin/shared" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/plugin/shared" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UninstallPluginActor diff --git a/command/plugin/uninstall_plugin_command_test.go b/command/plugin/uninstall_plugin_command_test.go index ca15844dff..e1506084e2 100644 --- a/command/plugin/uninstall_plugin_command_test.go +++ b/command/plugin/uninstall_plugin_command_test.go @@ -4,13 +4,13 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/plugin" - "code.cloudfoundry.org/cli/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/plugin" + "code.cloudfoundry.org/cli/v8/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/translatableerror/convert_to_translatable_error.go b/command/translatableerror/convert_to_translatable_error.go index f8636a7c5e..fdb8578289 100644 --- a/command/translatableerror/convert_to_translatable_error.go +++ b/command/translatableerror/convert_to_translatable_error.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/util/clissh/ssherror" - "code.cloudfoundry.org/cli/util/download" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v8/util/download" + "code.cloudfoundry.org/cli/v8/util/manifest" log "github.com/sirupsen/logrus" ) diff --git a/command/translatableerror/convert_to_translatable_error_test.go b/command/translatableerror/convert_to_translatable_error_test.go index 5cb7603b8e..32dc4f96e2 100644 --- a/command/translatableerror/convert_to_translatable_error_test.go +++ b/command/translatableerror/convert_to_translatable_error_test.go @@ -5,14 +5,14 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/api/uaa" - . "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/clissh/ssherror" - "code.cloudfoundry.org/cli/util/download" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v8/api/uaa" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v8/util/download" + "code.cloudfoundry.org/cli/v8/util/manifest" . "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 8d8e06416b..f5b2919c68 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 @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" . "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 a237531625..af91c41133 100644 --- a/command/translatableerror/minimum_cli_version_not_met_error_test.go +++ b/command/translatableerror/minimum_cli_version_not_met_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" . "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 f79c98834b..7a4aa7338c 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 @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" . "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 1353cd4f9e..91d41b9b9e 100644 --- a/command/translatableerror/missing_credential_error_test.go +++ b/command/translatableerror/missing_credential_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" . "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 6394d787ee..666ff093c8 100644 --- a/command/translatableerror/service_instance_not_shareable_error_test.go +++ b/command/translatableerror/service_instance_not_shareable_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" . "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 84759b66eb..447f473e78 100644 --- a/command/translatableerror/service_plan_not_found_error_test.go +++ b/command/translatableerror/service_plan_not_found_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror" . "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 0ce31dd5f1..6ae50a5ea1 100644 --- a/command/translatableerror/staging_timeout_error_test.go +++ b/command/translatableerror/staging_timeout_error_test.go @@ -6,7 +6,7 @@ import ( "text/template" "time" - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" . "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 a8792e8109..edb2dd42ff 100644 --- a/command/translatableerror/tip_decorator_error_test.go +++ b/command/translatableerror/tip_decorator_error_test.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/translatableerror/translatableerrorfakes" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror/translatableerrorfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/translatableerrorfakes/fake_translatable_error.go b/command/translatableerror/translatableerrorfakes/fake_translatable_error.go index f4a97e0aba..9515e31803 100644 --- a/command/translatableerror/translatableerrorfakes/fake_translatable_error.go +++ b/command/translatableerror/translatableerrorfakes/fake_translatable_error.go @@ -4,7 +4,7 @@ package translatableerrorfakes import ( "sync" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type FakeTranslatableError struct { diff --git a/command/translatableerror/translate_test.go b/command/translatableerror/translate_test.go index f548fcd57c..6603c1dc29 100644 --- a/command/translatableerror/translate_test.go +++ b/command/translatableerror/translate_test.go @@ -5,7 +5,7 @@ import ( "errors" "text/template" - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" . "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 339d350d1b..c1cffe7eb8 100644 --- a/command/translatableerror/unauthorized_error_test.go +++ b/command/translatableerror/unauthorized_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/ui.go b/command/ui.go index 424c71d207..bf1ef342a5 100644 --- a/command/ui.go +++ b/command/ui.go @@ -4,7 +4,7 @@ import ( "io" "time" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" ) // UI is the interface to STDOUT, STDERR, and STDIN. diff --git a/command/v7/actor.go b/command/v7/actor.go index ff5303ea85..aba92fe147 100644 --- a/command/v7/actor.go +++ b/command/v7/actor.go @@ -6,15 +6,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - uaa "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + uaa "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" "github.com/SermoDigital/jose/jwt" ) diff --git a/command/v7/add_network_policy_command.go b/command/v7/add_network_policy_command.go index b795bde454..4d8c07b9e0 100644 --- a/command/v7/add_network_policy_command.go +++ b/command/v7/add_network_policy_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkingActor diff --git a/command/v7/add_network_policy_command_test.go b/command/v7/add_network_policy_command_test.go index 8f48dae4e3..b6fb10ef3a 100644 --- a/command/v7/add_network_policy_command_test.go +++ b/command/v7/add_network_policy_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/allow_space_ssh_command.go b/command/v7/allow_space_ssh_command.go index 38e6f99e56..6e368c892c 100644 --- a/command/v7/allow_space_ssh_command.go +++ b/command/v7/allow_space_ssh_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type AllowSpaceSSHCommand struct { diff --git a/command/v7/allow_space_ssh_command_test.go b/command/v7/allow_space_ssh_command_test.go index 7aa9fe7a31..122435e71a 100644 --- a/command/v7/allow_space_ssh_command_test.go +++ b/command/v7/allow_space_ssh_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/api_command.go b/command/v7/api_command.go index 5127b33bbf..bf57654f6c 100644 --- a/command/v7/api_command.go +++ b/command/v7/api_command.go @@ -6,10 +6,10 @@ import ( "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type APICommand struct { diff --git a/command/v7/api_command_test.go b/command/v7/api_command_test.go index 1c2e3cae88..efe8167a14 100644 --- a/command/v7/api_command_test.go +++ b/command/v7/api_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/app_command.go b/command/v7/app_command.go index d431a71ff5..bd7e3f3659 100644 --- a/command/v7/app_command.go +++ b/command/v7/app_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type AppCommand struct { diff --git a/command/v7/app_command_test.go b/command/v7/app_command_test.go index c64703644a..1c5b2b064c 100644 --- a/command/v7/app_command_test.go +++ b/command/v7/app_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/apply_manifest_command.go b/command/v7/apply_manifest_command.go index 71c1b44542..0c9a60fa2c 100644 --- a/command/v7/apply_manifest_command.go +++ b/command/v7/apply_manifest_command.go @@ -3,13 +3,13 @@ package v7 import ( "os" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" "gopkg.in/yaml.v2" ) diff --git a/command/v7/apply_manifest_command_test.go b/command/v7/apply_manifest_command_test.go index 2ae6bc5ded..7b78dcd4c3 100644 --- a/command/v7/apply_manifest_command_test.go +++ b/command/v7/apply_manifest_command_test.go @@ -6,18 +6,18 @@ import ( "gopkg.in/yaml.v2" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/manifestparser" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v8/util/ui" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/apps_command.go b/command/v7/apps_command.go index 84d936652b..e02fb68cf7 100644 --- a/command/v7/apps_command.go +++ b/command/v7/apps_command.go @@ -3,8 +3,8 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type AppsCommand struct { diff --git a/command/v7/apps_command_test.go b/command/v7/apps_command_test.go index 4402ab40bd..5bb3cc30d7 100644 --- a/command/v7/apps_command_test.go +++ b/command/v7/apps_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/auth_command.go b/command/v7/auth_command.go index 0d5f70c470..6e5e410d89 100644 --- a/command/v7/auth_command.go +++ b/command/v7/auth_command.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type AuthCommand struct { diff --git a/command/v7/auth_command_test.go b/command/v7/auth_command_test.go index fc945fc78a..398850cd12 100644 --- a/command/v7/auth_command_test.go +++ b/command/v7/auth_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/base_command.go b/command/v7/base_command.go index e40bcc26d6..bf6ace6580 100644 --- a/command/v7/base_command.go +++ b/command/v7/base_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/v7/shared" "code.cloudfoundry.org/clock" ) diff --git a/command/v7/bind_route_service_command.go b/command/v7/bind_route_service_command.go index b6e0b2fa86..c793182e25 100644 --- a/command/v7/bind_route_service_command.go +++ b/command/v7/bind_route_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/types" ) type BindRouteServiceCommand struct { diff --git a/command/v7/bind_route_service_command_test.go b/command/v7/bind_route_service_command_test.go index fc3a9178c9..4dce41620f 100644 --- a/command/v7/bind_route_service_command_test.go +++ b/command/v7/bind_route_service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_running_security_group_command.go b/command/v7/bind_running_security_group_command.go index b2fafe8986..cee69cd503 100644 --- a/command/v7/bind_running_security_group_command.go +++ b/command/v7/bind_running_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" ) type BindRunningSecurityGroupCommand struct { diff --git a/command/v7/bind_running_security_group_command_test.go b/command/v7/bind_running_security_group_command_test.go index 71dbd866cd..9d965d88ce 100644 --- a/command/v7/bind_running_security_group_command_test.go +++ b/command/v7/bind_running_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_security_group_command.go b/command/v7/bind_security_group_command.go index 4350d966eb..d0df084899 100644 --- a/command/v7/bind_security_group_command.go +++ b/command/v7/bind_security_group_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type BindSecurityGroupCommand struct { diff --git a/command/v7/bind_security_group_command_test.go b/command/v7/bind_security_group_command_test.go index 4d5c612e72..19f8f5d90c 100644 --- a/command/v7/bind_security_group_command_test.go +++ b/command/v7/bind_security_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -276,7 +276,7 @@ var _ = Describe("bind-security-group Command", func() { Expect(testUI.Out).To(Say("Assigning running security group %s to all spaces in org %s as some-user...", cmd.RequiredArgs.SecurityGroupName, cmd.RequiredArgs.OrganizationName)) Expect(testUI.Out).To(Say("No spaces in org %s.", cmd.RequiredArgs.OrganizationName)) Expect(testUI.Out).NotTo(Say("OK")) - Expect(testUI.Out).NotTo(Say(`TIP: If Dynamic ASG's are enabled, changes will automatically apply for running and staging applications. Otherwise, changes will require an app restart \(for running\) or restage \(for staging\) to apply to existing applications\.`)) //TODO Why? + Expect(testUI.Out).NotTo(Say(`TIP: If Dynamic ASG's are enabled, changes will automatically apply for running and staging applications. Otherwise, changes will require an app restart \(for running\) or restage \(for staging\) to apply to existing applications\.`)) // TODO Why? Expect(testUI.Err).To(Say("get security group warning")) Expect(testUI.Err).To(Say("get org warning")) diff --git a/command/v7/bind_service_command.go b/command/v7/bind_service_command.go index 4f4f9e480a..e9853276f1 100644 --- a/command/v7/bind_service_command.go +++ b/command/v7/bind_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/types" ) type BindServiceCommand struct { diff --git a/command/v7/bind_service_command_test.go b/command/v7/bind_service_command_test.go index e8e0306940..dcfa2cc427 100644 --- a/command/v7/bind_service_command_test.go +++ b/command/v7/bind_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_staging_security_group_command.go b/command/v7/bind_staging_security_group_command.go index 0ee5a32405..4dd0b48ccf 100644 --- a/command/v7/bind_staging_security_group_command.go +++ b/command/v7/bind_staging_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" ) type BindStagingSecurityGroupCommand struct { diff --git a/command/v7/bind_staging_security_group_command_test.go b/command/v7/bind_staging_security_group_command_test.go index 6889f80891..43e57e2f55 100644 --- a/command/v7/bind_staging_security_group_command_test.go +++ b/command/v7/bind_staging_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/buildpacks_command.go b/command/v7/buildpacks_command.go index 0aeb3a0a01..cfb87f62e7 100644 --- a/command/v7/buildpacks_command.go +++ b/command/v7/buildpacks_command.go @@ -3,8 +3,8 @@ package v7 import ( "strconv" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type BuildpacksCommand struct { diff --git a/command/v7/buildpacks_command_test.go b/command/v7/buildpacks_command_test.go index 0cb5466724..f293faaa91 100644 --- a/command/v7/buildpacks_command_test.go +++ b/command/v7/buildpacks_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/cancel_deployment_command.go b/command/v7/cancel_deployment_command.go index 55998b32a4..2cfbaf6d30 100644 --- a/command/v7/cancel_deployment_command.go +++ b/command/v7/cancel_deployment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type CancelDeploymentCommand struct { diff --git a/command/v7/cancel_deployment_command_test.go b/command/v7/cancel_deployment_command_test.go index 355349c61a..32ecb10ef6 100644 --- a/command/v7/cancel_deployment_command_test.go +++ b/command/v7/cancel_deployment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/check_route_command.go b/command/v7/check_route_command.go index 444cd1f4d2..00b28c3dc2 100644 --- a/command/v7/check_route_command.go +++ b/command/v7/check_route_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type CheckRouteCommand struct { diff --git a/command/v7/check_route_command_test.go b/command/v7/check_route_command_test.go index f338b81c47..251810ae29 100644 --- a/command/v7/check_route_command_test.go +++ b/command/v7/check_route_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/config_command.go b/command/v7/config_command.go index ae306787c5..76256b6fd5 100644 --- a/command/v7/config_command.go +++ b/command/v7/config_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type ConfigCommand struct { diff --git a/command/v7/config_command_test.go b/command/v7/config_command_test.go index dcc61aa6e8..f98d378ee9 100644 --- a/command/v7/config_command_test.go +++ b/command/v7/config_command_test.go @@ -1,13 +1,13 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/continue_deployment_command.go b/command/v7/continue_deployment_command.go index 135cdbe978..f1e243cda1 100644 --- a/command/v7/continue_deployment_command.go +++ b/command/v7/continue_deployment_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type ContinueDeploymentCommand struct { diff --git a/command/v7/continue_deployment_command_test.go b/command/v7/continue_deployment_command_test.go index 66ce4535f9..8057aac4c7 100644 --- a/command/v7/continue_deployment_command_test.go +++ b/command/v7/continue_deployment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/copy_source_command.go b/command/v7/copy_source_command.go index c4ae96eeef..d3a1d3c020 100644 --- a/command/v7/copy_source_command.go +++ b/command/v7/copy_source_command.go @@ -1,14 +1,14 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/logcache" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type CopySourceCommand struct { diff --git a/command/v7/copy_source_command_test.go b/command/v7/copy_source_command_test.go index 9d3787dc6f..613d554400 100644 --- a/command/v7/copy_source_command_test.go +++ b/command/v7/copy_source_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_app_command.go b/command/v7/create_app_command.go index 9b8a1e35ba..d12bc2757a 100644 --- a/command/v7/create_app_command.go +++ b/command/v7/create_app_command.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type CreateAppCommand struct { diff --git a/command/v7/create_app_command_test.go b/command/v7/create_app_command_test.go index a1b6cec95f..75fe728319 100644 --- a/command/v7/create_app_command_test.go +++ b/command/v7/create_app_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_app_manifest_command.go b/command/v7/create_app_manifest_command.go index 4a8e745f02..58d7085ce2 100644 --- a/command/v7/create_app_manifest_command.go +++ b/command/v7/create_app_manifest_command.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type CreateAppManifestCommand struct { diff --git a/command/v7/create_app_manifest_command_test.go b/command/v7/create_app_manifest_command_test.go index eec45881d0..c1b57ba05d 100644 --- a/command/v7/create_app_manifest_command_test.go +++ b/command/v7/create_app_manifest_command_test.go @@ -6,14 +6,14 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_buildpack_command.go b/command/v7/create_buildpack_command.go index 9b64dfbab3..97bf8274e5 100644 --- a/command/v7/create_buildpack_command.go +++ b/command/v7/create_buildpack_command.go @@ -4,14 +4,14 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/download" ) type CreateBuildpackCommand struct { diff --git a/command/v7/create_buildpack_command_test.go b/command/v7/create_buildpack_command_test.go index e8d9556d80..cb15759c56 100644 --- a/command/v7/create_buildpack_command_test.go +++ b/command/v7/create_buildpack_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_isolation_segment_command.go b/command/v7/create_isolation_segment_command.go index 04026ec5ed..f9cf1f33ee 100644 --- a/command/v7/create_isolation_segment_command.go +++ b/command/v7/create_isolation_segment_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type CreateIsolationSegmentCommand struct { diff --git a/command/v7/create_isolation_segment_command_test.go b/command/v7/create_isolation_segment_command_test.go index 695fbc920a..bcd3385ddc 100644 --- a/command/v7/create_isolation_segment_command_test.go +++ b/command/v7/create_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_org_command.go b/command/v7/create_org_command.go index f28156bac8..5f8e7a4d07 100644 --- a/command/v7/create_org_command.go +++ b/command/v7/create_org_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type CreateOrgCommand struct { diff --git a/command/v7/create_org_command_test.go b/command/v7/create_org_command_test.go index d2ff5d0de6..ca78330f4c 100644 --- a/command/v7/create_org_command_test.go +++ b/command/v7/create_org_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_org_quota_command.go b/command/v7/create_org_quota_command.go index b4597e325a..5de0fc31b8 100644 --- a/command/v7/create_org_quota_command.go +++ b/command/v7/create_org_quota_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/types" ) type CreateOrgQuotaCommand struct { diff --git a/command/v7/create_org_quota_command_test.go b/command/v7/create_org_quota_command_test.go index f69371cb0b..9acd82fbd5 100644 --- a/command/v7/create_org_quota_command_test.go +++ b/command/v7/create_org_quota_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_package_command.go b/command/v7/create_package_command.go index 47f6d2ff28..ff7736143a 100644 --- a/command/v7/create_package_command.go +++ b/command/v7/create_package_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" ) type CreatePackageCommand struct { diff --git a/command/v7/create_package_command_test.go b/command/v7/create_package_command_test.go index c80cf76028..798b52a988 100644 --- a/command/v7/create_package_command_test.go +++ b/command/v7/create_package_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_private_domain_command.go b/command/v7/create_private_domain_command.go index 2a2dfa1624..f648dd61a6 100644 --- a/command/v7/create_private_domain_command.go +++ b/command/v7/create_private_domain_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type CreatePrivateDomainCommand struct { diff --git a/command/v7/create_private_domain_command_test.go b/command/v7/create_private_domain_command_test.go index 62c5ab96c7..405f6adc91 100644 --- a/command/v7/create_private_domain_command_test.go +++ b/command/v7/create_private_domain_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_route_command.go b/command/v7/create_route_command.go index 7d6fc07e6b..25d957ebe2 100644 --- a/command/v7/create_route_command.go +++ b/command/v7/create_route_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type CreateRouteCommand struct { diff --git a/command/v7/create_route_command_test.go b/command/v7/create_route_command_test.go index 25e808f69a..1224f4a3f9 100644 --- a/command/v7/create_route_command_test.go +++ b/command/v7/create_route_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_security_group_command.go b/command/v7/create_security_group_command.go index 7c1f29c4b7..57764cce5e 100644 --- a/command/v7/create_security_group_command.go +++ b/command/v7/create_security_group_command.go @@ -3,9 +3,9 @@ package v7 import ( "encoding/json" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type CreateSecurityGroupCommand struct { diff --git a/command/v7/create_security_group_command_test.go b/command/v7/create_security_group_command_test.go index dc7bc65ad5..ac08c73182 100644 --- a/command/v7/create_security_group_command_test.go +++ b/command/v7/create_security_group_command_test.go @@ -5,15 +5,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_broker_command.go b/command/v7/create_service_broker_command.go index 9ca76c368a..267794e611 100644 --- a/command/v7/create_service_broker_command.go +++ b/command/v7/create_service_broker_command.go @@ -3,11 +3,11 @@ package v7 import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type CreateServiceBrokerCommand struct { diff --git a/command/v7/create_service_broker_command_test.go b/command/v7/create_service_broker_command_test.go index d1e31d2d7a..7673c620d3 100644 --- a/command/v7/create_service_broker_command_test.go +++ b/command/v7/create_service_broker_command_test.go @@ -5,14 +5,14 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_command.go b/command/v7/create_service_command.go index ee10e723bb..34fa0829cd 100644 --- a/command/v7/create_service_command.go +++ b/command/v7/create_service_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/types" ) type CreateServiceCommand struct { diff --git a/command/v7/create_service_command_test.go b/command/v7/create_service_command_test.go index a068630900..631955faca 100644 --- a/command/v7/create_service_command_test.go +++ b/command/v7/create_service_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_key_command.go b/command/v7/create_service_key_command.go index 34bfba0542..36f1381fd5 100644 --- a/command/v7/create_service_key_command.go +++ b/command/v7/create_service_key_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/types" ) type CreateServiceKeyCommand struct { diff --git a/command/v7/create_service_key_command_test.go b/command/v7/create_service_key_command_test.go index 85d26518da..4982956d8c 100644 --- a/command/v7/create_service_key_command_test.go +++ b/command/v7/create_service_key_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_shared_domain_command.go b/command/v7/create_shared_domain_command.go index feb9940e21..2af8e50d5c 100644 --- a/command/v7/create_shared_domain_command.go +++ b/command/v7/create_shared_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type CreateSharedDomainCommand struct { diff --git a/command/v7/create_shared_domain_command_test.go b/command/v7/create_shared_domain_command_test.go index d39ec8cae1..f3f71f8737 100644 --- a/command/v7/create_shared_domain_command_test.go +++ b/command/v7/create_shared_domain_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_space_command.go b/command/v7/create_space_command.go index dd8b85dd7b..196a7e8e2a 100644 --- a/command/v7/create_space_command.go +++ b/command/v7/create_space_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type CreateSpaceActor interface { diff --git a/command/v7/create_space_command_test.go b/command/v7/create_space_command_test.go index 84f55a7b4f..261c467f1e 100644 --- a/command/v7/create_space_command_test.go +++ b/command/v7/create_space_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_space_quota_command.go b/command/v7/create_space_quota_command.go index 250acde184..123cfa176b 100644 --- a/command/v7/create_space_quota_command.go +++ b/command/v7/create_space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type CreateSpaceQuotaCommand struct { diff --git a/command/v7/create_space_quota_command_test.go b/command/v7/create_space_quota_command_test.go index 1d6f031499..1e895060a2 100644 --- a/command/v7/create_space_quota_command_test.go +++ b/command/v7/create_space_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_user_command.go b/command/v7/create_user_command.go index c3647bc3da..54d83834b8 100644 --- a/command/v7/create_user_command.go +++ b/command/v7/create_user_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type CreateUserCommand struct { diff --git a/command/v7/create_user_command_test.go b/command/v7/create_user_command_test.go index 6f42a72422..493c400e72 100644 --- a/command/v7/create_user_command_test.go +++ b/command/v7/create_user_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_user_provided_service_command.go b/command/v7/create_user_provided_service_command.go index fbe7a412bd..f732309b3b 100644 --- a/command/v7/create_user_provided_service_command.go +++ b/command/v7/create_user_provided_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) type CreateUserProvidedServiceCommand struct { diff --git a/command/v7/create_user_provided_service_command_test.go b/command/v7/create_user_provided_service_command_test.go index bccc37e67f..1b017eec08 100644 --- a/command/v7/create_user_provided_service_command_test.go +++ b/command/v7/create_user_provided_service_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/types" + + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/curl_command.go b/command/v7/curl_command.go index 764c507525..752146aed1 100644 --- a/command/v7/curl_command.go +++ b/command/v7/curl_command.go @@ -4,8 +4,8 @@ import ( "net/http/httputil" "os" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type CurlCommand struct { diff --git a/command/v7/curl_command_test.go b/command/v7/curl_command_test.go index e7fc9fe8a8..7f64cef6b1 100644 --- a/command/v7/curl_command_test.go +++ b/command/v7/curl_command_test.go @@ -5,12 +5,12 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_buildpack_command.go b/command/v7/delete_buildpack_command.go index c0d0e5f571..9feae4408e 100644 --- a/command/v7/delete_buildpack_command.go +++ b/command/v7/delete_buildpack_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteBuildpackCommand struct { diff --git a/command/v7/delete_buildpack_command_test.go b/command/v7/delete_buildpack_command_test.go index ccd53b95b5..d9c4e6b8ce 100644 --- a/command/v7/delete_buildpack_command_test.go +++ b/command/v7/delete_buildpack_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_command.go b/command/v7/delete_command.go index 23edea0b68..1767fe0ea6 100644 --- a/command/v7/delete_command.go +++ b/command/v7/delete_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteCommand struct { diff --git a/command/v7/delete_command_test.go b/command/v7/delete_command_test.go index 2b1a256e1b..baa83816c3 100644 --- a/command/v7/delete_command_test.go +++ b/command/v7/delete_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_isolation_segment_command.go b/command/v7/delete_isolation_segment_command.go index 4858cf110f..dd68f5f0d9 100644 --- a/command/v7/delete_isolation_segment_command.go +++ b/command/v7/delete_isolation_segment_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteIsolationSegmentCommand struct { diff --git a/command/v7/delete_isolation_segment_command_test.go b/command/v7/delete_isolation_segment_command_test.go index 560cb71281..655c36510e 100644 --- a/command/v7/delete_isolation_segment_command_test.go +++ b/command/v7/delete_isolation_segment_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_org_command.go b/command/v7/delete_org_command.go index 33c38d99a1..79a8d9ad4b 100644 --- a/command/v7/delete_org_command.go +++ b/command/v7/delete_org_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteOrgCommand struct { diff --git a/command/v7/delete_org_command_test.go b/command/v7/delete_org_command_test.go index 70f947c9c7..45a29468a3 100644 --- a/command/v7/delete_org_command_test.go +++ b/command/v7/delete_org_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_org_quota_command.go b/command/v7/delete_org_quota_command.go index b3199feb32..4f41c3242d 100644 --- a/command/v7/delete_org_quota_command.go +++ b/command/v7/delete_org_quota_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteOrgQuotaCommand struct { diff --git a/command/v7/delete_org_quota_command_test.go b/command/v7/delete_org_quota_command_test.go index 60b2902f7a..ca45f2db99 100644 --- a/command/v7/delete_org_quota_command_test.go +++ b/command/v7/delete_org_quota_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "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 7cd5e1f7ac..dfe32013d9 100644 --- a/command/v7/delete_orphaned_routes_command_test.go +++ b/command/v7/delete_orphaned_routes_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/delete_private_domain_command.go b/command/v7/delete_private_domain_command.go index 52152a2651..4ef1bdcf3b 100644 --- a/command/v7/delete_private_domain_command.go +++ b/command/v7/delete_private_domain_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeletePrivateDomainCommand struct { diff --git a/command/v7/delete_private_domain_command_test.go b/command/v7/delete_private_domain_command_test.go index 57bf3c40e7..1c290dd657 100644 --- a/command/v7/delete_private_domain_command_test.go +++ b/command/v7/delete_private_domain_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/resources" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_route_command.go b/command/v7/delete_route_command.go index 9b707dc8fb..50e1a5cc77 100644 --- a/command/v7/delete_route_command.go +++ b/command/v7/delete_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteRouteCommand struct { diff --git a/command/v7/delete_route_command_test.go b/command/v7/delete_route_command_test.go index 7452857ee5..229d388caa 100644 --- a/command/v7/delete_route_command_test.go +++ b/command/v7/delete_route_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/delete_security_group_command.go b/command/v7/delete_security_group_command.go index 6a941bcd45..091ece4540 100644 --- a/command/v7/delete_security_group_command.go +++ b/command/v7/delete_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteSecurityGroupCommand struct { diff --git a/command/v7/delete_security_group_command_test.go b/command/v7/delete_security_group_command_test.go index f9573ace68..510bf7a356 100644 --- a/command/v7/delete_security_group_command_test.go +++ b/command/v7/delete_security_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_broker_command.go b/command/v7/delete_service_broker_command.go index 3a7206d55f..5b33fa3286 100644 --- a/command/v7/delete_service_broker_command.go +++ b/command/v7/delete_service_broker_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteServiceBrokerCommand struct { diff --git a/command/v7/delete_service_broker_command_test.go b/command/v7/delete_service_broker_command_test.go index e8beb1216d..cfab3c7abd 100644 --- a/command/v7/delete_service_broker_command_test.go +++ b/command/v7/delete_service_broker_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_command.go b/command/v7/delete_service_command.go index 670d5d8b34..3a6749a69f 100644 --- a/command/v7/delete_service_command.go +++ b/command/v7/delete_service_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type DeleteServiceCommand struct { diff --git a/command/v7/delete_service_command_test.go b/command/v7/delete_service_command_test.go index d9ff8e58f3..5bbefe52bd 100644 --- a/command/v7/delete_service_command_test.go +++ b/command/v7/delete_service_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_key_command.go b/command/v7/delete_service_key_command.go index 52cec6cc8c..ef22c839b3 100644 --- a/command/v7/delete_service_key_command.go +++ b/command/v7/delete_service_key_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type DeleteServiceKeyCommand struct { diff --git a/command/v7/delete_service_key_command_test.go b/command/v7/delete_service_key_command_test.go index 1e2440635c..4292f3365d 100644 --- a/command/v7/delete_service_key_command_test.go +++ b/command/v7/delete_service_key_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_shared_domain_command.go b/command/v7/delete_shared_domain_command.go index f0045f6c0c..c8a3242d64 100644 --- a/command/v7/delete_shared_domain_command.go +++ b/command/v7/delete_shared_domain_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type DeleteSharedDomainCommand struct { diff --git a/command/v7/delete_shared_domain_command_test.go b/command/v7/delete_shared_domain_command_test.go index 578fea3e99..5da0318c84 100644 --- a/command/v7/delete_shared_domain_command_test.go +++ b/command/v7/delete_shared_domain_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/resources" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_space_command.go b/command/v7/delete_space_command.go index efc65de0e2..67f60388f5 100644 --- a/command/v7/delete_space_command.go +++ b/command/v7/delete_space_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteSpaceCommand struct { diff --git a/command/v7/delete_space_command_test.go b/command/v7/delete_space_command_test.go index 67078fa50d..d86abce9c0 100644 --- a/command/v7/delete_space_command_test.go +++ b/command/v7/delete_space_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_space_quota_command.go b/command/v7/delete_space_quota_command.go index a12b9648a3..83ffe42c07 100644 --- a/command/v7/delete_space_quota_command.go +++ b/command/v7/delete_space_quota_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteSpaceQuotaCommand struct { diff --git a/command/v7/delete_space_quota_command_test.go b/command/v7/delete_space_quota_command_test.go index 3100b17924..b1e8d1a2c5 100644 --- a/command/v7/delete_space_quota_command_test.go +++ b/command/v7/delete_space_quota_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_user_command.go b/command/v7/delete_user_command.go index a4ca297591..964f9bd2a0 100644 --- a/command/v7/delete_user_command.go +++ b/command/v7/delete_user_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DeleteUserCommand struct { diff --git a/command/v7/delete_user_command_test.go b/command/v7/delete_user_command_test.go index d38ee81e2a..2c0176f242 100644 --- a/command/v7/delete_user_command_test.go +++ b/command/v7/delete_user_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disable_feature_flag_command.go b/command/v7/disable_feature_flag_command.go index 6c3e36678a..f5000a4710 100644 --- a/command/v7/disable_feature_flag_command.go +++ b/command/v7/disable_feature_flag_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DisableFeatureFlagCommand struct { diff --git a/command/v7/disable_feature_flag_command_test.go b/command/v7/disable_feature_flag_command_test.go index 768f1bacf4..82d95d0697 100644 --- a/command/v7/disable_feature_flag_command_test.go +++ b/command/v7/disable_feature_flag_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/disable_org_isolation_command.go b/command/v7/disable_org_isolation_command.go index a430f0ad05..a411bf8ba4 100644 --- a/command/v7/disable_org_isolation_command.go +++ b/command/v7/disable_org_isolation_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DisableOrgIsolationCommand struct { diff --git a/command/v7/disable_org_isolation_command_test.go b/command/v7/disable_org_isolation_command_test.go index 88934934a0..b45c563f90 100644 --- a/command/v7/disable_org_isolation_command_test.go +++ b/command/v7/disable_org_isolation_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disable_service_access_command.go b/command/v7/disable_service_access_command.go index 5abd3b9359..aafe11ba2f 100644 --- a/command/v7/disable_service_access_command.go +++ b/command/v7/disable_service_access_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DisableServiceAccessCommand struct { diff --git a/command/v7/disable_service_access_command_test.go b/command/v7/disable_service_access_command_test.go index e890dbba8b..eea499a5c3 100644 --- a/command/v7/disable_service_access_command_test.go +++ b/command/v7/disable_service_access_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/disable_ssh_command.go b/command/v7/disable_ssh_command.go index 794f0b0f36..62690e6d4f 100644 --- a/command/v7/disable_ssh_command.go +++ b/command/v7/disable_ssh_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DisableSSHCommand struct { diff --git a/command/v7/disable_ssh_command_test.go b/command/v7/disable_ssh_command_test.go index de49782edc..402c378810 100644 --- a/command/v7/disable_ssh_command_test.go +++ b/command/v7/disable_ssh_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disallow_space_ssh_command.go b/command/v7/disallow_space_ssh_command.go index 295d3d966d..f179c33f82 100644 --- a/command/v7/disallow_space_ssh_command.go +++ b/command/v7/disallow_space_ssh_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type DisallowSpaceSSHCommand struct { diff --git a/command/v7/disallow_space_ssh_command_test.go b/command/v7/disallow_space_ssh_command_test.go index b227e45696..0abab028b5 100644 --- a/command/v7/disallow_space_ssh_command_test.go +++ b/command/v7/disallow_space_ssh_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "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 f649b1a6e9..bcaa2cfe13 100644 --- a/command/v7/docker_password_getter_test.go +++ b/command/v7/docker_password_getter_test.go @@ -1,9 +1,9 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/domains_command.go b/command/v7/domains_command.go index 09b59929f5..4e8d0aba55 100644 --- a/command/v7/domains_command.go +++ b/command/v7/domains_command.go @@ -4,9 +4,9 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/sorting" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/sorting" + "code.cloudfoundry.org/cli/v8/util/ui" ) type DomainsCommand struct { diff --git a/command/v7/domains_command_test.go b/command/v7/domains_command_test.go index 6939df7a04..cc41b53368 100644 --- a/command/v7/domains_command_test.go +++ b/command/v7/domains_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/download_droplet_command.go b/command/v7/download_droplet_command.go index a04e4a94bc..394b216450 100644 --- a/command/v7/download_droplet_command.go +++ b/command/v7/download_droplet_command.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type DownloadDropletCommand struct { diff --git a/command/v7/download_droplet_command_test.go b/command/v7/download_droplet_command_test.go index 3db2c2db9f..86834e69bd 100644 --- a/command/v7/download_droplet_command_test.go +++ b/command/v7/download_droplet_command_test.go @@ -7,14 +7,14 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/droplets_command.go b/command/v7/droplets_command.go index 2e61020c71..306921061b 100644 --- a/command/v7/droplets_command.go +++ b/command/v7/droplets_command.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/util/ui" ) type DropletsCommand struct { diff --git a/command/v7/droplets_command_test.go b/command/v7/droplets_command_test.go index 1a8497080f..bfc5805b68 100644 --- a/command/v7/droplets_command_test.go +++ b/command/v7/droplets_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_feature_flag_command.go b/command/v7/enable_feature_flag_command.go index f15945aa8e..a0a72f59ee 100644 --- a/command/v7/enable_feature_flag_command.go +++ b/command/v7/enable_feature_flag_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type EnableFeatureFlagCommand struct { diff --git a/command/v7/enable_feature_flag_command_test.go b/command/v7/enable_feature_flag_command_test.go index 95dc612199..d218e1de47 100644 --- a/command/v7/enable_feature_flag_command_test.go +++ b/command/v7/enable_feature_flag_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_org_isolation_command.go b/command/v7/enable_org_isolation_command.go index be089ce48c..98469f4594 100644 --- a/command/v7/enable_org_isolation_command.go +++ b/command/v7/enable_org_isolation_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type EnableOrgIsolationCommand struct { diff --git a/command/v7/enable_org_isolation_command_test.go b/command/v7/enable_org_isolation_command_test.go index b76cb50c7d..70ae99503d 100644 --- a/command/v7/enable_org_isolation_command_test.go +++ b/command/v7/enable_org_isolation_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/enable_service_access_command.go b/command/v7/enable_service_access_command.go index 3246cf9a3e..bf7f235752 100644 --- a/command/v7/enable_service_access_command.go +++ b/command/v7/enable_service_access_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" ) type EnableServiceAccessCommand struct { diff --git a/command/v7/enable_service_access_command_test.go b/command/v7/enable_service_access_command_test.go index fa7c39516a..5b4aa9e43c 100644 --- a/command/v7/enable_service_access_command_test.go +++ b/command/v7/enable_service_access_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_ssh_command.go b/command/v7/enable_ssh_command.go index dcb8f9044e..5a2ca8fc7b 100644 --- a/command/v7/enable_ssh_command.go +++ b/command/v7/enable_ssh_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type EnableSSHCommand struct { diff --git a/command/v7/enable_ssh_command_test.go b/command/v7/enable_ssh_command_test.go index 8ef14a64e9..0f49457838 100644 --- a/command/v7/enable_ssh_command_test.go +++ b/command/v7/enable_ssh_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/env_command.go b/command/v7/env_command.go index 0d924c1473..18597e5531 100644 --- a/command/v7/env_command.go +++ b/command/v7/env_command.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" log "github.com/sirupsen/logrus" ) diff --git a/command/v7/env_command_test.go b/command/v7/env_command_test.go index 13ff12e372..b7f7f6b31a 100644 --- a/command/v7/env_command_test.go +++ b/command/v7/env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/events_command.go b/command/v7/events_command.go index bca46d7678..b9c2ad7f40 100644 --- a/command/v7/events_command.go +++ b/command/v7/events_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/util/ui" ) type EventsCommand struct { diff --git a/command/v7/events_command_test.go b/command/v7/events_command_test.go index a4a3fccb30..1daba9a70e 100644 --- a/command/v7/events_command_test.go +++ b/command/v7/events_command_test.go @@ -5,16 +5,16 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/feature_flag_command.go b/command/v7/feature_flag_command.go index 4a0db0e2aa..b271249b59 100644 --- a/command/v7/feature_flag_command.go +++ b/command/v7/feature_flag_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type FeatureFlagCommand struct { diff --git a/command/v7/feature_flag_command_test.go b/command/v7/feature_flag_command_test.go index 01ada75b2d..a732e3bb03 100644 --- a/command/v7/feature_flag_command_test.go +++ b/command/v7/feature_flag_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/feature_flags_command.go b/command/v7/feature_flags_command.go index 64c6ce47d0..8468be7d30 100644 --- a/command/v7/feature_flags_command.go +++ b/command/v7/feature_flags_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type FeatureFlagsCommand struct { diff --git a/command/v7/feature_flags_command_test.go b/command/v7/feature_flags_command_test.go index 7d3da5ecd4..c17ca39a19 100644 --- a/command/v7/feature_flags_command_test.go +++ b/command/v7/feature_flags_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/get_health_check_command.go b/command/v7/get_health_check_command.go index 050f6a568d..f8c2b5c795 100644 --- a/command/v7/get_health_check_command.go +++ b/command/v7/get_health_check_command.go @@ -3,9 +3,9 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/util/ui" ) type GetHealthCheckCommand struct { diff --git a/command/v7/get_health_check_command_test.go b/command/v7/get_health_check_command_test.go index 095a262625..3b7537456a 100644 --- a/command/v7/get_health_check_command_test.go +++ b/command/v7/get_health_check_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/isolation_segments_command.go b/command/v7/isolation_segments_command.go index 8eed00effa..79870291de 100644 --- a/command/v7/isolation_segments_command.go +++ b/command/v7/isolation_segments_command.go @@ -3,7 +3,7 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" ) type IsolationSegmentsCommand struct { diff --git a/command/v7/isolation_segments_command_test.go b/command/v7/isolation_segments_command_test.go index df543567f4..b9f17d82ad 100644 --- a/command/v7/isolation_segments_command_test.go +++ b/command/v7/isolation_segments_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/label_updater.go b/command/v7/label_updater.go index ce48fcd285..dd09dd9b64 100644 --- a/command/v7/label_updater.go +++ b/command/v7/label_updater.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SetLabelActor diff --git a/command/v7/label_updater_test.go b/command/v7/label_updater_test.go index 94843b12d5..78285a3874 100644 --- a/command/v7/label_updater_test.go +++ b/command/v7/label_updater_test.go @@ -5,14 +5,14 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/labels_command.go b/command/v7/labels_command.go index 1899b43f83..a8488ebbaa 100644 --- a/command/v7/labels_command.go +++ b/command/v7/labels_command.go @@ -5,11 +5,11 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/ui" ) type ResourceType string diff --git a/command/v7/labels_command_test.go b/command/v7/labels_command_test.go index e854d67870..b53f489e0b 100644 --- a/command/v7/labels_command_test.go +++ b/command/v7/labels_command_test.go @@ -5,15 +5,15 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/login_command.go b/command/v7/login_command.go index a98aaf695a..83b0bc7d22 100644 --- a/command/v7/login_command.go +++ b/command/v7/login_command.go @@ -6,19 +6,19 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ActorReloader diff --git a/command/v7/login_command_test.go b/command/v7/login_command_test.go index 7b012f4493..a7a6a0c0f3 100644 --- a/command/v7/login_command_test.go +++ b/command/v7/login_command_test.go @@ -5,19 +5,19 @@ import ( "fmt" "io" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/logout_command.go b/command/v7/logout_command.go index 65892c9521..ec8bb59a6b 100644 --- a/command/v7/logout_command.go +++ b/command/v7/logout_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/v7/shared" "code.cloudfoundry.org/clock" ) diff --git a/command/v7/logout_command_test.go b/command/v7/logout_command_test.go index e5abdf28ac..dd7c8f72ac 100644 --- a/command/v7/logout_command_test.go +++ b/command/v7/logout_command_test.go @@ -1,12 +1,12 @@ package v7_test import ( - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/logs_command.go b/command/v7/logs_command.go index b250624075..83d44fea7c 100644 --- a/command/v7/logs_command.go +++ b/command/v7/logs_command.go @@ -5,12 +5,12 @@ import ( "os/signal" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/logcache" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" ) type LogsCommand struct { diff --git a/command/v7/logs_command_test.go b/command/v7/logs_command_test.go index 61cf012176..d9c042026a 100644 --- a/command/v7/logs_command_test.go +++ b/command/v7/logs_command_test.go @@ -5,15 +5,15 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -268,7 +268,7 @@ var _ = Describe("logs command", func() { errorStream := make(chan error) go func() { - logStream <- *sharedaction.NewLogMessage("Here are some staging logs!", "OUT", time.Now(), sharedaction.StagingLog, "sourceInstance") //TODO: is it ok to leave staging logs here? + logStream <- *sharedaction.NewLogMessage("Here are some staging logs!", "OUT", time.Now(), sharedaction.StagingLog, "sourceInstance") // TODO: is it ok to leave staging logs here? logStream <- *sharedaction.NewLogMessage("Here are some other staging logs!", "OUT", time.Now(), sharedaction.StagingLog, "sourceInstance") close(logStream) close(errorStream) diff --git a/command/v7/map_route_command.go b/command/v7/map_route_command.go index c9ca6b381a..9a75656c76 100644 --- a/command/v7/map_route_command.go +++ b/command/v7/map_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type MapRouteCommand struct { diff --git a/command/v7/map_route_command_test.go b/command/v7/map_route_command_test.go index 13e78d3145..12a4cea302 100644 --- a/command/v7/map_route_command_test.go +++ b/command/v7/map_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/marketplace_command.go b/command/v7/marketplace_command.go index 47adc8eb88..e250d5326d 100644 --- a/command/v7/marketplace_command.go +++ b/command/v7/marketplace_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type MarketplaceCommand struct { diff --git a/command/v7/marketplace_command_test.go b/command/v7/marketplace_command_test.go index cf27c435c3..1b998b61a5 100644 --- a/command/v7/marketplace_command_test.go +++ b/command/v7/marketplace_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/move_route_command.go b/command/v7/move_route_command.go index d9425362b7..2c2edf365f 100644 --- a/command/v7/move_route_command.go +++ b/command/v7/move_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type MoveRouteCommand struct { diff --git a/command/v7/move_route_command_test.go b/command/v7/move_route_command_test.go index 9b62af8c8d..e6393fd20e 100644 --- a/command/v7/move_route_command_test.go +++ b/command/v7/move_route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/network_policies_command.go b/command/v7/network_policies_command.go index 6a8a6e1f1d..70bd175a62 100644 --- a/command/v7/network_policies_command.go +++ b/command/v7/network_policies_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkPoliciesActor diff --git a/command/v7/network_policies_command_test.go b/command/v7/network_policies_command_test.go index 0e2b8b5153..4b724915cf 100644 --- a/command/v7/network_policies_command_test.go +++ b/command/v7/network_policies_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/oauth_token_command.go b/command/v7/oauth_token_command.go index a5feff234a..7ea580cb69 100644 --- a/command/v7/oauth_token_command.go +++ b/command/v7/oauth_token_command.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" ) type OauthTokenCommand struct { diff --git a/command/v7/oauth_token_command_test.go b/command/v7/oauth_token_command_test.go index 51eac274dc..5f3f5beadc 100644 --- a/command/v7/oauth_token_command_test.go +++ b/command/v7/oauth_token_command_test.go @@ -3,11 +3,11 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" . "github.com/onsi/ginkgo/v2" diff --git a/command/v7/org_command.go b/command/v7/org_command.go index 0f2a238713..70c104a189 100644 --- a/command/v7/org_command.go +++ b/command/v7/org_command.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type OrgCommand struct { diff --git a/command/v7/org_command_test.go b/command/v7/org_command_test.go index 2305d75de9..aab3538850 100644 --- a/command/v7/org_command_test.go +++ b/command/v7/org_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/org_quota_command.go b/command/v7/org_quota_command.go index 5458bb24fb..7a4a63967b 100644 --- a/command/v7/org_quota_command.go +++ b/command/v7/org_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" ) type OrgQuotaCommand struct { diff --git a/command/v7/org_quota_command_test.go b/command/v7/org_quota_command_test.go index 6a6b26d0f8..3ff8f1777c 100644 --- a/command/v7/org_quota_command_test.go +++ b/command/v7/org_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/org_quotas_command.go b/command/v7/org_quotas_command.go index 2fb561d07f..7bc67a6b8e 100644 --- a/command/v7/org_quotas_command.go +++ b/command/v7/org_quotas_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" ) type OrgQuotasCommand struct { diff --git a/command/v7/org_quotas_command_test.go b/command/v7/org_quotas_command_test.go index faefb6e9bc..6a5e5391f0 100644 --- a/command/v7/org_quotas_command_test.go +++ b/command/v7/org_quotas_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/org_users_command.go b/command/v7/org_users_command.go index f7af79783b..2a5060cfe5 100644 --- a/command/v7/org_users_command.go +++ b/command/v7/org_users_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type OrgUsersCommand struct { diff --git a/command/v7/org_users_command_test.go b/command/v7/org_users_command_test.go index f3bce29694..d6881a3ef9 100644 --- a/command/v7/org_users_command_test.go +++ b/command/v7/org_users_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/orgs_command.go b/command/v7/orgs_command.go index 92c2cd179b..82cb8fddb7 100644 --- a/command/v7/orgs_command.go +++ b/command/v7/orgs_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type OrgsCommand struct { diff --git a/command/v7/orgs_command_test.go b/command/v7/orgs_command_test.go index 15ad5a3a8d..c3126062bd 100644 --- a/command/v7/orgs_command_test.go +++ b/command/v7/orgs_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/packages_command.go b/command/v7/packages_command.go index 2aa01385d7..e6cfef70e8 100644 --- a/command/v7/packages_command.go +++ b/command/v7/packages_command.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/util/ui" ) type PackagesCommand struct { diff --git a/command/v7/packages_command_test.go b/command/v7/packages_command_test.go index e9a1a283c1..0542dd1b7f 100644 --- a/command/v7/packages_command_test.go +++ b/command/v7/packages_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/passwd_command.go b/command/v7/passwd_command.go index f68baa1cb1..8b91693313 100644 --- a/command/v7/passwd_command.go +++ b/command/v7/passwd_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type PasswdCommand struct { diff --git a/command/v7/passwd_command_test.go b/command/v7/passwd_command_test.go index 3bc9b12466..129ef14116 100644 --- a/command/v7/passwd_command_test.go +++ b/command/v7/passwd_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/purge_service_instance_command.go b/command/v7/purge_service_instance_command.go index fc646e47cf..bc5cbc1296 100644 --- a/command/v7/purge_service_instance_command.go +++ b/command/v7/purge_service_instance_command.go @@ -3,8 +3,8 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) const purgeServiceInstanceWarning = "WARNING: This operation assumes that the service broker responsible for this service instance is no longer available or is not responding with a 200 or 410, and the service instance has been deleted, leaving orphan records in Cloud Foundry's database. All knowledge of the service instance will be removed from Cloud Foundry, including service bindings and service keys." diff --git a/command/v7/purge_service_instance_command_test.go b/command/v7/purge_service_instance_command_test.go index 6c455d84d4..1b174c02be 100644 --- a/command/v7/purge_service_instance_command_test.go +++ b/command/v7/purge_service_instance_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/purge_service_offering_command.go b/command/v7/purge_service_offering_command.go index a8268c612a..ec4aa8132c 100644 --- a/command/v7/purge_service_offering_command.go +++ b/command/v7/purge_service_offering_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type PurgeServiceOfferingCommand struct { diff --git a/command/v7/purge_service_offering_command_test.go b/command/v7/purge_service_offering_command_test.go index c52d0335cd..9e37dfe69a 100644 --- a/command/v7/purge_service_offering_command_test.go +++ b/command/v7/purge_service_offering_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/push_command.go b/command/v7/push_command.go index 85a0af7774..bd5a97f34c 100644 --- a/command/v7/push_command.go +++ b/command/v7/push_command.go @@ -10,22 +10,22 @@ import ( log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/manifestparser" - "code.cloudfoundry.org/cli/util/progressbar" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/logcache" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v8/util/progressbar" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ProgressBar diff --git a/command/v7/push_command_test.go b/command/v7/push_command_test.go index 1a58b4cfaf..051fffc02e 100644 --- a/command/v7/push_command_test.go +++ b/command/v7/push_command_test.go @@ -5,23 +5,23 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/manifestparser" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v8/util/ui" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" diff --git a/command/v7/remove_network_policy_command.go b/command/v7/remove_network_policy_command.go index c959bd4067..183d314118 100644 --- a/command/v7/remove_network_policy_command.go +++ b/command/v7/remove_network_policy_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RemoveNetworkPolicyActor diff --git a/command/v7/remove_network_policy_command_test.go b/command/v7/remove_network_policy_command_test.go index 0072802ae5..447d83f94f 100644 --- a/command/v7/remove_network_policy_command_test.go +++ b/command/v7/remove_network_policy_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_command.go b/command/v7/rename_command.go index a2bb0b6efe..5cf755fb49 100644 --- a/command/v7/rename_command.go +++ b/command/v7/rename_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type RenameCommand struct { diff --git a/command/v7/rename_command_test.go b/command/v7/rename_command_test.go index 865eddc1e5..7853d8a953 100644 --- a/command/v7/rename_command_test.go +++ b/command/v7/rename_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_org_command.go b/command/v7/rename_org_command.go index 628095f80d..e0b059f3e2 100644 --- a/command/v7/rename_org_command.go +++ b/command/v7/rename_org_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type RenameOrgCommand struct { diff --git a/command/v7/rename_org_command_test.go b/command/v7/rename_org_command_test.go index 2a1a5a48b0..785b3e574c 100644 --- a/command/v7/rename_org_command_test.go +++ b/command/v7/rename_org_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_service_broker_command.go b/command/v7/rename_service_broker_command.go index 4cd5ad001a..c44fd30cd5 100644 --- a/command/v7/rename_service_broker_command.go +++ b/command/v7/rename_service_broker_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type RenameServiceBrokerCommand struct { diff --git a/command/v7/rename_service_broker_command_test.go b/command/v7/rename_service_broker_command_test.go index 28ff92efb9..1bd6a036c8 100644 --- a/command/v7/rename_service_broker_command_test.go +++ b/command/v7/rename_service_broker_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_service_command.go b/command/v7/rename_service_command.go index 8380d564cb..39e90a717d 100644 --- a/command/v7/rename_service_command.go +++ b/command/v7/rename_service_command.go @@ -3,9 +3,9 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type RenameServiceCommand struct { diff --git a/command/v7/rename_service_command_test.go b/command/v7/rename_service_command_test.go index 776f0b70c6..6ca31e7118 100644 --- a/command/v7/rename_service_command_test.go +++ b/command/v7/rename_service_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_space_command.go b/command/v7/rename_space_command.go index cf63ebf7d1..cfaba1f91e 100644 --- a/command/v7/rename_space_command.go +++ b/command/v7/rename_space_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type RenameSpaceCommand struct { diff --git a/command/v7/rename_space_command_test.go b/command/v7/rename_space_command_test.go index 1dc39eacdd..51e0d2e460 100644 --- a/command/v7/rename_space_command_test.go +++ b/command/v7/rename_space_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "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.go b/command/v7/reset_org_default_isolation_segment_command.go index 26763b4ff4..ba7413f3fc 100644 --- a/command/v7/reset_org_default_isolation_segment_command.go +++ b/command/v7/reset_org_default_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type ResetOrgDefaultIsolationSegmentCommand struct { 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 9529c3d6e3..26bb36687a 100644 --- a/command/v7/reset_org_default_isolation_segment_command_test.go +++ b/command/v7/reset_org_default_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/reset_space_isolation_segment_command.go b/command/v7/reset_space_isolation_segment_command.go index 4d87813506..49a9fe2763 100644 --- a/command/v7/reset_space_isolation_segment_command.go +++ b/command/v7/reset_space_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type ResetSpaceIsolationSegmentCommand struct { diff --git a/command/v7/reset_space_isolation_segment_command_test.go b/command/v7/reset_space_isolation_segment_command_test.go index ee99a5ff94..bfd7719223 100644 --- a/command/v7/reset_space_isolation_segment_command_test.go +++ b/command/v7/reset_space_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restage_command.go b/command/v7/restage_command.go index 6fa503b2d8..2d01766abd 100644 --- a/command/v7/restage_command.go +++ b/command/v7/restage_command.go @@ -1,14 +1,14 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/logcache" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type RestageCommand struct { diff --git a/command/v7/restage_command_test.go b/command/v7/restage_command_test.go index 8cddad4ca5..4034a9ea8a 100644 --- a/command/v7/restage_command_test.go +++ b/command/v7/restage_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restart_app_instance_command.go b/command/v7/restart_app_instance_command.go index 756f394102..d1c0f1717b 100644 --- a/command/v7/restart_app_instance_command.go +++ b/command/v7/restart_app_instance_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type RestartAppInstanceCommand struct { diff --git a/command/v7/restart_app_instance_command_test.go b/command/v7/restart_app_instance_command_test.go index ad616d1474..fbdc905efc 100644 --- a/command/v7/restart_app_instance_command_test.go +++ b/command/v7/restart_app_instance_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restart_command.go b/command/v7/restart_command.go index dfbe9c5e4a..edf7070f55 100644 --- a/command/v7/restart_command.go +++ b/command/v7/restart_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/logcache" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type RestartCommand struct { diff --git a/command/v7/restart_command_test.go b/command/v7/restart_command_test.go index 4d4f8e828b..57fb9370a7 100644 --- a/command/v7/restart_command_test.go +++ b/command/v7/restart_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/revision_command.go b/command/v7/revision_command.go index ebd429291b..99afa99b2b 100644 --- a/command/v7/revision_command.go +++ b/command/v7/revision_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" ) type RevisionCommand struct { diff --git a/command/v7/revision_command_test.go b/command/v7/revision_command_test.go index 2b31c71045..5b54e62c53 100644 --- a/command/v7/revision_command_test.go +++ b/command/v7/revision_command_test.go @@ -1,10 +1,10 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/revisions_command.go b/command/v7/revisions_command.go index 2c309350b6..72adf888b0 100644 --- a/command/v7/revisions_command.go +++ b/command/v7/revisions_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RevisionsActor diff --git a/command/v7/revisions_command_test.go b/command/v7/revisions_command_test.go index 6af5b8ff3d..fb4ed47d92 100644 --- a/command/v7/revisions_command_test.go +++ b/command/v7/revisions_command_test.go @@ -4,16 +4,16 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rollback_command.go b/command/v7/rollback_command.go index 29c7c2e716..ab66530629 100644 --- a/command/v7/rollback_command.go +++ b/command/v7/rollback_command.go @@ -3,13 +3,13 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type RollbackCommand struct { diff --git a/command/v7/rollback_command_test.go b/command/v7/rollback_command_test.go index 3218d02a9b..5b4ea7745e 100644 --- a/command/v7/rollback_command_test.go +++ b/command/v7/rollback_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/route_command.go b/command/v7/route_command.go index 1ed64478ee..a969b5ef9b 100644 --- a/command/v7/route_command.go +++ b/command/v7/route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" "strconv" ) diff --git a/command/v7/route_command_test.go b/command/v7/route_command_test.go index 7a10140914..661d81dc10 100644 --- a/command/v7/route_command_test.go +++ b/command/v7/route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/router_groups_command.go b/command/v7/router_groups_command.go index 924d8b44e0..3f09258623 100644 --- a/command/v7/router_groups_command.go +++ b/command/v7/router_groups_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/util/ui" ) type RouterGroupsCommand struct { diff --git a/command/v7/router_groups_command_test.go b/command/v7/router_groups_command_test.go index 2bf4cc4776..cf64597bcf 100644 --- a/command/v7/router_groups_command_test.go +++ b/command/v7/router_groups_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/routes_command.go b/command/v7/routes_command.go index 437704cdc8..fc59b0b85d 100644 --- a/command/v7/routes_command.go +++ b/command/v7/routes_command.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type RoutesCommand struct { diff --git a/command/v7/routes_command_test.go b/command/v7/routes_command_test.go index 0ae594bcd6..96c67dfa10 100644 --- a/command/v7/routes_command_test.go +++ b/command/v7/routes_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/run_task_command.go b/command/v7/run_task_command.go index 61defab781..0125479959 100644 --- a/command/v7/run_task_command.go +++ b/command/v7/run_task_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type RunTaskCommand struct { diff --git a/command/v7/run_task_command_test.go b/command/v7/run_task_command_test.go index 585e40f455..01c75b4537 100644 --- a/command/v7/run_task_command_test.go +++ b/command/v7/run_task_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/running_environment_variable_group_command.go b/command/v7/running_environment_variable_group_command.go index 9f36b48809..2cead40194 100644 --- a/command/v7/running_environment_variable_group_command.go +++ b/command/v7/running_environment_variable_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/util/ui" ) type RunningEnvironmentVariableGroupCommand struct { diff --git a/command/v7/running_environment_variable_group_command_test.go b/command/v7/running_environment_variable_group_command_test.go index 3378b273f7..d4cc8e7f03 100644 --- a/command/v7/running_environment_variable_group_command_test.go +++ b/command/v7/running_environment_variable_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/running_security_groups_command.go b/command/v7/running_security_groups_command.go index 07969d0e48..2a3aa419ff 100644 --- a/command/v7/running_security_groups_command.go +++ b/command/v7/running_security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" ) type RunningSecurityGroupsCommand struct { diff --git a/command/v7/running_security_groups_command_test.go b/command/v7/running_security_groups_command_test.go index e060875318..b3a608bf62 100644 --- a/command/v7/running_security_groups_command_test.go +++ b/command/v7/running_security_groups_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/scale_command.go b/command/v7/scale_command.go index 99bda380f9..fc4eab322a 100644 --- a/command/v7/scale_command.go +++ b/command/v7/scale_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) type ScaleCommand struct { diff --git a/command/v7/scale_command_test.go b/command/v7/scale_command_test.go index 94fc2d3c8a..f1e04c31e2 100644 --- a/command/v7/scale_command_test.go +++ b/command/v7/scale_command_test.go @@ -4,18 +4,18 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/security_group_command.go b/command/v7/security_group_command.go index b264d4a000..195607df68 100644 --- a/command/v7/security_group_command.go +++ b/command/v7/security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/util/ui" ) type SecurityGroupCommand struct { diff --git a/command/v7/security_group_command_test.go b/command/v7/security_group_command_test.go index 55520061ee..b05d61279b 100644 --- a/command/v7/security_group_command_test.go +++ b/command/v7/security_group_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/security_groups_command.go b/command/v7/security_groups_command.go index b5b1442b79..976da4dee1 100644 --- a/command/v7/security_groups_command.go +++ b/command/v7/security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" ) type SecurityGroupsCommand struct { diff --git a/command/v7/security_groups_command_test.go b/command/v7/security_groups_command_test.go index 978ea302cd..453ec62dbd 100644 --- a/command/v7/security_groups_command_test.go +++ b/command/v7/security_groups_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_access_command.go b/command/v7/service_access_command.go index f61fb64ac3..a9e30721e2 100644 --- a/command/v7/service_access_command.go +++ b/command/v7/service_access_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" ) type ServiceAccessCommand struct { diff --git a/command/v7/service_access_command_test.go b/command/v7/service_access_command_test.go index 174d82b719..4029d0b09b 100644 --- a/command/v7/service_access_command_test.go +++ b/command/v7/service_access_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/service_brokers_command.go b/command/v7/service_brokers_command.go index 4c36910b29..59365e167d 100644 --- a/command/v7/service_brokers_command.go +++ b/command/v7/service_brokers_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type ServiceBrokersCommand struct { diff --git a/command/v7/service_brokers_command_test.go b/command/v7/service_brokers_command_test.go index b6d3fe4177..490086a89a 100644 --- a/command/v7/service_brokers_command_test.go +++ b/command/v7/service_brokers_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_command.go b/command/v7/service_command.go index c528d7ae59..0d70e17f5c 100644 --- a/command/v7/service_command.go +++ b/command/v7/service_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) const indent = " " diff --git a/command/v7/service_command_test.go b/command/v7/service_command_test.go index cddd13ac08..d08e068e77 100644 --- a/command/v7/service_command_test.go +++ b/command/v7/service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_key_command.go b/command/v7/service_key_command.go index 9bb96a4007..bd317d4dd9 100644 --- a/command/v7/service_key_command.go +++ b/command/v7/service_key_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type ServiceKeyCommand struct { diff --git a/command/v7/service_key_command_test.go b/command/v7/service_key_command_test.go index ceaa655266..c046756bb5 100644 --- a/command/v7/service_key_command_test.go +++ b/command/v7/service_key_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_keys_command.go b/command/v7/service_keys_command.go index 2d5c7f5aff..1c1d7a7f1c 100644 --- a/command/v7/service_keys_command.go +++ b/command/v7/service_keys_command.go @@ -3,9 +3,9 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type ServiceKeysCommand struct { diff --git a/command/v7/service_keys_command_test.go b/command/v7/service_keys_command_test.go index ebf2cc76e7..76618ec75e 100644 --- a/command/v7/service_keys_command_test.go +++ b/command/v7/service_keys_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/services_command.go b/command/v7/services_command.go index a8c0df21f6..23787a1b06 100644 --- a/command/v7/services_command.go +++ b/command/v7/services_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/ui" ) type ServicesCommand struct { diff --git a/command/v7/services_command_test.go b/command/v7/services_command_test.go index b952885f8f..3075e4cb69 100644 --- a/command/v7/services_command_test.go +++ b/command/v7/services_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_droplet_command.go b/command/v7/set_droplet_command.go index 4528c1d649..0a5888291c 100644 --- a/command/v7/set_droplet_command.go +++ b/command/v7/set_droplet_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SetDropletCommand struct { diff --git a/command/v7/set_droplet_command_test.go b/command/v7/set_droplet_command_test.go index 3ebbfa8d15..945f0da021 100644 --- a/command/v7/set_droplet_command_test.go +++ b/command/v7/set_droplet_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_env_command.go b/command/v7/set_env_command.go index 2dc01c88a4..69d965ab39 100644 --- a/command/v7/set_env_command.go +++ b/command/v7/set_env_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SetEnvCommand struct { diff --git a/command/v7/set_env_command_test.go b/command/v7/set_env_command_test.go index f301972349..4249001ae9 100644 --- a/command/v7/set_env_command_test.go +++ b/command/v7/set_env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_health_check_command.go b/command/v7/set_health_check_command.go index 83059b3d2d..24239921bf 100644 --- a/command/v7/set_health_check_command.go +++ b/command/v7/set_health_check_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SetHealthCheckCommand struct { diff --git a/command/v7/set_health_check_command_test.go b/command/v7/set_health_check_command_test.go index 24ba6d97eb..2b746cffe4 100644 --- a/command/v7/set_health_check_command_test.go +++ b/command/v7/set_health_check_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_label_command.go b/command/v7/set_label_command.go index 06522547b4..dfb2d00068 100644 --- a/command/v7/set_label_command.go +++ b/command/v7/set_label_command.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LabelSetter diff --git a/command/v7/set_label_command_test.go b/command/v7/set_label_command_test.go index 7f730ce581..e8d630789d 100644 --- a/command/v7/set_label_command_test.go +++ b/command/v7/set_label_command_test.go @@ -1,10 +1,10 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/set_org_default_isolation_segment_command.go b/command/v7/set_org_default_isolation_segment_command.go index a19f517fa0..da90098f0b 100644 --- a/command/v7/set_org_default_isolation_segment_command.go +++ b/command/v7/set_org_default_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SetOrgDefaultIsolationSegmentCommand struct { 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 839ec9acb5..e911f5c9c3 100644 --- a/command/v7/set_org_default_isolation_segment_command_test.go +++ b/command/v7/set_org_default_isolation_segment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_org_quota_command.go b/command/v7/set_org_quota_command.go index 2baad4c8ef..506fa2f66e 100644 --- a/command/v7/set_org_quota_command.go +++ b/command/v7/set_org_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SetOrgQuotaCommand struct { diff --git a/command/v7/set_org_quota_command_test.go b/command/v7/set_org_quota_command_test.go index 9e3110cf44..d437549a34 100644 --- a/command/v7/set_org_quota_command_test.go +++ b/command/v7/set_org_quota_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" + + . "code.cloudfoundry.org/cli/v8/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_org_role_command.go b/command/v7/set_org_role_command.go index a57ea35399..66c3aab939 100644 --- a/command/v7/set_org_role_command.go +++ b/command/v7/set_org_role_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type SetOrgRoleCommand struct { diff --git a/command/v7/set_org_role_command_test.go b/command/v7/set_org_role_command_test.go index 998c06c5f5..31f6042857 100644 --- a/command/v7/set_org_role_command_test.go +++ b/command/v7/set_org_role_command_test.go @@ -1,19 +1,19 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/util/ui" . "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.go b/command/v7/set_running_environment_variable_group_command.go index c305199768..7b14ada925 100644 --- a/command/v7/set_running_environment_variable_group_command.go +++ b/command/v7/set_running_environment_variable_group_command.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type SetRunningEnvironmentVariableGroupCommand struct { 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 8793636781..80aaa1e5a9 100644 --- a/command/v7/set_running_environment_variable_group_command_test.go +++ b/command/v7/set_running_environment_variable_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/set_space_isolation_segment_command.go b/command/v7/set_space_isolation_segment_command.go index 5358899559..6f9412d2bd 100644 --- a/command/v7/set_space_isolation_segment_command.go +++ b/command/v7/set_space_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SetSpaceIsolationSegmentCommand struct { diff --git a/command/v7/set_space_isolation_segment_command_test.go b/command/v7/set_space_isolation_segment_command_test.go index 26d4fe7698..74dc182542 100644 --- a/command/v7/set_space_isolation_segment_command_test.go +++ b/command/v7/set_space_isolation_segment_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_space_quota_command.go b/command/v7/set_space_quota_command.go index ab97cfabcd..6371913cb5 100644 --- a/command/v7/set_space_quota_command.go +++ b/command/v7/set_space_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SetSpaceQuotaCommand struct { diff --git a/command/v7/set_space_quota_command_test.go b/command/v7/set_space_quota_command_test.go index 17edd64be7..3a4aecad89 100644 --- a/command/v7/set_space_quota_command_test.go +++ b/command/v7/set_space_quota_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" + + . "code.cloudfoundry.org/cli/v8/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_space_role_command.go b/command/v7/set_space_role_command.go index 77ba20ced8..5b6133e960 100644 --- a/command/v7/set_space_role_command.go +++ b/command/v7/set_space_role_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type SetSpaceRoleCommand struct { diff --git a/command/v7/set_space_role_command_test.go b/command/v7/set_space_role_command_test.go index 29613d0de1..bdba102e83 100644 --- a/command/v7/set_space_role_command_test.go +++ b/command/v7/set_space_role_command_test.go @@ -1,19 +1,19 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/util/ui" . "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.go b/command/v7/set_staging_environment_variable_group_command.go index 20cd146d30..bba7d047e0 100644 --- a/command/v7/set_staging_environment_variable_group_command.go +++ b/command/v7/set_staging_environment_variable_group_command.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type SetStagingEnvironmentVariableGroupCommand struct { 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 c036deb979..82f1c354a9 100644 --- a/command/v7/set_staging_environment_variable_group_command_test.go +++ b/command/v7/set_staging_environment_variable_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/share_private_domain_command.go b/command/v7/share_private_domain_command.go index 2ba4f0a861..0dabac7bdb 100644 --- a/command/v7/share_private_domain_command.go +++ b/command/v7/share_private_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SharePrivateDomainCommand struct { diff --git a/command/v7/share_private_domain_command_test.go b/command/v7/share_private_domain_command_test.go index fe0741c5e9..e7b34460f1 100644 --- a/command/v7/share_private_domain_command_test.go +++ b/command/v7/share_private_domain_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/share_route_command.go b/command/v7/share_route_command.go index 36f07fa27f..767d9573eb 100644 --- a/command/v7/share_route_command.go +++ b/command/v7/share_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type ShareRouteCommand struct { diff --git a/command/v7/share_route_command_test.go b/command/v7/share_route_command_test.go index e3c5350630..67047a8c10 100644 --- a/command/v7/share_route_command_test.go +++ b/command/v7/share_route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/share_service_command.go b/command/v7/share_service_command.go index cf0a8bdd40..76a46b1504 100644 --- a/command/v7/share_service_command.go +++ b/command/v7/share_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/types" ) type ShareServiceCommand struct { diff --git a/command/v7/share_service_command_test.go b/command/v7/share_service_command_test.go index 2b2315042c..78026f1e36 100644 --- a/command/v7/share_service_command_test.go +++ b/command/v7/share_service_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/app_stager.go b/command/v7/shared/app_stager.go index 2aed583033..3389528306 100644 --- a/command/v7/shared/app_stager.go +++ b/command/v7/shared/app_stager.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" ) /* diff --git a/command/v7/shared/app_stager_test.go b/command/v7/shared/app_stager_test.go index 067ddb9631..b4bdfe1084 100644 --- a/command/v7/shared/app_stager_test.go +++ b/command/v7/shared/app_stager_test.go @@ -5,17 +5,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/app_summary_displayer.go b/command/v7/shared/app_summary_displayer.go index f7d386a66b..46a97218df 100644 --- a/command/v7/shared/app_summary_displayer.go +++ b/command/v7/shared/app_summary_displayer.go @@ -7,11 +7,11 @@ import ( "time" "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" log "github.com/sirupsen/logrus" ) diff --git a/command/v7/shared/app_summary_displayer_test.go b/command/v7/shared/app_summary_displayer_test.go index 833dc595cd..a751cfb6d4 100644 --- a/command/v7/shared/app_summary_displayer_test.go +++ b/command/v7/shared/app_summary_displayer_test.go @@ -3,13 +3,13 @@ package shared_test import ( "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/manifest_diff_displayer.go b/command/v7/shared/manifest_diff_displayer.go index 254a2c9455..eaac038ad6 100644 --- a/command/v7/shared/manifest_diff_displayer.go +++ b/command/v7/shared/manifest_diff_displayer.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/resources" "gopkg.in/yaml.v2" ) diff --git a/command/v7/shared/manifest_diff_displayer_test.go b/command/v7/shared/manifest_diff_displayer_test.go index e3f63f77e3..f9d990911b 100644 --- a/command/v7/shared/manifest_diff_displayer_test.go +++ b/command/v7/shared/manifest_diff_displayer_test.go @@ -1,9 +1,9 @@ package shared_test import ( - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/new_clients.go b/command/v7/shared/new_clients.go index 4486bd8ffa..2c797a1e58 100644 --- a/command/v7/shared/new_clients.go +++ b/command/v7/shared/new_clients.go @@ -1,15 +1,15 @@ package shared import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - ccWrapper "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/router" - routingWrapper "code.cloudfoundry.org/cli/api/router/wrapper" - "code.cloudfoundry.org/cli/api/uaa" - uaaWrapper "code.cloudfoundry.org/cli/api/uaa/wrapper" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + ccWrapper "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v8/api/router" + routingWrapper "code.cloudfoundry.org/cli/v8/api/router/wrapper" + "code.cloudfoundry.org/cli/v8/api/uaa" + uaaWrapper "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) func GetNewClientsAndConnectToCF(config command.Config, ui command.UI, minVersionV3 string) (*ccv3.Client, *uaa.Client, *router.Client, error) { diff --git a/command/v7/shared/new_clients_test.go b/command/v7/shared/new_clients_test.go index c8c425b4a1..751d101039 100644 --- a/command/v7/shared/new_clients_test.go +++ b/command/v7/shared/new_clients_test.go @@ -4,10 +4,10 @@ import ( "runtime" "time" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/new_networking_client.go b/command/v7/shared/new_networking_client.go index 24057e3df8..855a50408b 100644 --- a/command/v7/shared/new_networking_client.go +++ b/command/v7/shared/new_networking_client.go @@ -3,9 +3,9 @@ package shared import ( "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/wrapper" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) // NewNetworkingClient creates a new cfnetworking client. @@ -24,7 +24,7 @@ func NewNetworkingClient(apiURL string, config command.Config, uaaClient *uaa.Cl wrappers = append(wrappers, wrapper.NewRequestLogger(ui.RequestLoggerFileWriter(location))) } - authWrapper := wrapper.NewUAAAuthentication(uaaClient, config) + authWrapper := wrapper.NewUAAAuthentication(uaaClient.LegacyClient(), config) wrappers = append(wrappers, authWrapper) wrappers = append(wrappers, wrapper.NewRetryRequest(config.RequestRetryCount())) diff --git a/command/v7/shared/new_networking_client_test.go b/command/v7/shared/new_networking_client_test.go index b9e0c344c1..60ebd1d74b 100644 --- a/command/v7/shared/new_networking_client_test.go +++ b/command/v7/shared/new_networking_client_test.go @@ -1,11 +1,11 @@ package shared_test import ( - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v8/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/package_displayer.go b/command/v7/shared/package_displayer.go index 615c851102..3d013c3741 100644 --- a/command/v7/shared/package_displayer.go +++ b/command/v7/shared/package_displayer.go @@ -1,7 +1,7 @@ package shared import ( - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v8/command" ) type PackageDisplayer struct { diff --git a/command/v7/shared/quota_displayer.go b/command/v7/shared/quota_displayer.go index bcb84ddc97..09815fa432 100644 --- a/command/v7/shared/quota_displayer.go +++ b/command/v7/shared/quota_displayer.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/ui" ) const ( diff --git a/command/v7/shared/result_waiter.go b/command/v7/shared/result_waiter.go index f16f5c3668..45922a9a1b 100644 --- a/command/v7/shared/result_waiter.go +++ b/command/v7/shared/result_waiter.go @@ -3,8 +3,8 @@ package shared import ( "fmt" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" ) func WaitForResult(stream chan v7action.PollJobEvent, ui command.UI, waitForCompletion bool) (bool, error) { diff --git a/command/v7/shared/sharedfakes/fake_app_stager.go b/command/v7/shared/sharedfakes/fake_app_stager.go index 8c46eca403..ba9d830a0f 100644 --- a/command/v7/shared/sharedfakes/fake_app_stager.go +++ b/command/v7/shared/sharedfakes/fake_app_stager.go @@ -4,9 +4,9 @@ package sharedfakes import ( "sync" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type FakeAppStager struct { diff --git a/command/v7/shared/v3_poll_stage.go b/command/v7/shared/v3_poll_stage.go index 1c48365d62..0898caf3f8 100644 --- a/command/v7/shared/v3_poll_stage.go +++ b/command/v7/shared/v3_poll_stage.go @@ -1,11 +1,11 @@ package shared import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/resources" ) func PollStage(dropletStream <-chan resources.Droplet, warningsStream <-chan v7action.Warnings, errStream <-chan error, logStream <-chan sharedaction.LogMessage, logErrStream <-chan error, ui command.UI) (resources.Droplet, error) { diff --git a/command/v7/shared/v3_poll_stage_test.go b/command/v7/shared/v3_poll_stage_test.go index 01483fbcef..f1f06032ad 100644 --- a/command/v7/shared/v3_poll_stage_test.go +++ b/command/v7/shared/v3_poll_stage_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - . "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + . "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/version_checker.go b/command/v7/shared/version_checker.go index 9c3d3f42b9..58692449a1 100644 --- a/command/v7/shared/version_checker.go +++ b/command/v7/shared/version_checker.go @@ -3,7 +3,7 @@ package shared import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" "github.com/blang/semver/v4" ) diff --git a/command/v7/shared/version_checker_test.go b/command/v7/shared/version_checker_test.go index d82fbf2115..4df2d9fafe 100644 --- a/command/v7/shared/version_checker_test.go +++ b/command/v7/shared/version_checker_test.go @@ -1,7 +1,7 @@ package shared_test import ( - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/command/v7/shared" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/space_command.go b/command/v7/space_command.go index cf5d52ea7d..533fb7dbf4 100644 --- a/command/v7/space_command.go +++ b/command/v7/space_command.go @@ -4,10 +4,10 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type SpaceCommand struct { diff --git a/command/v7/space_command_test.go b/command/v7/space_command_test.go index 259ad0232f..ce33a303ca 100644 --- a/command/v7/space_command_test.go +++ b/command/v7/space_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/space_quota_command.go b/command/v7/space_quota_command.go index 8cbdcc2d45..06161db629 100644 --- a/command/v7/space_quota_command.go +++ b/command/v7/space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" ) type SpaceQuotaCommand struct { diff --git a/command/v7/space_quota_command_test.go b/command/v7/space_quota_command_test.go index 578b262e27..ce5d8467d3 100644 --- a/command/v7/space_quota_command_test.go +++ b/command/v7/space_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/space_quotas_command.go b/command/v7/space_quotas_command.go index 481cd6c61f..3903bc40a8 100644 --- a/command/v7/space_quotas_command.go +++ b/command/v7/space_quotas_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" ) type SpaceQuotasCommand struct { diff --git a/command/v7/space_quotas_command_test.go b/command/v7/space_quotas_command_test.go index af99700783..81e671e606 100644 --- a/command/v7/space_quotas_command_test.go +++ b/command/v7/space_quotas_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/space_ssh_allowed_command.go b/command/v7/space_ssh_allowed_command.go index eabef97c5a..b6f552c182 100644 --- a/command/v7/space_ssh_allowed_command.go +++ b/command/v7/space_ssh_allowed_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type SpaceSSHAllowedCommand struct { diff --git a/command/v7/space_ssh_allowed_command_test.go b/command/v7/space_ssh_allowed_command_test.go index ba208d631f..75a6583ea1 100644 --- a/command/v7/space_ssh_allowed_command_test.go +++ b/command/v7/space_ssh_allowed_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/space_users_command.go b/command/v7/space_users_command.go index 149ddb9aa3..b9aa2daae7 100644 --- a/command/v7/space_users_command.go +++ b/command/v7/space_users_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type SpaceUsersCommand struct { diff --git a/command/v7/space_users_command_test.go b/command/v7/space_users_command_test.go index b7f18b1e3f..35ac70c148 100644 --- a/command/v7/space_users_command_test.go +++ b/command/v7/space_users_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/spaces_command.go b/command/v7/spaces_command.go index 430c264dba..1c5e22cd85 100644 --- a/command/v7/spaces_command.go +++ b/command/v7/spaces_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/ui" ) type SpacesCommand struct { diff --git a/command/v7/spaces_command_test.go b/command/v7/spaces_command_test.go index 98afb88a88..baa0e8902f 100644 --- a/command/v7/spaces_command_test.go +++ b/command/v7/spaces_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "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 46dcf5fe59..33199276fc 100644 --- a/command/v7/ssh_code_command_test.go +++ b/command/v7/ssh_code_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/ssh_command.go b/command/v7/ssh_command.go index c9caf5d2f6..3cd2b72c57 100644 --- a/command/v7/ssh_command.go +++ b/command/v7/ssh_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/clissh" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedSSHActor diff --git a/command/v7/ssh_command_test.go b/command/v7/ssh_command_test.go index 556e25662e..9077596a4a 100644 --- a/command/v7/ssh_command_test.go +++ b/command/v7/ssh_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/ssh_enabled_command.go b/command/v7/ssh_enabled_command.go index 9ddf1a9f15..17c725196c 100644 --- a/command/v7/ssh_enabled_command.go +++ b/command/v7/ssh_enabled_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type SSHEnabledCommand struct { diff --git a/command/v7/ssh_enabled_command_test.go b/command/v7/ssh_enabled_command_test.go index 069b03bdd9..c0d1fd3c2c 100644 --- a/command/v7/ssh_enabled_command_test.go +++ b/command/v7/ssh_enabled_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stack_command.go b/command/v7/stack_command.go index a7ca6add76..d721055442 100644 --- a/command/v7/stack_command.go +++ b/command/v7/stack_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type StackCommand struct { diff --git a/command/v7/stack_command_test.go b/command/v7/stack_command_test.go index ad3faaf070..5f8da5f189 100644 --- a/command/v7/stack_command_test.go +++ b/command/v7/stack_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/resources" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stacks_command.go b/command/v7/stacks_command.go index 0e4b792633..413339e76e 100644 --- a/command/v7/stacks_command.go +++ b/command/v7/stacks_command.go @@ -3,9 +3,9 @@ package v7 import ( "sort" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/sorting" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/sorting" + "code.cloudfoundry.org/cli/v8/util/ui" ) type StacksCommand struct { diff --git a/command/v7/stacks_command_test.go b/command/v7/stacks_command_test.go index a5be967d3f..08b14de0b1 100644 --- a/command/v7/stacks_command_test.go +++ b/command/v7/stacks_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/stage_package_command.go b/command/v7/stage_package_command.go index 3406a444c3..9f08112d23 100644 --- a/command/v7/stage_package_command.go +++ b/command/v7/stage_package_command.go @@ -4,13 +4,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/logcache" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/resources" ) type StagePackageCommand struct { diff --git a/command/v7/stage_package_command_test.go b/command/v7/stage_package_command_test.go index 7a781d724f..edb157f1a5 100644 --- a/command/v7/stage_package_command_test.go +++ b/command/v7/stage_package_command_test.go @@ -5,18 +5,18 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/staging_environment_variable_group_command.go b/command/v7/staging_environment_variable_group_command.go index 3746e7a458..54fdf36683 100644 --- a/command/v7/staging_environment_variable_group_command.go +++ b/command/v7/staging_environment_variable_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/util/ui" ) type StagingEnvironmentVariableGroupCommand struct { diff --git a/command/v7/staging_environment_variable_group_command_test.go b/command/v7/staging_environment_variable_group_command_test.go index 4aac5ffaf7..d9795fbf37 100644 --- a/command/v7/staging_environment_variable_group_command_test.go +++ b/command/v7/staging_environment_variable_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/staging_security_groups_command.go b/command/v7/staging_security_groups_command.go index 8b4203eb57..82bcea7be8 100644 --- a/command/v7/staging_security_groups_command.go +++ b/command/v7/staging_security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" ) type StagingSecurityGroupsCommand struct { diff --git a/command/v7/staging_security_groups_command_test.go b/command/v7/staging_security_groups_command_test.go index 022f71dafc..2cfd7097a4 100644 --- a/command/v7/staging_security_groups_command_test.go +++ b/command/v7/staging_security_groups_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/start_command.go b/command/v7/start_command.go index 3316ab5474..babc0c6acf 100644 --- a/command/v7/start_command.go +++ b/command/v7/start_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/logcache" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/logcache" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type StartCommand struct { diff --git a/command/v7/start_command_test.go b/command/v7/start_command_test.go index bc8a1c2759..ef092aeab4 100644 --- a/command/v7/start_command_test.go +++ b/command/v7/start_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stop_command.go b/command/v7/stop_command.go index 514f1ecba5..7ba757456d 100644 --- a/command/v7/stop_command.go +++ b/command/v7/stop_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type StopCommand struct { diff --git a/command/v7/stop_command_test.go b/command/v7/stop_command_test.go index 52a3b59e46..c549b76825 100644 --- a/command/v7/stop_command_test.go +++ b/command/v7/stop_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/target_command.go b/command/v7/target_command.go index 05595ca294..e894841980 100644 --- a/command/v7/target_command.go +++ b/command/v7/target_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type TargetCommand struct { diff --git a/command/v7/target_command_test.go b/command/v7/target_command_test.go index 3923e712b7..92318dc4b4 100644 --- a/command/v7/target_command_test.go +++ b/command/v7/target_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/tasks_command.go b/command/v7/tasks_command.go index 9c3cf8fcdf..347890a6eb 100644 --- a/command/v7/tasks_command.go +++ b/command/v7/tasks_command.go @@ -4,9 +4,9 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/util/ui" ) type TasksCommand struct { diff --git a/command/v7/tasks_command_test.go b/command/v7/tasks_command_test.go index d4d2fb4b4e..433a441c0e 100644 --- a/command/v7/tasks_command_test.go +++ b/command/v7/tasks_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/terminate_task_command.go b/command/v7/terminate_task_command.go index 0099980f16..fffd268b27 100644 --- a/command/v7/terminate_task_command.go +++ b/command/v7/terminate_task_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type TerminateTaskCommand struct { diff --git a/command/v7/terminate_task_command_test.go b/command/v7/terminate_task_command_test.go index d4e52a5ff1..dbff427df6 100644 --- a/command/v7/terminate_task_command_test.go +++ b/command/v7/terminate_task_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_route_service_command.go b/command/v7/unbind_route_service_command.go index d973dc6c48..d77a474b21 100644 --- a/command/v7/unbind_route_service_command.go +++ b/command/v7/unbind_route_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type UnbindRouteServiceCommand struct { diff --git a/command/v7/unbind_route_service_command_test.go b/command/v7/unbind_route_service_command_test.go index 36f7524c81..05910c0157 100644 --- a/command/v7/unbind_route_service_command_test.go +++ b/command/v7/unbind_route_service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "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 5cc2476d3d..c0f25e2a4f 100644 --- a/command/v7/unbind_running_group_command_test.go +++ b/command/v7/unbind_running_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_running_security_group_command.go b/command/v7/unbind_running_security_group_command.go index fd5ac730f3..58d818c4b4 100644 --- a/command/v7/unbind_running_security_group_command.go +++ b/command/v7/unbind_running_security_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UnbindRunningSecurityGroupCommand struct { diff --git a/command/v7/unbind_security_group.go b/command/v7/unbind_security_group.go index e4a6b00f15..6c5bd4f4c7 100644 --- a/command/v7/unbind_security_group.go +++ b/command/v7/unbind_security_group.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UnbindSecurityGroupCommand struct { diff --git a/command/v7/unbind_security_group_test.go b/command/v7/unbind_security_group_test.go index d523027403..1140dd1f42 100644 --- a/command/v7/unbind_security_group_test.go +++ b/command/v7/unbind_security_group_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_service_command.go b/command/v7/unbind_service_command.go index 4030d17da4..9ba1d95ae5 100644 --- a/command/v7/unbind_service_command.go +++ b/command/v7/unbind_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type UnbindServiceCommand struct { diff --git a/command/v7/unbind_service_command_test.go b/command/v7/unbind_service_command_test.go index b050354cc7..8085bef869 100644 --- a/command/v7/unbind_service_command_test.go +++ b/command/v7/unbind_service_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_staging_security_group_command.go b/command/v7/unbind_staging_security_group_command.go index a82f1541f2..e67680127e 100644 --- a/command/v7/unbind_staging_security_group_command.go +++ b/command/v7/unbind_staging_security_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UnbindStagingSecurityGroupCommand struct { diff --git a/command/v7/unbind_staging_security_group_command_test.go b/command/v7/unbind_staging_security_group_command_test.go index 8b52a5dbf6..8e4a47dad8 100644 --- a/command/v7/unbind_staging_security_group_command_test.go +++ b/command/v7/unbind_staging_security_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unmap_route_command.go b/command/v7/unmap_route_command.go index d6bc80da0a..9e4d0176b7 100644 --- a/command/v7/unmap_route_command.go +++ b/command/v7/unmap_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UnmapRouteCommand struct { diff --git a/command/v7/unmap_route_command_test.go b/command/v7/unmap_route_command_test.go index a387f4df09..12887207d7 100644 --- a/command/v7/unmap_route_command_test.go +++ b/command/v7/unmap_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/unset_env_command.go b/command/v7/unset_env_command.go index 47243449dd..7b1b639d11 100644 --- a/command/v7/unset_env_command.go +++ b/command/v7/unset_env_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UnsetEnvCommand struct { diff --git a/command/v7/unset_env_command_test.go b/command/v7/unset_env_command_test.go index c9b7ad6d53..e12f63c9df 100644 --- a/command/v7/unset_env_command_test.go +++ b/command/v7/unset_env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_label_command.go b/command/v7/unset_label_command.go index 0636f7d009..3f93f2178b 100644 --- a/command/v7/unset_label_command.go +++ b/command/v7/unset_label_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LabelUnsetter diff --git a/command/v7/unset_label_command_test.go b/command/v7/unset_label_command_test.go index 09e5f7ddae..e1607ce38c 100644 --- a/command/v7/unset_label_command_test.go +++ b/command/v7/unset_label_command_test.go @@ -1,10 +1,10 @@ package v7_test import ( - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/unset_org_role_command.go b/command/v7/unset_org_role_command.go index c7798f0d17..3c9782cf7a 100644 --- a/command/v7/unset_org_role_command.go +++ b/command/v7/unset_org_role_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type UnsetOrgRoleCommand struct { diff --git a/command/v7/unset_org_role_command_test.go b/command/v7/unset_org_role_command_test.go index e79263df0f..0a6b0c93c6 100644 --- a/command/v7/unset_org_role_command_test.go +++ b/command/v7/unset_org_role_command_test.go @@ -1,18 +1,18 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_space_quota_command.go b/command/v7/unset_space_quota_command.go index 39d4f8bd6e..cf4d2374c2 100644 --- a/command/v7/unset_space_quota_command.go +++ b/command/v7/unset_space_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UnsetSpaceQuotaCommand struct { diff --git a/command/v7/unset_space_quota_command_test.go b/command/v7/unset_space_quota_command_test.go index c0b3f1744f..0485ee6ece 100644 --- a/command/v7/unset_space_quota_command_test.go +++ b/command/v7/unset_space_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" + + . "code.cloudfoundry.org/cli/v8/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_space_role_command.go b/command/v7/unset_space_role_command.go index 56abfc332f..094d67de10 100644 --- a/command/v7/unset_space_role_command.go +++ b/command/v7/unset_space_role_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type UnsetSpaceRoleCommand struct { diff --git a/command/v7/unset_space_role_command_test.go b/command/v7/unset_space_role_command_test.go index 0123e3753b..7a14d7e153 100644 --- a/command/v7/unset_space_role_command_test.go +++ b/command/v7/unset_space_role_command_test.go @@ -1,18 +1,18 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unshare_private_domain_command.go b/command/v7/unshare_private_domain_command.go index d2fe387825..95cb25f20b 100644 --- a/command/v7/unshare_private_domain_command.go +++ b/command/v7/unshare_private_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UnsharePrivateDomainCommand struct { diff --git a/command/v7/unshare_private_domain_command_test.go b/command/v7/unshare_private_domain_command_test.go index 04d8ea5e3f..01c1c89969 100644 --- a/command/v7/unshare_private_domain_command_test.go +++ b/command/v7/unshare_private_domain_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/unshare_route_command.go b/command/v7/unshare_route_command.go index 982da124f5..cc6eedc111 100644 --- a/command/v7/unshare_route_command.go +++ b/command/v7/unshare_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UnshareRouteCommand struct { diff --git a/command/v7/unshare_route_command_test.go b/command/v7/unshare_route_command_test.go index 8a8901f746..06afafc7fa 100644 --- a/command/v7/unshare_route_command_test.go +++ b/command/v7/unshare_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unshare_service_command.go b/command/v7/unshare_service_command.go index 73d1d213cb..c6a8cbb649 100644 --- a/command/v7/unshare_service_command.go +++ b/command/v7/unshare_service_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/types" ) type UnshareServiceCommand struct { diff --git a/command/v7/unshare_service_command_test.go b/command/v7/unshare_service_command_test.go index 3c59851645..d4addada98 100644 --- a/command/v7/unshare_service_command_test.go +++ b/command/v7/unshare_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_buildpack_command.go b/command/v7/update_buildpack_command.go index 8b71321d87..61ed13094e 100644 --- a/command/v7/update_buildpack_command.go +++ b/command/v7/update_buildpack_command.go @@ -4,16 +4,16 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/download" ) type UpdateBuildpackActor interface { diff --git a/command/v7/update_buildpack_command_test.go b/command/v7/update_buildpack_command_test.go index 834baffd40..293b10ec35 100644 --- a/command/v7/update_buildpack_command_test.go +++ b/command/v7/update_buildpack_command_test.go @@ -3,20 +3,20 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + + "code.cloudfoundry.org/cli/v8/command/translatableerror" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_destination_command.go b/command/v7/update_destination_command.go index 082b693db3..ad8b9fe7cc 100644 --- a/command/v7/update_destination_command.go +++ b/command/v7/update_destination_command.go @@ -3,8 +3,8 @@ package v7 import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UpdateDestinationCommand struct { diff --git a/command/v7/update_destination_command_test.go b/command/v7/update_destination_command_test.go index 2bbf0de17a..c81e32ff27 100644 --- a/command/v7/update_destination_command_test.go +++ b/command/v7/update_destination_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_org_quota_command.go b/command/v7/update_org_quota_command.go index 70124cfc20..d9199ac48a 100644 --- a/command/v7/update_org_quota_command.go +++ b/command/v7/update_org_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type UpdateOrgQuotaCommand struct { diff --git a/command/v7/update_org_quota_command_test.go b/command/v7/update_org_quota_command_test.go index bfb33016ee..4d4409900b 100644 --- a/command/v7/update_org_quota_command_test.go +++ b/command/v7/update_org_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_security_group_command.go b/command/v7/update_security_group_command.go index b24f47af38..47846ca151 100644 --- a/command/v7/update_security_group_command.go +++ b/command/v7/update_security_group_command.go @@ -3,8 +3,8 @@ package v7 import ( "encoding/json" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" ) type UpdateSecurityGroupCommand struct { diff --git a/command/v7/update_security_group_command_test.go b/command/v7/update_security_group_command_test.go index 3de0df3ce4..e59beea631 100644 --- a/command/v7/update_security_group_command_test.go +++ b/command/v7/update_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "encoding/json" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_service_broker_command.go b/command/v7/update_service_broker_command.go index 2ff5089103..15620eb0cd 100644 --- a/command/v7/update_service_broker_command.go +++ b/command/v7/update_service_broker_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" ) type UpdateServiceBrokerCommand struct { diff --git a/command/v7/update_service_broker_command_test.go b/command/v7/update_service_broker_command_test.go index 8574a41bbc..d4ab809f14 100644 --- a/command/v7/update_service_broker_command_test.go +++ b/command/v7/update_service_broker_command_test.go @@ -4,15 +4,15 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/cf/errors" - "code.cloudfoundry.org/cli/command/commandfakes" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_service_command.go b/command/v7/update_service_command.go index 289cec1ed8..2c10086cff 100644 --- a/command/v7/update_service_command.go +++ b/command/v7/update_service_command.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v8/types" ) type UpdateServiceCommand struct { diff --git a/command/v7/update_service_command_test.go b/command/v7/update_service_command_test.go index f9983b42e4..4d81b73ddb 100644 --- a/command/v7/update_service_command_test.go +++ b/command/v7/update_service_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_space_quota_command.go b/command/v7/update_space_quota_command.go index 300645c44e..03d4498093 100644 --- a/command/v7/update_space_quota_command.go +++ b/command/v7/update_space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) type UpdateSpaceQuotaCommand struct { diff --git a/command/v7/update_space_quota_command_test.go b/command/v7/update_space_quota_command_test.go index 2f75eae5a9..3f3ba55b81 100644 --- a/command/v7/update_space_quota_command_test.go +++ b/command/v7/update_space_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/flag" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_user_provided_service_command.go b/command/v7/update_user_provided_service_command.go index 69184d166e..ce10d10faf 100644 --- a/command/v7/update_user_provided_service_command.go +++ b/command/v7/update_user_provided_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" ) type UpdateUserProvidedServiceCommand struct { diff --git a/command/v7/update_user_provided_service_command_test.go b/command/v7/update_user_provided_service_command_test.go index 2630e31bec..4679e02fe1 100644 --- a/command/v7/update_user_provided_service_command_test.go +++ b/command/v7/update_user_provided_service_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/upgrade_service_command.go b/command/v7/upgrade_service_command.go index 942e91096d..fccd013361 100644 --- a/command/v7/upgrade_service_command.go +++ b/command/v7/upgrade_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/v7/shared" ) type UpgradeServiceCommand struct { diff --git a/command/v7/upgrade_service_command_test.go b/command/v7/upgrade_service_command_test.go index fb66c5880f..3c8acb319c 100644 --- a/command/v7/upgrade_service_command_test.go +++ b/command/v7/upgrade_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/command/commandfakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/v7fakes/fake_actor.go b/command/v7/v7fakes/fake_actor.go index 12df707c49..4993d06ab7 100644 --- a/command/v7/v7fakes/fake_actor.go +++ b/command/v7/v7fakes/fake_actor.go @@ -8,16 +8,16 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - constanta "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + constanta "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" "github.com/SermoDigital/jose/jwt" ) diff --git a/command/v7/v7fakes/fake_actor_reloader.go b/command/v7/v7fakes/fake_actor_reloader.go index f5397aaae1..66243532d5 100644 --- a/command/v7/v7fakes/fake_actor_reloader.go +++ b/command/v7/v7fakes/fake_actor_reloader.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/command" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/command" + v7 "code.cloudfoundry.org/cli/v8/command/v7" ) type FakeActorReloader struct { diff --git a/command/v7/v7fakes/fake_diff_displayer.go b/command/v7/v7fakes/fake_diff_displayer.go index 79bcd663de..04a855c6e2 100644 --- a/command/v7/v7fakes/fake_diff_displayer.go +++ b/command/v7/v7fakes/fake_diff_displayer.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/resources" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/resources" ) type FakeDiffDisplayer struct { diff --git a/command/v7/v7fakes/fake_label_setter.go b/command/v7/v7fakes/fake_label_setter.go index 21b6cea3a9..27ab8ed55f 100644 --- a/command/v7/v7fakes/fake_label_setter.go +++ b/command/v7/v7fakes/fake_label_setter.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/types" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/types" ) type FakeLabelSetter struct { diff --git a/command/v7/v7fakes/fake_label_unsetter.go b/command/v7/v7fakes/fake_label_unsetter.go index 6b57278a96..e832c9698b 100644 --- a/command/v7/v7fakes/fake_label_unsetter.go +++ b/command/v7/v7fakes/fake_label_unsetter.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/types" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/types" ) type FakeLabelUnsetter struct { diff --git a/command/v7/v7fakes/fake_manifest_locator.go b/command/v7/v7fakes/fake_manifest_locator.go index abbbbcfaf4..2e04f129ce 100644 --- a/command/v7/v7fakes/fake_manifest_locator.go +++ b/command/v7/v7fakes/fake_manifest_locator.go @@ -4,7 +4,7 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" + v7 "code.cloudfoundry.org/cli/v8/command/v7" ) type FakeManifestLocator struct { diff --git a/command/v7/v7fakes/fake_manifest_parser.go b/command/v7/v7fakes/fake_manifest_parser.go index 735c953053..fbee9c86c4 100644 --- a/command/v7/v7fakes/fake_manifest_parser.go +++ b/command/v7/v7fakes/fake_manifest_parser.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/manifestparser" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" ) diff --git a/command/v7/v7fakes/fake_network_policies_actor.go b/command/v7/v7fakes/fake_network_policies_actor.go index 79857f0c17..828062d617 100644 --- a/command/v7/v7fakes/fake_network_policies_actor.go +++ b/command/v7/v7fakes/fake_network_policies_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v8/command/v7" ) type FakeNetworkPoliciesActor struct { diff --git a/command/v7/v7fakes/fake_networking_actor.go b/command/v7/v7fakes/fake_networking_actor.go index bb42ffac9b..cd409425f8 100644 --- a/command/v7/v7fakes/fake_networking_actor.go +++ b/command/v7/v7fakes/fake_networking_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v8/command/v7" ) type FakeNetworkingActor struct { diff --git a/command/v7/v7fakes/fake_progress_bar.go b/command/v7/v7fakes/fake_progress_bar.go index 9c40495632..73ca3a74a5 100644 --- a/command/v7/v7fakes/fake_progress_bar.go +++ b/command/v7/v7fakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - v7 "code.cloudfoundry.org/cli/command/v7" + v7 "code.cloudfoundry.org/cli/v8/command/v7" ) type FakeProgressBar struct { diff --git a/command/v7/v7fakes/fake_push_actor.go b/command/v7/v7fakes/fake_push_actor.go index 95c137b77b..974f0a915e 100644 --- a/command/v7/v7fakes/fake_push_actor.go +++ b/command/v7/v7fakes/fake_push_actor.go @@ -4,10 +4,10 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7pushaction" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/util/manifestparser" ) type FakePushActor struct { diff --git a/command/v7/v7fakes/fake_remove_network_policy_actor.go b/command/v7/v7fakes/fake_remove_network_policy_actor.go index b2ed7ded2e..ca873ebbc2 100644 --- a/command/v7/v7fakes/fake_remove_network_policy_actor.go +++ b/command/v7/v7fakes/fake_remove_network_policy_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v8/command/v7" ) type FakeRemoveNetworkPolicyActor struct { diff --git a/command/v7/v7fakes/fake_revisions_actor.go b/command/v7/v7fakes/fake_revisions_actor.go index 6db96cce2c..1f674f4074 100644 --- a/command/v7/v7fakes/fake_revisions_actor.go +++ b/command/v7/v7fakes/fake_revisions_actor.go @@ -4,9 +4,9 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/v7action" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/resources" ) type FakeRevisionsActor struct { diff --git a/command/v7/v7fakes/fake_set_label_actor.go b/command/v7/v7fakes/fake_set_label_actor.go index 8eb74fcb50..5438c37600 100644 --- a/command/v7/v7fakes/fake_set_label_actor.go +++ b/command/v7/v7fakes/fake_set_label_actor.go @@ -4,10 +4,10 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v7action" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/actor/v7action" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type FakeSetLabelActor struct { diff --git a/command/v7/v7fakes/fake_shared_sshactor.go b/command/v7/v7fakes/fake_shared_sshactor.go index 0ddf9c40d6..f1c067eaea 100644 --- a/command/v7/v7fakes/fake_shared_sshactor.go +++ b/command/v7/v7fakes/fake_shared_sshactor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + v7 "code.cloudfoundry.org/cli/v8/command/v7" ) type FakeSharedSSHActor struct { diff --git a/command/v7/v7fakes/fake_v7actor_for_push.go b/command/v7/v7fakes/fake_v7actor_for_push.go index e0005d0483..634e191dba 100644 --- a/command/v7/v7fakes/fake_v7actor_for_push.go +++ b/command/v7/v7fakes/fake_v7actor_for_push.go @@ -5,10 +5,10 @@ import ( "context" "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v7action" - v7 "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v8/actor/v7action" + v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v8/resources" ) type FakeV7ActorForPush struct { diff --git a/fixtures/plugins/alias_conflicts.go b/fixtures/plugins/alias_conflicts.go index 3ac44ff67d..987b96dfee 100644 --- a/fixtures/plugins/alias_conflicts.go +++ b/fixtures/plugins/alias_conflicts.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type AliasConflicts struct { diff --git a/fixtures/plugins/call_core_cmd.go b/fixtures/plugins/call_core_cmd.go index 6027c0c3a3..ec33b21317 100644 --- a/fixtures/plugins/call_core_cmd.go +++ b/fixtures/plugins/call_core_cmd.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type CoreCmd struct{} diff --git a/fixtures/plugins/empty_plugin.go b/fixtures/plugins/empty_plugin.go index e7d6f971e9..b88dc7e139 100644 --- a/fixtures/plugins/empty_plugin.go +++ b/fixtures/plugins/empty_plugin.go @@ -1,6 +1,6 @@ package main -import "code.cloudfoundry.org/cli/plugin" +import "code.cloudfoundry.org/cli/v8/plugin" type EmptyPlugin struct{} diff --git a/fixtures/plugins/input.go b/fixtures/plugins/input.go index cefcd4232e..2dd8058632 100644 --- a/fixtures/plugins/input.go +++ b/fixtures/plugins/input.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type Input struct { diff --git a/fixtures/plugins/my_say.go b/fixtures/plugins/my_say.go index 1859ccd423..066f6cad22 100644 --- a/fixtures/plugins/my_say.go +++ b/fixtures/plugins/my_say.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type MySay struct { diff --git a/fixtures/plugins/panics.go b/fixtures/plugins/panics.go index bb76c2a9c7..4106d47dd2 100644 --- a/fixtures/plugins/panics.go +++ b/fixtures/plugins/panics.go @@ -10,7 +10,7 @@ package main import ( "os" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type Panics struct { diff --git a/fixtures/plugins/test_1.go b/fixtures/plugins/test_1.go index 2d57bf235c..d334df78db 100644 --- a/fixtures/plugins/test_1.go +++ b/fixtures/plugins/test_1.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type Test1 struct { diff --git a/fixtures/plugins/test_2.go b/fixtures/plugins/test_2.go index 3e8abdd573..c9b60c705b 100644 --- a/fixtures/plugins/test_2.go +++ b/fixtures/plugins/test_2.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type Test2 struct{} diff --git a/fixtures/plugins/test_with_help.go b/fixtures/plugins/test_with_help.go index a5479d6876..03224f6bfc 100644 --- a/fixtures/plugins/test_with_help.go +++ b/fixtures/plugins/test_with_help.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type TestWithHelp struct { diff --git a/fixtures/plugins/test_with_orgs.go b/fixtures/plugins/test_with_orgs.go index 0c34ce337a..db5a65e0b8 100644 --- a/fixtures/plugins/test_with_orgs.go +++ b/fixtures/plugins/test_with_orgs.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type TestWithOrgs struct { diff --git a/fixtures/plugins/test_with_orgs_short_name.go b/fixtures/plugins/test_with_orgs_short_name.go index 2f083b7792..3064736541 100644 --- a/fixtures/plugins/test_with_orgs_short_name.go +++ b/fixtures/plugins/test_with_orgs_short_name.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type TestWithOrgsShortName struct { diff --git a/fixtures/plugins/test_with_push.go b/fixtures/plugins/test_with_push.go index b9ab37900a..2d4afe0fed 100644 --- a/fixtures/plugins/test_with_push.go +++ b/fixtures/plugins/test_with_push.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type TestWithPush struct { diff --git a/fixtures/plugins/test_with_push_short_name.go b/fixtures/plugins/test_with_push_short_name.go index 9466fc94bb..d538f5853c 100644 --- a/fixtures/plugins/test_with_push_short_name.go +++ b/fixtures/plugins/test_with_push_short_name.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type TestWithPushShortName struct { diff --git a/go.mod b/go.mod index 62e838dc32..cc0a5b8860 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,9 @@ -module code.cloudfoundry.org/cli +module code.cloudfoundry.org/cli/v8 go 1.23.1 require ( + code.cloudfoundry.org/cli v7.1.0+incompatible code.cloudfoundry.org/bytefmt v0.11.0 code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6 code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85 diff --git a/go.sum b/go.sum index 0c4e528c23..db32e77513 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ code.cloudfoundry.org/bytefmt v0.11.0 h1:nyYr03vV/5apByN4lYr1vYM4/KKrM9Fc2PFQVmY code.cloudfoundry.org/bytefmt v0.11.0/go.mod h1:9nh0kJEX7nqb9l+byNdSy4xRtWeHy98a/P1Z0zdEnOE= 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 v7.1.0+incompatible h1:1Zn3I+epQBaBvnZAaTudCQQ0WdqcWtjtjEV9MBZP08Y= +code.cloudfoundry.org/cli v7.1.0+incompatible/go.mod h1:e4d+EpbwevNhyTZKybrLlyTvpH+W22vMsmdmcTxs/Fo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85 h1:jaHWw9opYjKPrDT19uydBBWSxl+g5F4Hv030fqMsalo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85/go.mod h1:R1EiyOAr7lW0l/YkZNqItUNZ01Q/dYUfbTn4X4Z+82M= code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 h1:O+j8afQWaDuxzKGcculsjgHGK+biBTn6iMjgFpBf54c= diff --git a/integration/assets/configurable_plugin/test_plugin.go b/integration/assets/configurable_plugin/test_plugin.go index 428ef6763c..6d63413259 100644 --- a/integration/assets/configurable_plugin/test_plugin.go +++ b/integration/assets/configurable_plugin/test_plugin.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" "github.com/blang/semver/v4" ) diff --git a/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go b/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go index 7342ae5a34..0f83415ab1 100644 --- a/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go +++ b/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" "github.com/blang/semver/v4" ) diff --git a/integration/assets/hydrabroker/app/app.go b/integration/assets/hydrabroker/app/app.go index d1bd49619e..2041334360 100644 --- a/integration/assets/hydrabroker/app/app.go +++ b/integration/assets/hydrabroker/app/app.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" "github.com/gorilla/mux" ) diff --git a/integration/assets/hydrabroker/app/broker.go b/integration/assets/hydrabroker/app/broker.go index 6dfa03426a..a4e1fa981b 100644 --- a/integration/assets/hydrabroker/app/broker.go +++ b/integration/assets/hydrabroker/app/broker.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" "github.com/pivotal-cf/brokerapi/v7/domain" "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) diff --git a/integration/assets/hydrabroker/app/config.go b/integration/assets/hydrabroker/app/config.go index 82c97215e0..d65953dd34 100644 --- a/integration/assets/hydrabroker/app/config.go +++ b/integration/assets/hydrabroker/app/config.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" "github.com/go-playground/validator/v10" ) diff --git a/integration/assets/hydrabroker/app/helpers.go b/integration/assets/hydrabroker/app/helpers.go index 0ccbbb945c..c504c2882e 100644 --- a/integration/assets/hydrabroker/app/helpers.go +++ b/integration/assets/hydrabroker/app/helpers.go @@ -6,7 +6,7 @@ import ( "log" "net/http" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" "github.com/gorilla/mux" uuid "github.com/nu7hatch/gouuid" ) diff --git a/integration/assets/hydrabroker/database/database_test.go b/integration/assets/hydrabroker/database/database_test.go index 0d9fd8daa4..23c87b60f7 100644 --- a/integration/assets/hydrabroker/database/database_test.go +++ b/integration/assets/hydrabroker/database/database_test.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - . "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" + . "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" ) var _ = Describe("Database", func() { diff --git a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go index db73f73c02..7cd0fb2cbc 100644 --- a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go +++ b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/app" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/app" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" uuid2 "github.com/nu7hatch/gouuid" "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) diff --git a/integration/assets/hydrabroker/main.go b/integration/assets/hydrabroker/main.go index 2df98b324a..b7ee02d778 100644 --- a/integration/assets/hydrabroker/main.go +++ b/integration/assets/hydrabroker/main.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/app" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/app" ) func main() { diff --git a/integration/assets/hydrabroker/store/bindings.go b/integration/assets/hydrabroker/store/bindings.go index fbf7039126..cc7c30f214 100644 --- a/integration/assets/hydrabroker/store/bindings.go +++ b/integration/assets/hydrabroker/store/bindings.go @@ -3,8 +3,8 @@ package store import ( "fmt" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" ) func (st *Store) CreateBinding(brokerID BrokerID, instanceID InstanceID, bindingID BindingID, details resources.BindingDetails) error { diff --git a/integration/assets/hydrabroker/store/bindings_test.go b/integration/assets/hydrabroker/store/bindings_test.go index fe30b42ef5..d982988877 100644 --- a/integration/assets/hydrabroker/store/bindings_test.go +++ b/integration/assets/hydrabroker/store/bindings_test.go @@ -3,9 +3,9 @@ package store_test import ( "fmt" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" uuid "github.com/nu7hatch/gouuid" ) diff --git a/integration/assets/hydrabroker/store/brokers.go b/integration/assets/hydrabroker/store/brokers.go index 62d12825d8..b01907f273 100644 --- a/integration/assets/hydrabroker/store/brokers.go +++ b/integration/assets/hydrabroker/store/brokers.go @@ -1,8 +1,8 @@ package store import ( - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" ) func (st *Store) CreateBroker(cfg config.BrokerConfiguration) BrokerID { diff --git a/integration/assets/hydrabroker/store/brokers_test.go b/integration/assets/hydrabroker/store/brokers_test.go index d67b3d9985..37622d3eb3 100644 --- a/integration/assets/hydrabroker/store/brokers_test.go +++ b/integration/assets/hydrabroker/store/brokers_test.go @@ -1,8 +1,8 @@ package store_test import ( - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" ) var _ = Describe("Brokers", func() { diff --git a/integration/assets/hydrabroker/store/instances.go b/integration/assets/hydrabroker/store/instances.go index 2cf2c6d2b8..161eb04759 100644 --- a/integration/assets/hydrabroker/store/instances.go +++ b/integration/assets/hydrabroker/store/instances.go @@ -3,9 +3,9 @@ package store import ( "fmt" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" ) func (st *Store) CreateInstance(brokerID BrokerID, instanceID InstanceID, details resources.ServiceInstanceDetails) error { diff --git a/integration/assets/hydrabroker/store/instances_test.go b/integration/assets/hydrabroker/store/instances_test.go index 0fb45a2da1..c3d0c1d785 100644 --- a/integration/assets/hydrabroker/store/instances_test.go +++ b/integration/assets/hydrabroker/store/instances_test.go @@ -3,9 +3,9 @@ package store_test import ( "fmt" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" uuid "github.com/nu7hatch/gouuid" ) diff --git a/integration/assets/hydrabroker/store/store.go b/integration/assets/hydrabroker/store/store.go index 9b7d731444..9ac592cbd2 100644 --- a/integration/assets/hydrabroker/store/store.go +++ b/integration/assets/hydrabroker/store/store.go @@ -1,7 +1,7 @@ package store import ( - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" ) type BrokerID database.ID diff --git a/integration/assets/test_plugin/test_plugin.go b/integration/assets/test_plugin/test_plugin.go index e6182cf10e..020c297c3f 100644 --- a/integration/assets/test_plugin/test_plugin.go +++ b/integration/assets/test_plugin/test_plugin.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type Test1 struct { diff --git a/integration/assets/test_plugin_fails_metadata/test_plugin.go b/integration/assets/test_plugin_fails_metadata/test_plugin.go index 14ea6c61ee..167dff3307 100644 --- a/integration/assets/test_plugin_fails_metadata/test_plugin.go +++ b/integration/assets/test_plugin_fails_metadata/test_plugin.go @@ -3,7 +3,7 @@ package main import ( "os" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type TestPluginFailsMetadata struct{} diff --git a/integration/assets/test_plugin_with_command_overrides/test_plugin.go b/integration/assets/test_plugin_with_command_overrides/test_plugin.go index a3c20408b5..e880019c31 100644 --- a/integration/assets/test_plugin_with_command_overrides/test_plugin.go +++ b/integration/assets/test_plugin_with_command_overrides/test_plugin.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type TestPluginWithCommandOverrides struct { diff --git a/integration/assets/test_plugin_with_panic/test_plugin.go b/integration/assets/test_plugin_with_panic/test_plugin.go index c8e96c48ca..9eff20dc99 100644 --- a/integration/assets/test_plugin_with_panic/test_plugin.go +++ b/integration/assets/test_plugin_with_panic/test_plugin.go @@ -1,6 +1,6 @@ package main -import "code.cloudfoundry.org/cli/plugin" +import "code.cloudfoundry.org/cli/v8/plugin" type TestPluginWithPanic struct { } diff --git a/integration/helpers/app_instance_table_test.go b/integration/helpers/app_instance_table_test.go index ea3f75a266..137ac11d72 100644 --- a/integration/helpers/app_instance_table_test.go +++ b/integration/helpers/app_instance_table_test.go @@ -1,7 +1,7 @@ package helpers_test import ( - . "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/helpers/app_test.go b/integration/helpers/app_test.go index facc0321d6..8e305c61d6 100644 --- a/integration/helpers/app_test.go +++ b/integration/helpers/app_test.go @@ -1,7 +1,7 @@ package helpers_test import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 6fab7989af..2484345e3d 100644 --- a/integration/helpers/commonisolated/common_isolated_setup.go +++ b/integration/helpers/commonisolated/common_isolated_setup.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/config.go b/integration/helpers/config.go index a7d63dcc78..a2c6f8f582 100644 --- a/integration/helpers/config.go +++ b/integration/helpers/config.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/helpers/plugin.go b/integration/helpers/plugin.go index 2f8b1e617a..40e4cf1137 100644 --- a/integration/helpers/plugin.go +++ b/integration/helpers/plugin.go @@ -37,7 +37,7 @@ func BuildConfigurablePlugin(pluginType string, name string, version string, plu commandHelps = append(commandHelps, command.Help) } - pluginPath, err := Build(fmt.Sprintf("code.cloudfoundry.org/cli/integration/assets/%s", pluginType), + pluginPath, err := Build(fmt.Sprintf("code.cloudfoundry.org/cli/v8/integration/assets/%s", pluginType), "-o", name, "-ldflags", diff --git a/integration/helpers/plugin_repo.go b/integration/helpers/plugin_repo.go index 105d77e4c5..d7fd29e6a4 100644 --- a/integration/helpers/plugin_repo.go +++ b/integration/helpers/plugin_repo.go @@ -9,8 +9,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/integration/helpers/route.go b/integration/helpers/route.go index d9ad43c9b1..844d498aea 100644 --- a/integration/helpers/route.go +++ b/integration/helpers/route.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/helpers/security_group.go b/integration/helpers/security_group.go index 3e6dc0903a..8dcb01f9a6 100644 --- a/integration/helpers/security_group.go +++ b/integration/helpers/security_group.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/servicebrokerstub/api.go b/integration/helpers/servicebrokerstub/api.go index 6783c28eff..b15236a8d8 100644 --- a/integration/helpers/servicebrokerstub/api.go +++ b/integration/helpers/servicebrokerstub/api.go @@ -3,9 +3,9 @@ package servicebrokerstub import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" ) type ServiceAccessConfig struct { diff --git a/integration/helpers/servicebrokerstub/app_config.go b/integration/helpers/servicebrokerstub/app_config.go index c4f3911188..145102c47b 100644 --- a/integration/helpers/servicebrokerstub/app_config.go +++ b/integration/helpers/servicebrokerstub/app_config.go @@ -7,8 +7,8 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/app_deploy.go b/integration/helpers/servicebrokerstub/app_deploy.go index be4c7abcc6..0216fc3817 100644 --- a/integration/helpers/servicebrokerstub/app_deploy.go +++ b/integration/helpers/servicebrokerstub/app_deploy.go @@ -11,7 +11,7 @@ import ( "github.com/onsi/ginkgo/v2" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/cf.go b/integration/helpers/servicebrokerstub/cf.go index 5f92a1a854..53f486909e 100644 --- a/integration/helpers/servicebrokerstub/cf.go +++ b/integration/helpers/servicebrokerstub/cf.go @@ -3,7 +3,7 @@ package servicebrokerstub import ( "encoding/json" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/version.go b/integration/helpers/version.go index d299b000f7..e5caab51e6 100644 --- a/integration/helpers/version.go +++ b/integration/helpers/version.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/actor/versioncheck" + "code.cloudfoundry.org/cli/v8/actor/versioncheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/shared/experimental/experimental_suite_test.go b/integration/shared/experimental/experimental_suite_test.go index 4861802bf1..888a588247 100644 --- a/integration/shared/experimental/experimental_suite_test.go +++ b/integration/shared/experimental/experimental_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 11288dbdbf..f5d0b38b1a 100644 --- a/integration/shared/global/global_suite_test.go +++ b/integration/shared/global/global_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" 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 7ccd5fa7d1..dd2fca8661 100644 --- a/integration/shared/global/running_environment_variable_group_command_test.go +++ b/integration/shared/global/running_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 612822bd83..4c156f8560 100644 --- a/integration/shared/global/staging_environment_variable_group_command_test.go +++ b/integration/shared/global/staging_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 68167ac179..cd2a3c976d 100644 --- a/integration/shared/isolated/apps_command_test.go +++ b/integration/shared/isolated/apps_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/config_test.go b/integration/shared/isolated/config_test.go index 324989d6b1..4dfbf3d917 100644 --- a/integration/shared/isolated/config_test.go +++ b/integration/shared/isolated/config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - helpers "code.cloudfoundry.org/cli/integration/helpers" + helpers "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/error_handling_test.go b/integration/shared/isolated/error_handling_test.go index d3721c3268..64e39faf43 100644 --- a/integration/shared/isolated/error_handling_test.go +++ b/integration/shared/isolated/error_handling_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/internationalization_test.go b/integration/shared/isolated/internationalization_test.go index 8b317d4d4a..4aea8f32cc 100644 --- a/integration/shared/isolated/internationalization_test.go +++ b/integration/shared/isolated/internationalization_test.go @@ -1,7 +1,7 @@ package isolated import ( - helpers "code.cloudfoundry.org/cli/integration/helpers" + helpers "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/isolated_suite_test.go b/integration/shared/isolated/isolated_suite_test.go index 8a01781a20..f60a885055 100644 --- a/integration/shared/isolated/isolated_suite_test.go +++ b/integration/shared/isolated/isolated_suite_test.go @@ -3,7 +3,7 @@ package isolated import ( "testing" - "code.cloudfoundry.org/cli/integration/helpers/commonisolated" + "code.cloudfoundry.org/cli/v8/integration/helpers/commonisolated" ) var ( diff --git a/integration/shared/isolated/logs_command_test.go b/integration/shared/isolated/logs_command_test.go index 5929bef773..7139e9706d 100644 --- a/integration/shared/isolated/logs_command_test.go +++ b/integration/shared/isolated/logs_command_test.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/restart_app_instance_command_test.go b/integration/shared/isolated/restart_app_instance_command_test.go index 0e801ea788..5b6d275b3d 100644 --- a/integration/shared/isolated/restart_app_instance_command_test.go +++ b/integration/shared/isolated/restart_app_instance_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/spaces_command_test.go b/integration/shared/isolated/spaces_command_test.go index 2fca098d47..9b932b1b27 100644 --- a/integration/shared/isolated/spaces_command_test.go +++ b/integration/shared/isolated/spaces_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/version_command_test.go b/integration/shared/isolated/version_command_test.go index 35da3f34c1..2f51b3961d 100644 --- a/integration/shared/isolated/version_command_test.go +++ b/integration/shared/isolated/version_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" diff --git a/integration/shared/performance/performance_suite_test.go b/integration/shared/performance/performance_suite_test.go index f9b0cad508..86070962f1 100644 --- a/integration/shared/performance/performance_suite_test.go +++ b/integration/shared/performance/performance_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 41f9ec43d9..c3275aeeb7 100644 --- a/integration/shared/plugin/add_plugin_repo_test.go +++ b/integration/shared/plugin/add_plugin_repo_test.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/api_test.go b/integration/shared/plugin/api_test.go index 8b2b4a56dd..09e86d1c52 100644 --- a/integration/shared/plugin/api_test.go +++ b/integration/shared/plugin/api_test.go @@ -3,9 +3,9 @@ package plugin import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/help_test.go b/integration/shared/plugin/help_test.go index 73c7bfdd63..783c2fe017 100644 --- a/integration/shared/plugin/help_test.go +++ b/integration/shared/plugin/help_test.go @@ -1,7 +1,7 @@ package plugin import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/install_plugin_command_test.go b/integration/shared/plugin/install_plugin_command_test.go index db0da47d6c..1a14289b42 100644 --- a/integration/shared/plugin/install_plugin_command_test.go +++ b/integration/shared/plugin/install_plugin_command_test.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -253,7 +253,7 @@ var _ = Describe("install-plugin command", func() { When("the file is not a plugin", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/non_plugin") + pluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/non_plugin") Expect(err).ToNot(HaveOccurred()) }) @@ -268,7 +268,7 @@ var _ = Describe("install-plugin command", func() { When("getting metadata from the plugin errors", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/test_plugin_fails_metadata") + pluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/test_plugin_fails_metadata") Expect(err).ToNot(HaveOccurred()) }) @@ -767,7 +767,7 @@ var _ = Describe("install-plugin command", func() { When("the file is not a plugin", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/non_plugin") + pluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/non_plugin") Expect(err).ToNot(HaveOccurred()) pluginData, err := os.ReadFile(pluginPath) diff --git a/integration/shared/plugin/install_plugin_command_unix_test.go b/integration/shared/plugin/install_plugin_command_unix_test.go index 4deae1aaed..b324a3cdc7 100644 --- a/integration/shared/plugin/install_plugin_command_unix_test.go +++ b/integration/shared/plugin/install_plugin_command_unix_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 15d707292a..7d41fd58f0 100644 --- a/integration/shared/plugin/install_plugin_from_repo_command_test.go +++ b/integration/shared/plugin/install_plugin_from_repo_command_test.go @@ -4,8 +4,8 @@ import ( "net/http" "runtime" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/logs_test.go b/integration/shared/plugin/logs_test.go index fd7df06f8e..85eaaae160 100644 --- a/integration/shared/plugin/logs_test.go +++ b/integration/shared/plugin/logs_test.go @@ -1,7 +1,7 @@ package plugin import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/plugin_suite_test.go b/integration/shared/plugin/plugin_suite_test.go index 4411dd6fe7..9899a4a8a5 100644 --- a/integration/shared/plugin/plugin_suite_test.go +++ b/integration/shared/plugin/plugin_suite_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -44,13 +44,13 @@ var _ = SynchronizedBeforeSuite(func() []byte { helpers.TurnOffColors() var err error - testPluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/test_plugin") + testPluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/test_plugin") Expect(err).ToNot(HaveOccurred()) - overrideTestPluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/test_plugin_with_command_overrides") + overrideTestPluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/test_plugin_with_command_overrides") Expect(err).ToNot(HaveOccurred()) - panicTestPluginPath, err = Build("code.cloudfoundry.org/cli/integration/assets/test_plugin_with_panic") + panicTestPluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/test_plugin_with_panic") Expect(err).ToNot(HaveOccurred()) }) diff --git a/integration/shared/plugin/plugins_command_test.go b/integration/shared/plugin/plugins_command_test.go index f02ce4f7c8..06842649b8 100644 --- a/integration/shared/plugin/plugins_command_test.go +++ b/integration/shared/plugin/plugins_command_test.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/runner_test.go b/integration/shared/plugin/runner_test.go index 0f2bc86933..3062c5f595 100644 --- a/integration/shared/plugin/runner_test.go +++ b/integration/shared/plugin/runner_test.go @@ -3,7 +3,7 @@ package plugin import ( "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/uninstall_plugin_command_test.go b/integration/shared/plugin/uninstall_plugin_command_test.go index f937e9e842..a076ab3f14 100644 --- a/integration/shared/plugin/uninstall_plugin_command_test.go +++ b/integration/shared/plugin/uninstall_plugin_command_test.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/uninstall_plugin_command_unix_test.go b/integration/shared/plugin/uninstall_plugin_command_unix_test.go index 7458c325f6..4637713dc7 100644 --- a/integration/shared/plugin/uninstall_plugin_command_unix_test.go +++ b/integration/shared/plugin/uninstall_plugin_command_unix_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 081d4407c9..fee39e81b6 100644 --- a/integration/v7/global/bind_running_security_group_command_test.go +++ b/integration/v7/global/bind_running_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/bind_security_group_command_test.go b/integration/v7/global/bind_security_group_command_test.go index efba3e4f31..cac63d0ad9 100644 --- a/integration/v7/global/bind_security_group_command_test.go +++ b/integration/v7/global/bind_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 ea120e6e91..aaace6d40f 100644 --- a/integration/v7/global/bind_staging_security_group_command_test.go +++ b/integration/v7/global/bind_staging_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/create_buildpack_command_test.go b/integration/v7/global/create_buildpack_command_test.go index 474dab02cf..e992866b9a 100644 --- a/integration/v7/global/create_buildpack_command_test.go +++ b/integration/v7/global/create_buildpack_command_test.go @@ -7,7 +7,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/create_security_group_command_test.go b/integration/v7/global/create_security_group_command_test.go index d701ce2a85..6c314202fb 100644 --- a/integration/v7/global/create_security_group_command_test.go +++ b/integration/v7/global/create_security_group_command_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/delete_buildpack_command_test.go b/integration/v7/global/delete_buildpack_command_test.go index b00775a7ce..c085e8479d 100644 --- a/integration/v7/global/delete_buildpack_command_test.go +++ b/integration/v7/global/delete_buildpack_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/disable_feature_flag_command_test.go b/integration/v7/global/disable_feature_flag_command_test.go index 646f7063b4..dce622f1cb 100644 --- a/integration/v7/global/disable_feature_flag_command_test.go +++ b/integration/v7/global/disable_feature_flag_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/enable_feature_flag_command_test.go b/integration/v7/global/enable_feature_flag_command_test.go index fcda96b178..e9a4f94b54 100644 --- a/integration/v7/global/enable_feature_flag_command_test.go +++ b/integration/v7/global/enable_feature_flag_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/env_command_test.go b/integration/v7/global/env_command_test.go index fc547e3c27..2dd17e1946 100644 --- a/integration/v7/global/env_command_test.go +++ b/integration/v7/global/env_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/global_suite_test.go b/integration/v7/global/global_suite_test.go index 11288dbdbf..f5d0b38b1a 100644 --- a/integration/v7/global/global_suite_test.go +++ b/integration/v7/global/global_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/global/org_quota_command_test.go b/integration/v7/global/org_quota_command_test.go index a24ebc9327..8886b56cca 100644 --- a/integration/v7/global/org_quota_command_test.go +++ b/integration/v7/global/org_quota_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/org_quotas_command_test.go b/integration/v7/global/org_quotas_command_test.go index 28d3c0acae..c6aab764af 100644 --- a/integration/v7/global/org_quotas_command_test.go +++ b/integration/v7/global/org_quotas_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 6da1c04182..958b713f1b 100644 --- a/integration/v7/global/running_environment_variable_group_command_test.go +++ b/integration/v7/global/running_environment_variable_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/running_security_groups_command_test.go b/integration/v7/global/running_security_groups_command_test.go index e253e821d9..b916617ca2 100644 --- a/integration/v7/global/running_security_groups_command_test.go +++ b/integration/v7/global/running_security_groups_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/security_group_command_test.go b/integration/v7/global/security_group_command_test.go index 782d05fe03..64b831f4c4 100644 --- a/integration/v7/global/security_group_command_test.go +++ b/integration/v7/global/security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/set_org_role_command_test.go b/integration/v7/global/set_org_role_command_test.go index 12a5739aed..353dc3445c 100644 --- a/integration/v7/global/set_org_role_command_test.go +++ b/integration/v7/global/set_org_role_command_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" ) var _ = Describe("set-org-role command", func() { 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 eef6f8c586..a1cbc8fa9b 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 @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/set_space_role_command_test.go b/integration/v7/global/set_space_role_command_test.go index 9e2f99df4e..e4a020b4da 100644 --- a/integration/v7/global/set_space_role_command_test.go +++ b/integration/v7/global/set_space_role_command_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" ) var _ = Describe("set-space-role command", func() { 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 05a1e79aa2..a83b028347 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 @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 bb03b84dcf..a503c847e0 100644 --- a/integration/v7/global/staging_environment_variable_group_command_test.go +++ b/integration/v7/global/staging_environment_variable_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/staging_security_groups_command_test.go b/integration/v7/global/staging_security_groups_command_test.go index 49049c2837..82edb5288e 100644 --- a/integration/v7/global/staging_security_groups_command_test.go +++ b/integration/v7/global/staging_security_groups_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 ef2c8a4b5f..359d2b69df 100644 --- a/integration/v7/global/unbind_running_security_group_command_test.go +++ b/integration/v7/global/unbind_running_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/unbind_security_group_command_test.go b/integration/v7/global/unbind_security_group_command_test.go index 18af34f653..bb002c43b7 100644 --- a/integration/v7/global/unbind_security_group_command_test.go +++ b/integration/v7/global/unbind_security_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 9a28ea277c..dc7262e851 100644 --- a/integration/v7/global/unbind_staging_security_group_command_test.go +++ b/integration/v7/global/unbind_staging_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/update_buildpack_command_test.go b/integration/v7/global/update_buildpack_command_test.go index 8409fd6c44..a394764bfa 100644 --- a/integration/v7/global/update_buildpack_command_test.go +++ b/integration/v7/global/update_buildpack_command_test.go @@ -7,7 +7,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/update_security_group_command_test.go b/integration/v7/global/update_security_group_command_test.go index 5f86b6710f..e3fef97558 100644 --- a/integration/v7/global/update_security_group_command_test.go +++ b/integration/v7/global/update_security_group_command_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/add_network_policy_command_test.go b/integration/v7/isolated/add_network_policy_command_test.go index db2da6cb24..9e4148d32e 100644 --- a/integration/v7/isolated/add_network_policy_command_test.go +++ b/integration/v7/isolated/add_network_policy_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/allow_space_ssh_command_test.go b/integration/v7/isolated/allow_space_ssh_command_test.go index c7fcabe338..ac74ed37a6 100644 --- a/integration/v7/isolated/allow_space_ssh_command_test.go +++ b/integration/v7/isolated/allow_space_ssh_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/api_command_test.go b/integration/v7/isolated/api_command_test.go index 8496aa903d..a70844659b 100644 --- a/integration/v7/isolated/api_command_test.go +++ b/integration/v7/isolated/api_command_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/app_command_test.go b/integration/v7/isolated/app_command_test.go index ed27bc0bf1..5b0fcb8f0d 100644 --- a/integration/v7/isolated/app_command_test.go +++ b/integration/v7/isolated/app_command_test.go @@ -6,8 +6,8 @@ import ( "path" "path/filepath" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/apply_manifest_command_test.go b/integration/v7/isolated/apply_manifest_command_test.go index 82df22e0e7..b04974d0e0 100644 --- a/integration/v7/isolated/apply_manifest_command_test.go +++ b/integration/v7/isolated/apply_manifest_command_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/apps_command_test.go b/integration/v7/isolated/apps_command_test.go index d7ca99920f..cfe9f822dd 100644 --- a/integration/v7/isolated/apps_command_test.go +++ b/integration/v7/isolated/apps_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/auth_command_test.go b/integration/v7/isolated/auth_command_test.go index 34d5e967aa..3dc04b0219 100644 --- a/integration/v7/isolated/auth_command_test.go +++ b/integration/v7/isolated/auth_command_test.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/bind_route_service_command_test.go b/integration/v7/isolated/bind_route_service_command_test.go index 939e6312dc..ae1f5c44db 100644 --- a/integration/v7/isolated/bind_route_service_command_test.go +++ b/integration/v7/isolated/bind_route_service_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/bind_service_command_test.go b/integration/v7/isolated/bind_service_command_test.go index b766f8352c..304367f515 100644 --- a/integration/v7/isolated/bind_service_command_test.go +++ b/integration/v7/isolated/bind_service_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/buildpacks_command_test.go b/integration/v7/isolated/buildpacks_command_test.go index ae357673e2..fb66bf351b 100644 --- a/integration/v7/isolated/buildpacks_command_test.go +++ b/integration/v7/isolated/buildpacks_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/cancel_deployment_test.go b/integration/v7/isolated/cancel_deployment_test.go index 7a2d1066a8..5c342bd0ba 100644 --- a/integration/v7/isolated/cancel_deployment_test.go +++ b/integration/v7/isolated/cancel_deployment_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/check_route_command_test.go b/integration/v7/isolated/check_route_command_test.go index 7006793074..4be8811751 100644 --- a/integration/v7/isolated/check_route_command_test.go +++ b/integration/v7/isolated/check_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/config_command_test.go b/integration/v7/isolated/config_command_test.go index 549af21a49..b69979e9eb 100644 --- a/integration/v7/isolated/config_command_test.go +++ b/integration/v7/isolated/config_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/config_test.go b/integration/v7/isolated/config_test.go index 985e3e4080..357cb6edad 100644 --- a/integration/v7/isolated/config_test.go +++ b/integration/v7/isolated/config_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/isolated/continue_deployment_test.go b/integration/v7/isolated/continue_deployment_test.go index 29f0362363..3f7e54b608 100644 --- a/integration/v7/isolated/continue_deployment_test.go +++ b/integration/v7/isolated/continue_deployment_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" . "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 a073cb64c9..937f4a53cf 100644 --- a/integration/v7/isolated/copy_source_command_test.go +++ b/integration/v7/isolated/copy_source_command_test.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_app_command_test.go b/integration/v7/isolated/create_app_command_test.go index 680891fe5a..25bcbbed85 100644 --- a/integration/v7/isolated/create_app_command_test.go +++ b/integration/v7/isolated/create_app_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_app_manifest_command_test.go b/integration/v7/isolated/create_app_manifest_command_test.go index 9e6be584d7..c6ed633cea 100644 --- a/integration/v7/isolated/create_app_manifest_command_test.go +++ b/integration/v7/isolated/create_app_manifest_command_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_isolation_segment_command_test.go b/integration/v7/isolated/create_isolation_segment_command_test.go index 5ed9ed9bd4..c9daa22270 100644 --- a/integration/v7/isolated/create_isolation_segment_command_test.go +++ b/integration/v7/isolated/create_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_org_command_test.go b/integration/v7/isolated/create_org_command_test.go index 3c6b1e2a14..fb7f999068 100644 --- a/integration/v7/isolated/create_org_command_test.go +++ b/integration/v7/isolated/create_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_org_quota_command_test.go b/integration/v7/isolated/create_org_quota_command_test.go index 833101d40a..f39d9adede 100644 --- a/integration/v7/isolated/create_org_quota_command_test.go +++ b/integration/v7/isolated/create_org_quota_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_package_cfignore_test.go b/integration/v7/isolated/create_package_cfignore_test.go index a1ebe0b89c..342af75b3d 100644 --- a/integration/v7/isolated/create_package_cfignore_test.go +++ b/integration/v7/isolated/create_package_cfignore_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 3342faceab..8344d40d25 100644 --- a/integration/v7/isolated/create_package_command_test.go +++ b/integration/v7/isolated/create_package_command_test.go @@ -4,9 +4,9 @@ import ( "os" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_private_domain_test.go b/integration/v7/isolated/create_private_domain_test.go index 84bb1ff88f..cfbbf41130 100644 --- a/integration/v7/isolated/create_private_domain_test.go +++ b/integration/v7/isolated/create_private_domain_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_route_command_test.go b/integration/v7/isolated/create_route_command_test.go index 60e64ba82a..64ddc35540 100644 --- a/integration/v7/isolated/create_route_command_test.go +++ b/integration/v7/isolated/create_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_broker_command_test.go b/integration/v7/isolated/create_service_broker_command_test.go index 2bd168935b..f50f799402 100644 --- a/integration/v7/isolated/create_service_broker_command_test.go +++ b/integration/v7/isolated/create_service_broker_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "io" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_command_test.go b/integration/v7/isolated/create_service_command_test.go index 3dc0c32206..5fa3810f27 100644 --- a/integration/v7/isolated/create_service_command_test.go +++ b/integration/v7/isolated/create_service_command_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_key_command_test.go b/integration/v7/isolated/create_service_key_command_test.go index ee19462265..14ce9453d4 100644 --- a/integration/v7/isolated/create_service_key_command_test.go +++ b/integration/v7/isolated/create_service_key_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_shared_domain_test.go b/integration/v7/isolated/create_shared_domain_test.go index c16129dade..3716a355d7 100644 --- a/integration/v7/isolated/create_shared_domain_test.go +++ b/integration/v7/isolated/create_shared_domain_test.go @@ -4,8 +4,8 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_space_command_test.go b/integration/v7/isolated/create_space_command_test.go index 7bb6115720..ad8ffcf234 100644 --- a/integration/v7/isolated/create_space_command_test.go +++ b/integration/v7/isolated/create_space_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_space_quota_command_test.go b/integration/v7/isolated/create_space_quota_command_test.go index 424023515d..9ba3f40fca 100644 --- a/integration/v7/isolated/create_space_quota_command_test.go +++ b/integration/v7/isolated/create_space_quota_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_user_command_test.go b/integration/v7/isolated/create_user_command_test.go index 6cda9958ee..405de9ac3a 100644 --- a/integration/v7/isolated/create_user_command_test.go +++ b/integration/v7/isolated/create_user_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/create_user_provided_service_command_test.go b/integration/v7/isolated/create_user_provided_service_command_test.go index 868217ccd4..0775f7f825 100644 --- a/integration/v7/isolated/create_user_provided_service_command_test.go +++ b/integration/v7/isolated/create_user_provided_service_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/curl_command_test.go b/integration/v7/isolated/curl_command_test.go index c65a4b864d..71dc3102c7 100644 --- a/integration/v7/isolated/curl_command_test.go +++ b/integration/v7/isolated/curl_command_test.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_command_test.go b/integration/v7/isolated/delete_command_test.go index 829ab4f251..52189edd10 100644 --- a/integration/v7/isolated/delete_command_test.go +++ b/integration/v7/isolated/delete_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_isolation_segment_command_test.go b/integration/v7/isolated/delete_isolation_segment_command_test.go index d6869e814b..d5e3616115 100644 --- a/integration/v7/isolated/delete_isolation_segment_command_test.go +++ b/integration/v7/isolated/delete_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_org_command_test.go b/integration/v7/isolated/delete_org_command_test.go index f8134fd3d7..794fd1f192 100644 --- a/integration/v7/isolated/delete_org_command_test.go +++ b/integration/v7/isolated/delete_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_org_quota_command_test.go b/integration/v7/isolated/delete_org_quota_command_test.go index c0b613497a..9303042738 100644 --- a/integration/v7/isolated/delete_org_quota_command_test.go +++ b/integration/v7/isolated/delete_org_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_orphaned_routes_command_test.go b/integration/v7/isolated/delete_orphaned_routes_command_test.go index ca34b58253..68f14b5739 100644 --- a/integration/v7/isolated/delete_orphaned_routes_command_test.go +++ b/integration/v7/isolated/delete_orphaned_routes_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_private_domain_command_test.go b/integration/v7/isolated/delete_private_domain_command_test.go index af707bd6a9..e3a274dbfb 100644 --- a/integration/v7/isolated/delete_private_domain_command_test.go +++ b/integration/v7/isolated/delete_private_domain_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_route_command_test.go b/integration/v7/isolated/delete_route_command_test.go index 7484247268..151efc80ac 100644 --- a/integration/v7/isolated/delete_route_command_test.go +++ b/integration/v7/isolated/delete_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_security_group_command_test.go b/integration/v7/isolated/delete_security_group_command_test.go index 5a902dad8d..2356fbcf56 100644 --- a/integration/v7/isolated/delete_security_group_command_test.go +++ b/integration/v7/isolated/delete_security_group_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_broker_command_test.go b/integration/v7/isolated/delete_service_broker_command_test.go index a180862211..550fb08f84 100644 --- a/integration/v7/isolated/delete_service_broker_command_test.go +++ b/integration/v7/isolated/delete_service_broker_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_command_test.go b/integration/v7/isolated/delete_service_command_test.go index 051d886c8a..3a9b0d7221 100644 --- a/integration/v7/isolated/delete_service_command_test.go +++ b/integration/v7/isolated/delete_service_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_key_command_test.go b/integration/v7/isolated/delete_service_key_command_test.go index c5fdb3d8ad..dc33e368bf 100644 --- a/integration/v7/isolated/delete_service_key_command_test.go +++ b/integration/v7/isolated/delete_service_key_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_shared_domain_command_test.go b/integration/v7/isolated/delete_shared_domain_command_test.go index 8740084568..e87b6c0ba8 100644 --- a/integration/v7/isolated/delete_shared_domain_command_test.go +++ b/integration/v7/isolated/delete_shared_domain_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_space_command_test.go b/integration/v7/isolated/delete_space_command_test.go index 6538dcb299..bc802432bf 100644 --- a/integration/v7/isolated/delete_space_command_test.go +++ b/integration/v7/isolated/delete_space_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_space_quota_command_test.go b/integration/v7/isolated/delete_space_quota_command_test.go index bc5d0c884a..3eed3ed7d4 100644 --- a/integration/v7/isolated/delete_space_quota_command_test.go +++ b/integration/v7/isolated/delete_space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_user_command_test.go b/integration/v7/isolated/delete_user_command_test.go index c5740557da..09681834dc 100644 --- a/integration/v7/isolated/delete_user_command_test.go +++ b/integration/v7/isolated/delete_user_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_org_isolation_command_test.go b/integration/v7/isolated/disable_org_isolation_command_test.go index bb47b2d757..2caf3aaf18 100644 --- a/integration/v7/isolated/disable_org_isolation_command_test.go +++ b/integration/v7/isolated/disable_org_isolation_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_service_access_command_test.go b/integration/v7/isolated/disable_service_access_command_test.go index ca78b0bc63..949648e628 100644 --- a/integration/v7/isolated/disable_service_access_command_test.go +++ b/integration/v7/isolated/disable_service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_ssh_command_test.go b/integration/v7/isolated/disable_ssh_command_test.go index 9de1ddbbaf..b15c334af8 100644 --- a/integration/v7/isolated/disable_ssh_command_test.go +++ b/integration/v7/isolated/disable_ssh_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disallow_space_ssh_command_test.go b/integration/v7/isolated/disallow_space_ssh_command_test.go index cc1f3502e3..27e35b5030 100644 --- a/integration/v7/isolated/disallow_space_ssh_command_test.go +++ b/integration/v7/isolated/disallow_space_ssh_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/domains_command_test.go b/integration/v7/isolated/domains_command_test.go index 39ec17e2f4..b00ba1b20c 100644 --- a/integration/v7/isolated/domains_command_test.go +++ b/integration/v7/isolated/domains_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/download_droplet_command_test.go b/integration/v7/isolated/download_droplet_command_test.go index 8fbe350ea7..80e5d322fd 100644 --- a/integration/v7/isolated/download_droplet_command_test.go +++ b/integration/v7/isolated/download_droplet_command_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/droplets_command_test.go b/integration/v7/isolated/droplets_command_test.go index 186700f08b..6fb879ee56 100644 --- a/integration/v7/isolated/droplets_command_test.go +++ b/integration/v7/isolated/droplets_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_org_isolation_command_test.go b/integration/v7/isolated/enable_org_isolation_command_test.go index 5f8ded92b2..d5073490b3 100644 --- a/integration/v7/isolated/enable_org_isolation_command_test.go +++ b/integration/v7/isolated/enable_org_isolation_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_service_access_command_test.go b/integration/v7/isolated/enable_service_access_command_test.go index aabff91eb5..f0aa4a6ce6 100644 --- a/integration/v7/isolated/enable_service_access_command_test.go +++ b/integration/v7/isolated/enable_service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_ssh_command_test.go b/integration/v7/isolated/enable_ssh_command_test.go index 014791f83b..4e44c8fba5 100644 --- a/integration/v7/isolated/enable_ssh_command_test.go +++ b/integration/v7/isolated/enable_ssh_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/error_on_extra_arguments_test.go b/integration/v7/isolated/error_on_extra_arguments_test.go index 712f9036f2..84cb4e44c0 100644 --- a/integration/v7/isolated/error_on_extra_arguments_test.go +++ b/integration/v7/isolated/error_on_extra_arguments_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/events_command_test.go b/integration/v7/isolated/events_command_test.go index 9b6ddb295c..90b3a72691 100644 --- a/integration/v7/isolated/events_command_test.go +++ b/integration/v7/isolated/events_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/feature_flag_command_test.go b/integration/v7/isolated/feature_flag_command_test.go index bcec97a4bd..10a42dab0c 100644 --- a/integration/v7/isolated/feature_flag_command_test.go +++ b/integration/v7/isolated/feature_flag_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/feature_flags_command_test.go b/integration/v7/isolated/feature_flags_command_test.go index 26f7c7e4c4..ea599be811 100644 --- a/integration/v7/isolated/feature_flags_command_test.go +++ b/integration/v7/isolated/feature_flags_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/get_health_check_command_test.go b/integration/v7/isolated/get_health_check_command_test.go index a1b64a9f56..ab834cae20 100644 --- a/integration/v7/isolated/get_health_check_command_test.go +++ b/integration/v7/isolated/get_health_check_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/help_command_test.go b/integration/v7/isolated/help_command_test.go index 43991701ea..52dd5752e4 100644 --- a/integration/v7/isolated/help_command_test.go +++ b/integration/v7/isolated/help_command_test.go @@ -4,8 +4,8 @@ import ( "os/exec" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/isolated_suite_test.go b/integration/v7/isolated/isolated_suite_test.go index dc376ee9ef..caac57a4da 100644 --- a/integration/v7/isolated/isolated_suite_test.go +++ b/integration/v7/isolated/isolated_suite_test.go @@ -3,7 +3,7 @@ package isolated import ( "testing" - "code.cloudfoundry.org/cli/integration/helpers/commonisolated" + "code.cloudfoundry.org/cli/v8/integration/helpers/commonisolated" ) const ( diff --git a/integration/v7/isolated/isolation_segments_command_test.go b/integration/v7/isolated/isolation_segments_command_test.go index bb5243e785..3b9765546d 100644 --- a/integration/v7/isolated/isolation_segments_command_test.go +++ b/integration/v7/isolated/isolation_segments_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/labels_command_test.go b/integration/v7/isolated/labels_command_test.go index c8182e0028..0fd5af3484 100644 --- a/integration/v7/isolated/labels_command_test.go +++ b/integration/v7/isolated/labels_command_test.go @@ -4,10 +4,10 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/login_command_test.go b/integration/v7/isolated/login_command_test.go index 34081b4005..fb4490ca18 100644 --- a/integration/v7/isolated/login_command_test.go +++ b/integration/v7/isolated/login_command_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/logout_command_test.go b/integration/v7/isolated/logout_command_test.go index e275aaed57..45709ccf38 100644 --- a/integration/v7/isolated/logout_command_test.go +++ b/integration/v7/isolated/logout_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/logs_command_test.go b/integration/v7/isolated/logs_command_test.go index 241a3c1a9f..6331e89fa0 100644 --- a/integration/v7/isolated/logs_command_test.go +++ b/integration/v7/isolated/logs_command_test.go @@ -6,9 +6,9 @@ import ( "os/exec" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/map_route_command_test.go b/integration/v7/isolated/map_route_command_test.go index a22b82c0c3..61b1df6ede 100644 --- a/integration/v7/isolated/map_route_command_test.go +++ b/integration/v7/isolated/map_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/marketplace_command_test.go b/integration/v7/isolated/marketplace_command_test.go index 08567ea41b..4411a450f5 100644 --- a/integration/v7/isolated/marketplace_command_test.go +++ b/integration/v7/isolated/marketplace_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -393,7 +393,7 @@ var _ = Describe("marketplace command", func() { // Available - //When("a plan has cost information", func() { + // When("a plan has cost information", func() { // var brokerWithCosts *servicebrokerstub.ServiceBrokerStub // // BeforeEach(func() { @@ -438,7 +438,7 @@ var _ = Describe("marketplace command", func() { // Say(`%s\s+%s\s+%s\s+\n`, brokerWithCosts.Services[0].Plans[3].Name, brokerWithCosts.Services[0].Plans[3].Description, "free"), // )) // }) - //}) + // }) }) }) diff --git a/integration/v7/isolated/move_route_command_test.go b/integration/v7/isolated/move_route_command_test.go index 242871705a..bb7e7fa0fc 100644 --- a/integration/v7/isolated/move_route_command_test.go +++ b/integration/v7/isolated/move_route_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/network_policies_command_test.go b/integration/v7/isolated/network_policies_command_test.go index 05469eccd8..3d8c66f944 100644 --- a/integration/v7/isolated/network_policies_command_test.go +++ b/integration/v7/isolated/network_policies_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/oauth_client_test.go b/integration/v7/isolated/oauth_client_test.go index 9d7e9ee834..171fbca9a5 100644 --- a/integration/v7/isolated/oauth_client_test.go +++ b/integration/v7/isolated/oauth_client_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/oauth_token_command_test.go b/integration/v7/isolated/oauth_token_command_test.go index 8cabb8b142..705ec53cbe 100644 --- a/integration/v7/isolated/oauth_token_command_test.go +++ b/integration/v7/isolated/oauth_token_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/org_command_test.go b/integration/v7/isolated/org_command_test.go index ddfece678e..e4e3eeda04 100644 --- a/integration/v7/isolated/org_command_test.go +++ b/integration/v7/isolated/org_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "sort" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/org_users_command_test.go b/integration/v7/isolated/org_users_command_test.go index f2f6ec6387..031fc9285e 100644 --- a/integration/v7/isolated/org_users_command_test.go +++ b/integration/v7/isolated/org_users_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/orgs_command_test.go b/integration/v7/isolated/orgs_command_test.go index db77e0eac9..d5a4039f0b 100644 --- a/integration/v7/isolated/orgs_command_test.go +++ b/integration/v7/isolated/orgs_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/packages_command_test.go b/integration/v7/isolated/packages_command_test.go index f81f6b47dc..f3ddd3e11f 100644 --- a/integration/v7/isolated/packages_command_test.go +++ b/integration/v7/isolated/packages_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/passwd_command_test.go b/integration/v7/isolated/passwd_command_test.go index f5caa3685f..5d654d6a82 100644 --- a/integration/v7/isolated/passwd_command_test.go +++ b/integration/v7/isolated/passwd_command_test.go @@ -5,8 +5,8 @@ import ( "io" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/proxy_connection_test.go b/integration/v7/isolated/proxy_connection_test.go index 1c25e4fc26..073775f02a 100644 --- a/integration/v7/isolated/proxy_connection_test.go +++ b/integration/v7/isolated/proxy_connection_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/purge_service_instance_command_test.go b/integration/v7/isolated/purge_service_instance_command_test.go index 60c13a7a74..f1b6b3ab21 100644 --- a/integration/v7/isolated/purge_service_instance_command_test.go +++ b/integration/v7/isolated/purge_service_instance_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/purge_service_offering_command_test.go b/integration/v7/isolated/purge_service_offering_command_test.go index ac09419e92..47124b6364 100644 --- a/integration/v7/isolated/purge_service_offering_command_test.go +++ b/integration/v7/isolated/purge_service_offering_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/remove_network_policy_command_test.go b/integration/v7/isolated/remove_network_policy_command_test.go index 22c3871f7a..92891d65b7 100644 --- a/integration/v7/isolated/remove_network_policy_command_test.go +++ b/integration/v7/isolated/remove_network_policy_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_command_test.go b/integration/v7/isolated/rename_command_test.go index 29e5d58eb2..2a2b8f9746 100644 --- a/integration/v7/isolated/rename_command_test.go +++ b/integration/v7/isolated/rename_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_org_command_test.go b/integration/v7/isolated/rename_org_command_test.go index ad5accf899..342ff13d92 100644 --- a/integration/v7/isolated/rename_org_command_test.go +++ b/integration/v7/isolated/rename_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_service_broker_command_test.go b/integration/v7/isolated/rename_service_broker_command_test.go index bac5aa88f2..05db1856ca 100644 --- a/integration/v7/isolated/rename_service_broker_command_test.go +++ b/integration/v7/isolated/rename_service_broker_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_service_command_test.go b/integration/v7/isolated/rename_service_command_test.go index 235b34840c..dc26857e0a 100644 --- a/integration/v7/isolated/rename_service_command_test.go +++ b/integration/v7/isolated/rename_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_space_command_test.go b/integration/v7/isolated/rename_space_command_test.go index 3360df69e4..fc082895c6 100644 --- a/integration/v7/isolated/rename_space_command_test.go +++ b/integration/v7/isolated/rename_space_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 2cd88a1505..33bde2dc53 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 @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/reset_space_isolation_segment_test.go b/integration/v7/isolated/reset_space_isolation_segment_test.go index effd49f726..3ecaaef669 100644 --- a/integration/v7/isolated/reset_space_isolation_segment_test.go +++ b/integration/v7/isolated/reset_space_isolation_segment_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/restage_command_test.go b/integration/v7/isolated/restage_command_test.go index 3d88fcad0d..41f5080e7b 100644 --- a/integration/v7/isolated/restage_command_test.go +++ b/integration/v7/isolated/restage_command_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/restart_app_instance_command_test.go b/integration/v7/isolated/restart_app_instance_command_test.go index ce1a1f5ebf..aefdffdc9c 100644 --- a/integration/v7/isolated/restart_app_instance_command_test.go +++ b/integration/v7/isolated/restart_app_instance_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/restart_command_test.go b/integration/v7/isolated/restart_command_test.go index f58f5e60ab..3cfb0e8335 100644 --- a/integration/v7/isolated/restart_command_test.go +++ b/integration/v7/isolated/restart_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/revision_command_test.go b/integration/v7/isolated/revision_command_test.go index 47cf099fc4..2da4188233 100644 --- a/integration/v7/isolated/revision_command_test.go +++ b/integration/v7/isolated/revision_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/revisions_command_test.go b/integration/v7/isolated/revisions_command_test.go index 952654b1b7..5c4d5cfd18 100644 --- a/integration/v7/isolated/revisions_command_test.go +++ b/integration/v7/isolated/revisions_command_test.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rollback_command_test.go b/integration/v7/isolated/rollback_command_test.go index e8c1b6c943..d9d18850d0 100644 --- a/integration/v7/isolated/rollback_command_test.go +++ b/integration/v7/isolated/rollback_command_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/route_command_test.go b/integration/v7/isolated/route_command_test.go index 140cd1178a..a552ca8313 100644 --- a/integration/v7/isolated/route_command_test.go +++ b/integration/v7/isolated/route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/router_groups_command_test.go b/integration/v7/isolated/router_groups_command_test.go index b49a79cf08..28d93036a8 100644 --- a/integration/v7/isolated/router_groups_command_test.go +++ b/integration/v7/isolated/router_groups_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/routes_command_test.go b/integration/v7/isolated/routes_command_test.go index 4f5ff25fcd..f960a92ebb 100644 --- a/integration/v7/isolated/routes_command_test.go +++ b/integration/v7/isolated/routes_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/run_task_command_test.go b/integration/v7/isolated/run_task_command_test.go index cbbdd446ee..60ad1268ce 100644 --- a/integration/v7/isolated/run_task_command_test.go +++ b/integration/v7/isolated/run_task_command_test.go @@ -4,8 +4,8 @@ import ( "fmt" "path" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/scale_command_test.go b/integration/v7/isolated/scale_command_test.go index 1774c1c39a..73d8a68ab2 100644 --- a/integration/v7/isolated/scale_command_test.go +++ b/integration/v7/isolated/scale_command_test.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -302,7 +302,7 @@ var _ = Describe("scale command", func() { _, err := buffer.Write([]byte("y\n")) Expect(err).ToNot(HaveOccurred()) - //Delay to reduce flakiness + // Delay to reduce flakiness time.Sleep(3 * time.Second) session := helpers.CFWithStdin(buffer, "scale", appName, "-i", "2", "-k", "512M", "-m", "60M") @@ -314,7 +314,7 @@ var _ = Describe("scale command", func() { helpers.WaitForAppMemoryToTakeEffect(appName, 0, 0, false, "60M") - //Delay to reduce flakiness + // Delay to reduce flakiness time.Sleep(5 * time.Second) session = helpers.CF("app", appName) diff --git a/integration/v7/isolated/security_groups_command_test.go b/integration/v7/isolated/security_groups_command_test.go index 8581aa8f1d..68da0d3e6a 100644 --- a/integration/v7/isolated/security_groups_command_test.go +++ b/integration/v7/isolated/security_groups_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_access_command_test.go b/integration/v7/isolated/service_access_command_test.go index 3cd24fc51a..300153531e 100644 --- a/integration/v7/isolated/service_access_command_test.go +++ b/integration/v7/isolated/service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_brokers_command_test.go b/integration/v7/isolated/service_brokers_command_test.go index b27126d02f..cf6d867eda 100644 --- a/integration/v7/isolated/service_brokers_command_test.go +++ b/integration/v7/isolated/service_brokers_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_command_test.go b/integration/v7/isolated/service_command_test.go index c2f1c340c8..98a0d00342 100644 --- a/integration/v7/isolated/service_command_test.go +++ b/integration/v7/isolated/service_command_test.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -171,7 +171,7 @@ var _ = Describe("service command", func() { }) It("displays the bound apps", func() { - //Delay to reduce flakiness + // Delay to reduce flakiness time.Sleep(10 * time.Second) session := helpers.CF(serviceCommand, serviceInstanceName, "-v") Eventually(session).Should(Exit(0)) diff --git a/integration/v7/isolated/service_key_command_test.go b/integration/v7/isolated/service_key_command_test.go index 735eae8ba8..e5083ff5f0 100644 --- a/integration/v7/isolated/service_key_command_test.go +++ b/integration/v7/isolated/service_key_command_test.go @@ -1,12 +1,12 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/gomega/gexec" . "github.com/onsi/gomega/gbytes" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/isolated/service_keys_command_test.go b/integration/v7/isolated/service_keys_command_test.go index 053e0b99cb..0d56cbb84b 100644 --- a/integration/v7/isolated/service_keys_command_test.go +++ b/integration/v7/isolated/service_keys_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/services_command_test.go b/integration/v7/isolated/services_command_test.go index 6afe49ffa0..c6017f9297 100644 --- a/integration/v7/isolated/services_command_test.go +++ b/integration/v7/isolated/services_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_droplet_command_test.go b/integration/v7/isolated/set_droplet_command_test.go index a5db7cbdf7..22067f86ed 100644 --- a/integration/v7/isolated/set_droplet_command_test.go +++ b/integration/v7/isolated/set_droplet_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_env_command_test.go b/integration/v7/isolated/set_env_command_test.go index 1e3a71fa64..63ad8c5fc6 100644 --- a/integration/v7/isolated/set_env_command_test.go +++ b/integration/v7/isolated/set_env_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_health_check_command_test.go b/integration/v7/isolated/set_health_check_command_test.go index 5d9d48b054..111a46b56a 100644 --- a/integration/v7/isolated/set_health_check_command_test.go +++ b/integration/v7/isolated/set_health_check_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_label_command_test.go b/integration/v7/isolated/set_label_command_test.go index fac616d7a2..4c96795ac8 100644 --- a/integration/v7/isolated/set_label_command_test.go +++ b/integration/v7/isolated/set_label_command_test.go @@ -4,10 +4,10 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 3c00315471..1fe0a20d18 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 @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_org_quota_command_test.go b/integration/v7/isolated/set_org_quota_command_test.go index 0288818c69..7773d871fe 100644 --- a/integration/v7/isolated/set_org_quota_command_test.go +++ b/integration/v7/isolated/set_org_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_org_role_command_test.go b/integration/v7/isolated/set_org_role_command_test.go index 60967ccef8..b77b7a1c0f 100644 --- a/integration/v7/isolated/set_org_role_command_test.go +++ b/integration/v7/isolated/set_org_role_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 64915b1890..f339a3e9a5 100644 --- a/integration/v7/isolated/set_space_isolation_segment_command_test.go +++ b/integration/v7/isolated/set_space_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_space_quota_command_test.go b/integration/v7/isolated/set_space_quota_command_test.go index 19f2f451c6..e427e3de53 100644 --- a/integration/v7/isolated/set_space_quota_command_test.go +++ b/integration/v7/isolated/set_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_space_role_command_test.go b/integration/v7/isolated/set_space_role_command_test.go index 647345df2f..b669ef7bf9 100644 --- a/integration/v7/isolated/set_space_role_command_test.go +++ b/integration/v7/isolated/set_space_role_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_private_domain_test.go b/integration/v7/isolated/share_private_domain_test.go index e9e6270035..04739efbf6 100644 --- a/integration/v7/isolated/share_private_domain_test.go +++ b/integration/v7/isolated/share_private_domain_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_route_command_test.go b/integration/v7/isolated/share_route_command_test.go index 8697ac71e9..e815320ecc 100644 --- a/integration/v7/isolated/share_route_command_test.go +++ b/integration/v7/isolated/share_route_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_service_command_test.go b/integration/v7/isolated/share_service_command_test.go index 7d0ca44167..79412ff26e 100644 --- a/integration/v7/isolated/share_service_command_test.go +++ b/integration/v7/isolated/share_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/space_command_test.go b/integration/v7/isolated/space_command_test.go index 86a786222e..0bcb5cf870 100644 --- a/integration/v7/isolated/space_command_test.go +++ b/integration/v7/isolated/space_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_quota_command_test.go b/integration/v7/isolated/space_quota_command_test.go index 99203a033b..9dbcccda5b 100644 --- a/integration/v7/isolated/space_quota_command_test.go +++ b/integration/v7/isolated/space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_quotas_command_test.go b/integration/v7/isolated/space_quotas_command_test.go index 4953883c6a..7a9b7b3456 100644 --- a/integration/v7/isolated/space_quotas_command_test.go +++ b/integration/v7/isolated/space_quotas_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_ssh_allowed_command_test.go b/integration/v7/isolated/space_ssh_allowed_command_test.go index f2bdc27eb8..a4b402bfee 100644 --- a/integration/v7/isolated/space_ssh_allowed_command_test.go +++ b/integration/v7/isolated/space_ssh_allowed_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_users_command_test.go b/integration/v7/isolated/space_users_command_test.go index 2932a3af07..6ffe3f7704 100644 --- a/integration/v7/isolated/space_users_command_test.go +++ b/integration/v7/isolated/space_users_command_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/integration/helpers" ) var _ = Describe("space-users command", func() { diff --git a/integration/v7/isolated/spaces_command_test.go b/integration/v7/isolated/spaces_command_test.go index 5ae047e821..4a14345ee0 100644 --- a/integration/v7/isolated/spaces_command_test.go +++ b/integration/v7/isolated/spaces_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/ssh_code_command_test.go b/integration/v7/isolated/ssh_code_command_test.go index 2866e47d44..cbf7397b97 100644 --- a/integration/v7/isolated/ssh_code_command_test.go +++ b/integration/v7/isolated/ssh_code_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/ssh_command_test.go b/integration/v7/isolated/ssh_command_test.go index e7eeefd58a..0770d107b8 100644 --- a/integration/v7/isolated/ssh_command_test.go +++ b/integration/v7/isolated/ssh_command_test.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/ssh_enabled_command_test.go b/integration/v7/isolated/ssh_enabled_command_test.go index 0c920497b8..60d74540eb 100644 --- a/integration/v7/isolated/ssh_enabled_command_test.go +++ b/integration/v7/isolated/ssh_enabled_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stack_command_test.go b/integration/v7/isolated/stack_command_test.go index dde2aadfa4..8f065a8b64 100644 --- a/integration/v7/isolated/stack_command_test.go +++ b/integration/v7/isolated/stack_command_test.go @@ -4,9 +4,9 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stacks_command_test.go b/integration/v7/isolated/stacks_command_test.go index 3403d3cda6..e451c0f40b 100644 --- a/integration/v7/isolated/stacks_command_test.go +++ b/integration/v7/isolated/stacks_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stage_package_command_test.go b/integration/v7/isolated/stage_package_command_test.go index 51080f9474..59e86673fe 100644 --- a/integration/v7/isolated/stage_package_command_test.go +++ b/integration/v7/isolated/stage_package_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/start_command_test.go b/integration/v7/isolated/start_command_test.go index f1dab044bd..9afd8bd854 100644 --- a/integration/v7/isolated/start_command_test.go +++ b/integration/v7/isolated/start_command_test.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/stop_command_test.go b/integration/v7/isolated/stop_command_test.go index 698d51a6e1..534095e88e 100644 --- a/integration/v7/isolated/stop_command_test.go +++ b/integration/v7/isolated/stop_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/table_alignment_test.go b/integration/v7/isolated/table_alignment_test.go index 0bd51ca4cd..ff2599f9ac 100644 --- a/integration/v7/isolated/table_alignment_test.go +++ b/integration/v7/isolated/table_alignment_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/target_command_test.go b/integration/v7/isolated/target_command_test.go index 24ce9aa008..6364407877 100644 --- a/integration/v7/isolated/target_command_test.go +++ b/integration/v7/isolated/target_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/tasks_command_test.go b/integration/v7/isolated/tasks_command_test.go index 8d1bb2d23d..19f13d45ac 100644 --- a/integration/v7/isolated/tasks_command_test.go +++ b/integration/v7/isolated/tasks_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/terminate_task_command_test.go b/integration/v7/isolated/terminate_task_command_test.go index 8214016dc1..f78dce2b36 100644 --- a/integration/v7/isolated/terminate_task_command_test.go +++ b/integration/v7/isolated/terminate_task_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/token_refresh_test.go b/integration/v7/isolated/token_refresh_test.go index 17bdbf10e6..e0fd08ad2c 100644 --- a/integration/v7/isolated/token_refresh_test.go +++ b/integration/v7/isolated/token_refresh_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/unbind_route_service_command_test.go b/integration/v7/isolated/unbind_route_service_command_test.go index 52c4782b8f..6bb192438c 100644 --- a/integration/v7/isolated/unbind_route_service_command_test.go +++ b/integration/v7/isolated/unbind_route_service_command_test.go @@ -4,9 +4,9 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unbind_service_command_test.go b/integration/v7/isolated/unbind_service_command_test.go index b6646c7d3e..4d6617762a 100644 --- a/integration/v7/isolated/unbind_service_command_test.go +++ b/integration/v7/isolated/unbind_service_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unmap_route_command_test.go b/integration/v7/isolated/unmap_route_command_test.go index 7143031a98..3f100bf678 100644 --- a/integration/v7/isolated/unmap_route_command_test.go +++ b/integration/v7/isolated/unmap_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_env_command_test.go b/integration/v7/isolated/unset_env_command_test.go index b1f1a2ea4a..9419e5c0a6 100644 --- a/integration/v7/isolated/unset_env_command_test.go +++ b/integration/v7/isolated/unset_env_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_label_command_test.go b/integration/v7/isolated/unset_label_command_test.go index 114e40e60c..696ffb3614 100644 --- a/integration/v7/isolated/unset_label_command_test.go +++ b/integration/v7/isolated/unset_label_command_test.go @@ -4,9 +4,9 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_org_role_command_test.go b/integration/v7/isolated/unset_org_role_command_test.go index c8710d15e5..22de6551aa 100644 --- a/integration/v7/isolated/unset_org_role_command_test.go +++ b/integration/v7/isolated/unset_org_role_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_space_quota_command_test.go b/integration/v7/isolated/unset_space_quota_command_test.go index 54eea9df6d..318492f8f9 100644 --- a/integration/v7/isolated/unset_space_quota_command_test.go +++ b/integration/v7/isolated/unset_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_space_role_command_test.go b/integration/v7/isolated/unset_space_role_command_test.go index c6bd9f0923..4495014257 100644 --- a/integration/v7/isolated/unset_space_role_command_test.go +++ b/integration/v7/isolated/unset_space_role_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_private_domain_test.go b/integration/v7/isolated/unshare_private_domain_test.go index aa30eea555..2a7fb3f809 100644 --- a/integration/v7/isolated/unshare_private_domain_test.go +++ b/integration/v7/isolated/unshare_private_domain_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_route_command_test.go b/integration/v7/isolated/unshare_route_command_test.go index 8520edf2b5..58e25213bd 100644 --- a/integration/v7/isolated/unshare_route_command_test.go +++ b/integration/v7/isolated/unshare_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_service_command_test.go b/integration/v7/isolated/unshare_service_command_test.go index 174576601a..30ce0a17e1 100644 --- a/integration/v7/isolated/unshare_service_command_test.go +++ b/integration/v7/isolated/unshare_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_destination_command_test.go b/integration/v7/isolated/update_destination_command_test.go index 0345cacc3b..0521239228 100644 --- a/integration/v7/isolated/update_destination_command_test.go +++ b/integration/v7/isolated/update_destination_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_org_quota_command_test.go b/integration/v7/isolated/update_org_quota_command_test.go index af05857720..d5aa26e693 100644 --- a/integration/v7/isolated/update_org_quota_command_test.go +++ b/integration/v7/isolated/update_org_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_service_broker_command_test.go b/integration/v7/isolated/update_service_broker_command_test.go index 04b888a287..44246fadd9 100644 --- a/integration/v7/isolated/update_service_broker_command_test.go +++ b/integration/v7/isolated/update_service_broker_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_service_command_test.go b/integration/v7/isolated/update_service_command_test.go index d569fd2afd..78fff6507a 100644 --- a/integration/v7/isolated/update_service_command_test.go +++ b/integration/v7/isolated/update_service_command_test.go @@ -4,8 +4,8 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/update_space_quota_command_test.go b/integration/v7/isolated/update_space_quota_command_test.go index e76527be52..235d4fb3a4 100644 --- a/integration/v7/isolated/update_space_quota_command_test.go +++ b/integration/v7/isolated/update_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 25ac544784..1eeee35ebe 100644 --- a/integration/v7/isolated/update_user_provided_service_command_test.go +++ b/integration/v7/isolated/update_user_provided_service_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/upgrade_service_command_test.go b/integration/v7/isolated/upgrade_service_command_test.go index 9cdc10d8bf..91d05eabfb 100644 --- a/integration/v7/isolated/upgrade_service_command_test.go +++ b/integration/v7/isolated/upgrade_service_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/verbose_flag_test.go b/integration/v7/isolated/verbose_flag_test.go index 3497177a27..19c38d4982 100644 --- a/integration/v7/isolated/verbose_flag_test.go +++ b/integration/v7/isolated/verbose_flag_test.go @@ -6,8 +6,8 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -61,7 +61,7 @@ var _ = Describe("Verbose", func() { Eventually(session).Should(Say("REQUEST:")) Eventually(session).Should(Say("POST /oauth/token")) Eventually(session).Should(Say(`User-Agent: cf/[\w.+-]+ \(go\d+\.\d+(\.\d+)?; %s %s\)`, runtime.GOARCH, runtime.GOOS)) - Eventually(session).Should(Say(`\[PRIVATE DATA HIDDEN\]`)) //This is required to test the previous line. If it fails, the previous matcher went too far. + Eventually(session).Should(Say(`\[PRIVATE DATA HIDDEN\]`)) // This is required to test the previous line. If it fails, the previous matcher went too far. Eventually(session).Should(Say("RESPONSE:")) Eventually(session).Should(Say("REQUEST:")) Eventually(session).Should(Say("GET /v3/apps")) diff --git a/integration/v7/push/app_start_timeout_flag_test.go b/integration/v7/push/app_start_timeout_flag_test.go index 0317157618..bc2f9f3f8a 100644 --- a/integration/v7/push/app_start_timeout_flag_test.go +++ b/integration/v7/push/app_start_timeout_flag_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 3a9ab46d74..fb8fb06504 100644 --- a/integration/v7/push/buildpacks_test.go +++ b/integration/v7/push/buildpacks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/canary_push_test.go b/integration/v7/push/canary_push_test.go index 58a9e5cf58..71520bb90d 100644 --- a/integration/v7/push/canary_push_test.go +++ b/integration/v7/push/canary_push_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/cfignore_test.go b/integration/v7/push/cfignore_test.go index 0e676f96da..5f80245fb6 100644 --- a/integration/v7/push/cfignore_test.go +++ b/integration/v7/push/cfignore_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 78410af296..95a5f98414 100644 --- a/integration/v7/push/combination_manifest_and_flag_test.go +++ b/integration/v7/push/combination_manifest_and_flag_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/disk_flag_test.go b/integration/v7/push/disk_flag_test.go index 7e473fb296..538c41afae 100644 --- a/integration/v7/push/disk_flag_test.go +++ b/integration/v7/push/disk_flag_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/docker_test.go b/integration/v7/push/docker_test.go index 6cdce941a6..370d778fc5 100644 --- a/integration/v7/push/docker_test.go +++ b/integration/v7/push/docker_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/droplet_flag_test.go b/integration/v7/push/droplet_flag_test.go index cf7378bc80..bb517de1c6 100644 --- a/integration/v7/push/droplet_flag_test.go +++ b/integration/v7/push/droplet_flag_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/health_check_test.go b/integration/v7/push/health_check_test.go index 0e60a5ebe6..f94359e50a 100644 --- a/integration/v7/push/health_check_test.go +++ b/integration/v7/push/health_check_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -84,7 +84,7 @@ var _ = Describe("push with health check type", func() { session := helpers.CF("get-health-check", appName) Eventually(session).Should(Say("web\\s+http\\s+/third_endpoint.html")) - Eventually(session).Should(Exit(0)) //}) + Eventually(session).Should(Exit(0)) // }) }) }) diff --git a/integration/v7/push/help_test.go b/integration/v7/push/help_test.go index 7503e313a3..40e49a7267 100644 --- a/integration/v7/push/help_test.go +++ b/integration/v7/push/help_test.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/ignore_app_files_test.go b/integration/v7/push/ignore_app_files_test.go index 877a33f89c..f8af82b10d 100644 --- a/integration/v7/push/ignore_app_files_test.go +++ b/integration/v7/push/ignore_app_files_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/input_errors_test.go b/integration/v7/push/input_errors_test.go index 3384ad5b23..f912cd5675 100644 --- a/integration/v7/push/input_errors_test.go +++ b/integration/v7/push/input_errors_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/instances_flag_test.go b/integration/v7/push/instances_flag_test.go index 000c0aca92..b40b03451c 100644 --- a/integration/v7/push/instances_flag_test.go +++ b/integration/v7/push/instances_flag_test.go @@ -3,7 +3,7 @@ package push import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/log_rate_limit_flag_test.go b/integration/v7/push/log_rate_limit_flag_test.go index d1be10ef63..5c49eb8f99 100644 --- a/integration/v7/push/log_rate_limit_flag_test.go +++ b/integration/v7/push/log_rate_limit_flag_test.go @@ -1,8 +1,8 @@ package push import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/manifest_diff_test.go b/integration/v7/push/manifest_diff_test.go index 00318776a3..b29a4fe52e 100644 --- a/integration/v7/push/manifest_diff_test.go +++ b/integration/v7/push/manifest_diff_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/manifest_location_test.go b/integration/v7/push/manifest_location_test.go index 2564e031d6..00370cda5e 100644 --- a/integration/v7/push/manifest_location_test.go +++ b/integration/v7/push/manifest_location_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 7390c4cc64..65f78f99bc 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 @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/manifest_with_app_name_test.go b/integration/v7/push/manifest_with_app_name_test.go index c26a7d71be..ee4871cae4 100644 --- a/integration/v7/push/manifest_with_app_name_test.go +++ b/integration/v7/push/manifest_with_app_name_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/memory_flag_test.go b/integration/v7/push/memory_flag_test.go index 519cb517fe..d61e24c9bc 100644 --- a/integration/v7/push/memory_flag_test.go +++ b/integration/v7/push/memory_flag_test.go @@ -3,7 +3,7 @@ package push import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/name_only_test.go b/integration/v7/push/name_only_test.go index 28fbe16196..538bac17a6 100644 --- a/integration/v7/push/name_only_test.go +++ b/integration/v7/push/name_only_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/no_route_test.go b/integration/v7/push/no_route_test.go index a776ee0eb5..01df38ab4b 100644 --- a/integration/v7/push/no_route_test.go +++ b/integration/v7/push/no_route_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/no_start_test.go b/integration/v7/push/no_start_test.go index e95975427c..6a3ec5a0b7 100644 --- a/integration/v7/push/no_start_test.go +++ b/integration/v7/push/no_start_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/no_wait_test.go b/integration/v7/push/no_wait_test.go index b17fd4fd01..2c58fbc08c 100644 --- a/integration/v7/push/no_wait_test.go +++ b/integration/v7/push/no_wait_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/path_test.go b/integration/v7/push/path_test.go index 06eebc8b5f..ca62a36b0a 100644 --- a/integration/v7/push/path_test.go +++ b/integration/v7/push/path_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/push_output_test.go b/integration/v7/push/push_output_test.go index 014f03c176..0fabbf92a9 100644 --- a/integration/v7/push/push_output_test.go +++ b/integration/v7/push/push_output_test.go @@ -5,7 +5,7 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/push_suite_test.go b/integration/v7/push/push_suite_test.go index 42423eab71..0ff9050701 100644 --- a/integration/v7/push/push_suite_test.go +++ b/integration/v7/push/push_suite_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/push/random_route_test.go b/integration/v7/push/random_route_test.go index f50d7e4c2a..ec48339518 100644 --- a/integration/v7/push/random_route_test.go +++ b/integration/v7/push/random_route_test.go @@ -5,7 +5,7 @@ import ( "path" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/resource_matching_test.go b/integration/v7/push/resource_matching_test.go index 9364f9c342..4a91485cc6 100644 --- a/integration/v7/push/resource_matching_test.go +++ b/integration/v7/push/resource_matching_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/rolling_push_test.go b/integration/v7/push/rolling_push_test.go index 98e26aeca7..77be25e400 100644 --- a/integration/v7/push/rolling_push_test.go +++ b/integration/v7/push/rolling_push_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/simple_manifest_only_test.go b/integration/v7/push/simple_manifest_only_test.go index 3b94b4496c..76733d3fdb 100644 --- a/integration/v7/push/simple_manifest_only_test.go +++ b/integration/v7/push/simple_manifest_only_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/stacks_test.go b/integration/v7/push/stacks_test.go index 9fc5a0e378..0c2d6954e0 100644 --- a/integration/v7/push/stacks_test.go +++ b/integration/v7/push/stacks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/start_command_test.go b/integration/v7/push/start_command_test.go index efe675f513..9fddd54d33 100644 --- a/integration/v7/push/start_command_test.go +++ b/integration/v7/push/start_command_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/symlink_resources_test.go b/integration/v7/push/symlink_resources_test.go index f79ef305b2..f45314ae8a 100644 --- a/integration/v7/push/symlink_resources_test.go +++ b/integration/v7/push/symlink_resources_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/symlink_test.go b/integration/v7/push/symlink_test.go index 37339d753f..7853d3c183 100644 --- a/integration/v7/push/symlink_test.go +++ b/integration/v7/push/symlink_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "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 e109f058eb..923eca4ab6 100644 --- a/integration/v7/push/targeting_test.go +++ b/integration/v7/push/targeting_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" ) diff --git a/integration/v7/push/tasks_test.go b/integration/v7/push/tasks_test.go index 319c936eea..1ff434146b 100644 --- a/integration/v7/push/tasks_test.go +++ b/integration/v7/push/tasks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/selfcontained/api_command_test.go b/integration/v7/selfcontained/api_command_test.go index 4d5bee2df0..7b78ad4128 100644 --- a/integration/v7/selfcontained/api_command_test.go +++ b/integration/v7/selfcontained/api_command_test.go @@ -3,10 +3,10 @@ package selfcontained_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/integration/v7/selfcontained/create_space_command_test.go b/integration/v7/selfcontained/create_space_command_test.go index 5ba5e2324e..236412a6c3 100644 --- a/integration/v7/selfcontained/create_space_command_test.go +++ b/integration/v7/selfcontained/create_space_command_test.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/selfcontained/kubernetes_auth_log_test.go b/integration/v7/selfcontained/kubernetes_auth_log_test.go index 3785de1839..d80aa25a90 100644 --- a/integration/v7/selfcontained/kubernetes_auth_log_test.go +++ b/integration/v7/selfcontained/kubernetes_auth_log_test.go @@ -4,15 +4,15 @@ import ( "net/http" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" ) var _ = Describe("logclient auth-provider", func() { diff --git a/integration/v7/selfcontained/kubernetes_auth_test.go b/integration/v7/selfcontained/kubernetes_auth_test.go index 44fae9f3a5..d1bdefd93c 100644 --- a/integration/v7/selfcontained/kubernetes_auth_test.go +++ b/integration/v7/selfcontained/kubernetes_auth_test.go @@ -9,10 +9,10 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" ) var _ = Describe("auth-provider", func() { diff --git a/integration/v7/selfcontained/login_command_test.go b/integration/v7/selfcontained/login_command_test.go index 9476df9bff..2f3d8b9d26 100644 --- a/integration/v7/selfcontained/login_command_test.go +++ b/integration/v7/selfcontained/login_command_test.go @@ -12,11 +12,11 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/util/configv3" ) var _ = Describe("LoginCommand", func() { diff --git a/integration/v7/selfcontained/logout_command_test.go b/integration/v7/selfcontained/logout_command_test.go index 647273c389..6d3e0230b0 100644 --- a/integration/v7/selfcontained/logout_command_test.go +++ b/integration/v7/selfcontained/logout_command_test.go @@ -9,9 +9,9 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v8/util/configv3" ) var _ = Describe("cf logout", func() { diff --git a/integration/v7/selfcontained/selfcontained_suite_test.go b/integration/v7/selfcontained/selfcontained_suite_test.go index f5f1a64710..bfb928a7a1 100644 --- a/integration/v7/selfcontained/selfcontained_suite_test.go +++ b/integration/v7/selfcontained/selfcontained_suite_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v8/util/configv3" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" . "github.com/onsi/ginkgo/v2" diff --git a/main.go b/main.go index 1347aff23b..c0dfc6acee 100644 --- a/main.go +++ b/main.go @@ -7,13 +7,13 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/cmd" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/util/command_parser" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/panichandler" - plugin_util "code.cloudfoundry.org/cli/util/plugin" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/cf/cmd" + "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/util/command_parser" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/panichandler" + plugin_util "code.cloudfoundry.org/cli/v8/util/plugin" + "code.cloudfoundry.org/cli/v8/util/ui" ) func main() { @@ -55,7 +55,7 @@ func main() { case common.ShouldFallbackToLegacy: cmd.Main(os.Getenv("CF_TRACE"), os.Args) - //NOT REACHED, legacy main will exit the process + // NOT REACHED, legacy main will exit the process default: unknownCommandError.Suggest(plugin_util.PluginCommandNames()) diff --git a/plugin/cli_connection.go b/plugin/cli_connection.go index d1a902997d..4d02a140a2 100644 --- a/plugin/cli_connection.go +++ b/plugin/cli_connection.go @@ -8,7 +8,7 @@ import ( "os" "time" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" ) type cliConnection struct { @@ -110,7 +110,7 @@ func (c *cliConnection) callCliCommand(silently bool, args ...string) ([]string, } func (c *cliConnection) pingCLI() { - //call back to cf saying we have been setup + // call back to cf saying we have been setup var connErr error var conn net.Conn for i := 0; i < 5; i++ { diff --git a/plugin/plugin.go b/plugin/plugin.go index b2f1f8113a..596301fb4c 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -1,6 +1,6 @@ package plugin -import plugin_models "code.cloudfoundry.org/cli/plugin/models" +import plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" /* * @@ -74,5 +74,5 @@ type Command struct { Name string Alias string HelpText string - UsageDetails Usage //Detail usage to be displayed in `cf help ` + UsageDetails Usage // Detail usage to be displayed in `cf help ` } diff --git a/plugin/plugin_examples/basic_plugin.go b/plugin/plugin_examples/basic_plugin.go index b3662d0864..083319ffc2 100644 --- a/plugin/plugin_examples/basic_plugin.go +++ b/plugin/plugin_examples/basic_plugin.go @@ -3,11 +3,11 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) // BasicPlugin is the struct implementing the interface defined by the core CLI. It can -// be found at "code.cloudfoundry.org/cli/plugin/plugin.go" +// be found at "code.cloudfoundry.org/cli/v8/plugin/plugin.go" type BasicPlugin struct{} // Run must be implemented by any plugin because it is part of the @@ -77,7 +77,7 @@ func main() { // Any initialization for your plugin can be handled here // // Note: to run the plugin.Start method, we pass in a pointer to the struct - // implementing the interface defined at "code.cloudfoundry.org/cli/plugin/plugin.go" + // implementing the interface defined at "code.cloudfoundry.org/cli/v8/plugin/plugin.go" // // Note: The plugin's main() method is invoked at install time to collect // metadata. The plugin will exit 0 and the Run([]string) method will not be diff --git a/plugin/plugin_examples/echo.go b/plugin/plugin_examples/echo.go index 3a0e8f4621..98111a71bd 100644 --- a/plugin/plugin_examples/echo.go +++ b/plugin/plugin_examples/echo.go @@ -11,7 +11,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type PluginDemonstratingParams struct { diff --git a/plugin/plugin_examples/interactive.go b/plugin/plugin_examples/interactive.go index 3f45d0983f..88d958794a 100644 --- a/plugin/plugin_examples/interactive.go +++ b/plugin/plugin_examples/interactive.go @@ -9,7 +9,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type Interactive struct{} diff --git a/plugin/plugin_examples/multiple_commands.go b/plugin/plugin_examples/multiple_commands.go index d74b7026f4..d759acab57 100644 --- a/plugin/plugin_examples/multiple_commands.go +++ b/plugin/plugin_examples/multiple_commands.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/plugin" ) type MultiCmd struct{} diff --git a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go index 888c171d92..50d950ad69 100644 --- a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go +++ b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/plugin" ) type DemoCmd struct{} 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 182bf14c79..e6594a9bd4 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 ( "testing" "time" - "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) 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 26bf1c7ed4..a1f895c36d 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 @@ -5,10 +5,10 @@ import ( "errors" "os/exec" - . "code.cloudfoundry.org/cli/plugin/plugin_examples/test_rpc_server_example" + . "code.cloudfoundry.org/cli/v8/plugin/plugin_examples/test_rpc_server_example" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver/rpcserverfakes" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver/rpcserverfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -31,15 +31,15 @@ var _ = Describe("App-Lister", func() { ts, err = rpcserver.NewTestRPCServer(rpcHandlers) Expect(err).NotTo(HaveOccurred()) - //set rpc.CallCoreCommand to a successful call - //rpc.CallCoreCommand is used in both cliConnection.CliCommand() and - //cliConnection.CliWithoutTerminalOutput() + // set rpc.CallCoreCommand to a successful call + // rpc.CallCoreCommand is used in both cliConnection.CliCommand() and + // cliConnection.CliWithoutTerminalOutput() rpcHandlers.CallCoreCommandStub = func(_ []string, retVal *bool) error { *retVal = true return nil } - //set rpc.GetOutputAndReset to return empty string; this is used by CliCommand()/CliWithoutTerminalOutput() + // set rpc.GetOutputAndReset to return empty string; this is used by CliCommand()/CliWithoutTerminalOutput() rpcHandlers.GetOutputAndResetStub = func(_ bool, retVal *[]string) error { *retVal = []string{"{}"} return nil diff --git a/plugin/plugin_shim_test.go b/plugin/plugin_shim_test.go index 24b4922665..61f513e8d8 100644 --- a/plugin/plugin_shim_test.go +++ b/plugin/plugin_shim_test.go @@ -4,9 +4,9 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver/rpcserverfakes" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver/rpcserverfakes" + "code.cloudfoundry.org/cli/v8/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/plugin/plugin_suite_test.go b/plugin/plugin_suite_test.go index 8076cb8955..b3204d3b75 100644 --- a/plugin/plugin_suite_test.go +++ b/plugin/plugin_suite_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugin/pluginfakes/fake_cli_connection.go b/plugin/pluginfakes/fake_cli_connection.go index 2c439c1a8c..283bb69fa8 100644 --- a/plugin/pluginfakes/fake_cli_connection.go +++ b/plugin/pluginfakes/fake_cli_connection.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/plugin" - plugin_models "code.cloudfoundry.org/cli/plugin/models" + "code.cloudfoundry.org/cli/v8/plugin" + plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" ) type FakeCliConnection struct { diff --git a/plugin/rpc/call_command_registry.go b/plugin/rpc/call_command_registry.go index cb83f95e9d..bfe3d89357 100644 --- a/plugin/rpc/call_command_registry.go +++ b/plugin/rpc/call_command_registry.go @@ -3,9 +3,9 @@ package rpc import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CommandRunner diff --git a/plugin/rpc/call_command_registry_test.go b/plugin/rpc/call_command_registry_test.go index 6d21be85aa..36554dfa25 100644 --- a/plugin/rpc/call_command_registry_test.go +++ b/plugin/rpc/call_command_registry_test.go @@ -3,19 +3,19 @@ package rpc_test import ( "os" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/plugin/rpc" - . "code.cloudfoundry.org/cli/plugin/rpc/fakecommand" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v8/plugin/rpc" + . "code.cloudfoundry.org/cli/v8/plugin/rpc/fakecommand" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) var _ = Describe("calling commands in commandregistry", func() { - _ = FakeCommand1{} //make sure fake_command is imported and self-registered with init() - _ = FakeCommand3{} //make sure fake_command is imported and self-registered with init() - _ = FakeCommand4{} //make sure fake_command is imported and self-registered with init() + _ = FakeCommand1{} // make sure fake_command is imported and self-registered with init() + _ = FakeCommand3{} // make sure fake_command is imported and self-registered with init() + _ = FakeCommand4{} // make sure fake_command is imported and self-registered with init() var ( ui *terminalfakes.FakeUI diff --git a/plugin/rpc/cli_rpc_server.go b/plugin/rpc/cli_rpc_server.go index 34241693b2..1c44f551e5 100644 --- a/plugin/rpc/cli_rpc_server.go +++ b/plugin/rpc/cli_rpc_server.go @@ -11,16 +11,16 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/terminal" - "code.cloudfoundry.org/cli/plugin" - plugin_models "code.cloudfoundry.org/cli/plugin/models" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v8/plugin" + plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v8/version" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v8/cf/trace" ) var dialTimeout = os.Getenv("CF_DIAL_TIMEOUT") @@ -176,12 +176,12 @@ func (cmd *CliRpcCmd) CallCoreCommand(args []string, retVal *bool) error { if cmdRegistry.CommandExists(args[0]) { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator - //set command ui's TeePrinter to be the one used by RpcService, for output to be captured + // set command ui's TeePrinter to be the one used by RpcService, for output to be captured deps.UI = terminal.NewUI(os.Stdin, cmd.stdout, cmd.outputCapture.(*terminal.TeePrinter), cmd.logger) err = cmd.newCmdRunner.Command(args, deps, false) @@ -304,8 +304,8 @@ func (cmd *CliRpcCmd) AccessToken(args string, retVal *string) error { func (cmd *CliRpcCmd) GetApp(appName string, retVal *plugin_models.GetAppModel) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Application = retVal @@ -318,8 +318,8 @@ func (cmd *CliRpcCmd) GetApp(appName string, retVal *plugin_models.GetAppModel) func (cmd *CliRpcCmd) GetApps(_ string, retVal *[]plugin_models.GetAppsModel) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.AppsSummary = retVal @@ -332,8 +332,8 @@ func (cmd *CliRpcCmd) GetApps(_ string, retVal *[]plugin_models.GetAppsModel) er func (cmd *CliRpcCmd) GetOrgs(_ string, retVal *[]plugin_models.GetOrgs_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Organizations = retVal @@ -346,8 +346,8 @@ func (cmd *CliRpcCmd) GetOrgs(_ string, retVal *[]plugin_models.GetOrgs_Model) e func (cmd *CliRpcCmd) GetSpaces(_ string, retVal *[]plugin_models.GetSpaces_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Spaces = retVal @@ -360,9 +360,9 @@ func (cmd *CliRpcCmd) GetSpaces(_ string, retVal *[]plugin_models.GetSpaces_Mode func (cmd *CliRpcCmd) GetServices(_ string, retVal *[]plugin_models.GetServices_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Services = retVal @@ -375,8 +375,8 @@ func (cmd *CliRpcCmd) GetServices(_ string, retVal *[]plugin_models.GetServices_ func (cmd *CliRpcCmd) GetOrgUsers(args []string, retVal *[]plugin_models.GetOrgUsers_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.OrgUsers = retVal @@ -389,8 +389,8 @@ func (cmd *CliRpcCmd) GetOrgUsers(args []string, retVal *[]plugin_models.GetOrgU func (cmd *CliRpcCmd) GetSpaceUsers(args []string, retVal *[]plugin_models.GetSpaceUsers_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.SpaceUsers = retVal @@ -403,8 +403,8 @@ func (cmd *CliRpcCmd) GetSpaceUsers(args []string, retVal *[]plugin_models.GetSp func (cmd *CliRpcCmd) GetOrg(orgName string, retVal *plugin_models.GetOrg_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Organization = retVal @@ -417,8 +417,8 @@ func (cmd *CliRpcCmd) GetOrg(orgName string, retVal *plugin_models.GetOrg_Model) func (cmd *CliRpcCmd) GetSpace(spaceName string, retVal *plugin_models.GetSpace_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Space = retVal @@ -431,8 +431,8 @@ func (cmd *CliRpcCmd) GetSpace(spaceName string, retVal *plugin_models.GetSpace_ func (cmd *CliRpcCmd) GetService(serviceInstance string, retVal *plugin_models.GetService_Model) error { deps := commandregistry.NewDependency(cmd.stdout, cmd.logger, dialTimeout) - //set deps objs to be the one used by all other commands - //once all commands are converted, we can make fresh deps for each command run + // set deps objs to be the one used by all other commands + // once all commands are converted, we can make fresh deps for each command run deps.Config = cmd.cliConfig deps.RepoLocator = cmd.repoLocator deps.PluginModels.Service = retVal diff --git a/plugin/rpc/cli_rpc_server_test.go b/plugin/rpc/cli_rpc_server_test.go index 5f55b1594d..2759ab49e1 100644 --- a/plugin/rpc/cli_rpc_server_test.go +++ b/plugin/rpc/cli_rpc_server_test.go @@ -7,25 +7,25 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/cf/api" - "code.cloudfoundry.org/cli/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/plugin" - plugin_models "code.cloudfoundry.org/cli/plugin/models" - . "code.cloudfoundry.org/cli/plugin/rpc" - cmdRunner "code.cloudfoundry.org/cli/plugin/rpc" - . "code.cloudfoundry.org/cli/plugin/rpc/fakecommand" - "code.cloudfoundry.org/cli/plugin/rpc/rpcfakes" + "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v8/cf/terminal" + testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v8/plugin" + plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" + . "code.cloudfoundry.org/cli/v8/plugin/rpc" + cmdRunner "code.cloudfoundry.org/cli/v8/plugin/rpc" + . "code.cloudfoundry.org/cli/v8/plugin/rpc/fakecommand" + "code.cloudfoundry.org/cli/v8/plugin/rpc/rpcfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) var _ = Describe("Server", func() { - _ = FakeCommand1{} //make sure fake_command is imported and self-registered with init() + _ = FakeCommand1{} // make sure fake_command is imported and self-registered with init() var ( err error @@ -69,7 +69,7 @@ var _ = Describe("Server", func() { It("shuts down the rpc server", func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) client, err = rpc.Dial("tcp", "127.0.0.1:"+rpcService.Port()) @@ -91,7 +91,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -192,7 +192,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -222,7 +222,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -298,7 +298,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -441,7 +441,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) @@ -472,7 +472,7 @@ var _ = Describe("Server", func() { AfterEach(func() { rpcService.Stop() - //give time for server to stop + // give time for server to stop time.Sleep(50 * time.Millisecond) }) diff --git a/plugin/rpc/fakecommand/fake_command1.go b/plugin/rpc/fakecommand/fake_command1.go index a154ebde38..ecf87aed98 100644 --- a/plugin/rpc/fakecommand/fake_command1.go +++ b/plugin/rpc/fakecommand/fake_command1.go @@ -3,10 +3,10 @@ package fakecommand import ( "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type FakeCommand1 struct { diff --git a/plugin/rpc/fakecommand/fake_command2.go b/plugin/rpc/fakecommand/fake_command2.go index d329e6c3c4..eccba4e185 100644 --- a/plugin/rpc/fakecommand/fake_command2.go +++ b/plugin/rpc/fakecommand/fake_command2.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/terminal" ) type FakeCommand2 struct { diff --git a/plugin/rpc/fakecommand/fake_command3.go b/plugin/rpc/fakecommand/fake_command3.go index b13505d7b2..0ea7c6541d 100644 --- a/plugin/rpc/fakecommand/fake_command3.go +++ b/plugin/rpc/fakecommand/fake_command3.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) type FakeCommand3 struct { diff --git a/plugin/rpc/fakecommand/fake_command4.go b/plugin/rpc/fakecommand/fake_command4.go index e5b11eb886..bb79e8690d 100644 --- a/plugin/rpc/fakecommand/fake_command4.go +++ b/plugin/rpc/fakecommand/fake_command4.go @@ -3,9 +3,9 @@ package fakecommand import ( "errors" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/cf/requirements" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v8/cf/requirements" ) var ErrFakeCommand4 = errors.New("ZOMG command errored") diff --git a/plugin/rpc/rpc_suite_test.go b/plugin/rpc/rpc_suite_test.go index e67a82a626..1feaec7ecc 100644 --- a/plugin/rpc/rpc_suite_test.go +++ b/plugin/rpc/rpc_suite_test.go @@ -1,7 +1,7 @@ package rpc_test import ( - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v8/plugin/rpc" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/plugin/rpc/rpcfakes/fake_command_runner.go b/plugin/rpc/rpcfakes/fake_command_runner.go index fa70fde864..6aed4ec154 100644 --- a/plugin/rpc/rpcfakes/fake_command_runner.go +++ b/plugin/rpc/rpcfakes/fake_command_runner.go @@ -4,8 +4,8 @@ package rpcfakes import ( "sync" - "code.cloudfoundry.org/cli/cf/commandregistry" - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v8/plugin/rpc" ) type FakeCommandRunner struct { diff --git a/plugin/rpc/rpcfakes/fake_output_capture.go b/plugin/rpc/rpcfakes/fake_output_capture.go index 9d37d2ef93..5a59115fce 100644 --- a/plugin/rpc/rpcfakes/fake_output_capture.go +++ b/plugin/rpc/rpcfakes/fake_output_capture.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v8/plugin/rpc" ) type FakeOutputCapture struct { diff --git a/plugin/rpc/rpcfakes/fake_terminal_output_switch.go b/plugin/rpc/rpcfakes/fake_terminal_output_switch.go index 58e4cf01e7..5c9afeed7a 100644 --- a/plugin/rpc/rpcfakes/fake_terminal_output_switch.go +++ b/plugin/rpc/rpcfakes/fake_terminal_output_switch.go @@ -4,7 +4,7 @@ package rpcfakes import ( "sync" - "code.cloudfoundry.org/cli/plugin/rpc" + "code.cloudfoundry.org/cli/v8/plugin/rpc" ) type FakeTerminalOutputSwitch struct { diff --git a/plugin/rpc/run_plugin.go b/plugin/rpc/run_plugin.go index 295184628f..f57d194668 100644 --- a/plugin/rpc/run_plugin.go +++ b/plugin/rpc/run_plugin.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - "code.cloudfoundry.org/cli/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" ) func RunMethodIfExists(rpcService *CliRpcService, args []string, pluginList map[string]pluginconfig.PluginMetadata) bool { diff --git a/plugin/transition/run_plugin_legacy.go b/plugin/transition/run_plugin_legacy.go index ffac5683f3..3493276e37 100644 --- a/plugin/transition/run_plugin_legacy.go +++ b/plugin/transition/run_plugin_legacy.go @@ -3,9 +3,9 @@ package plugin_transition import ( "os" - "code.cloudfoundry.org/cli/cf/cmd" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/cf/cmd" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/util/configv3" ) func RunPlugin(plugin configv3.Plugin, _ command.UI) error { diff --git a/resources/application_resource.go b/resources/application_resource.go index b9794bb81f..4c4c8f283c 100644 --- a/resources/application_resource.go +++ b/resources/application_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // Application represents a Cloud Controller V3 Application. diff --git a/resources/build_resource.go b/resources/build_resource.go index e190de90a6..47c4c72762 100644 --- a/resources/build_resource.go +++ b/resources/build_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // Build represent the process of staging an application package. diff --git a/resources/buildpack_resource.go b/resources/buildpack_resource.go index 04d29e271c..ef87b4994a 100644 --- a/resources/buildpack_resource.go +++ b/resources/buildpack_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/types" ) // Buildpack represents a Cloud Controller V3 buildpack. diff --git a/resources/deployment_resource.go b/resources/deployment_resource.go index 6e5b6cc71a..7a3a5d8ada 100644 --- a/resources/deployment_resource.go +++ b/resources/deployment_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) type Deployment struct { diff --git a/resources/domain_resource.go b/resources/domain_resource.go index 35dda7d0d7..591127ba0b 100644 --- a/resources/domain_resource.go +++ b/resources/domain_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/droplet_resource.go b/resources/droplet_resource.go index 27dc2574f3..1e92b32c1f 100644 --- a/resources/droplet_resource.go +++ b/resources/droplet_resource.go @@ -1,13 +1,13 @@ package resources import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // Droplet represents a Cloud Controller droplet's metadata. A droplet is a set of // compiled bits for a given application. type Droplet struct { - //Buildpacks are the detected buildpacks from the staging process. + // Buildpacks are the detected buildpacks from the staging process. Buildpacks []DropletBuildpack `json:"buildpacks,omitempty"` // CreatedAt is the timestamp that the Cloud Controller created the droplet. CreatedAt string `json:"created_at"` diff --git a/resources/environment_variables_resource.go b/resources/environment_variables_resource.go index 357641d226..0c293fcbfc 100644 --- a/resources/environment_variables_resource.go +++ b/resources/environment_variables_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/types" ) type EnvironmentVariables map[string]types.FilteredString diff --git a/resources/last_operation_resource_test.go b/resources/last_operation_resource_test.go index c4325206cc..b3cfd45d1b 100644 --- a/resources/last_operation_resource_test.go +++ b/resources/last_operation_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/resources/metadata_resource.go b/resources/metadata_resource.go index 414fe1427d..1a1f9571b8 100644 --- a/resources/metadata_resource.go +++ b/resources/metadata_resource.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/types" +import "code.cloudfoundry.org/cli/v8/types" type Metadata struct { Labels map[string]types.NullString `json:"labels,omitempty"` diff --git a/resources/package_resource.go b/resources/package_resource.go index c17e66a5fe..eeda9caa1d 100644 --- a/resources/package_resource.go +++ b/resources/package_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // Package represents a Cloud Controller V3 Package. diff --git a/resources/process_resource.go b/resources/process_resource.go index afbf20a09a..26ec270c69 100644 --- a/resources/process_resource.go +++ b/resources/process_resource.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/types" ) type Process struct { diff --git a/resources/process_resource_test.go b/resources/process_resource_test.go index ff4a36d978..f95beefcb5 100644 --- a/resources/process_resource_test.go +++ b/resources/process_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/resources/quota_resource.go b/resources/quota_resource.go index 8a896c1458..35ddc6e3f9 100644 --- a/resources/quota_resource.go +++ b/resources/quota_resource.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" ) type Quota struct { diff --git a/resources/quota_resource_test.go b/resources/quota_resource_test.go index be6c2aeb38..f7576d1186 100644 --- a/resources/quota_resource_test.go +++ b/resources/quota_resource_test.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/relationship_resource.go b/resources/relationship_resource.go index 322fe2a2b4..6bb5704271 100644 --- a/resources/relationship_resource.go +++ b/resources/relationship_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // Relationships represent associations between resources. Relationships is a diff --git a/resources/role_resource.go b/resources/role_resource.go index 48963678a6..70bd6899fb 100644 --- a/resources/role_resource.go +++ b/resources/role_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // IncludedUsers represent a set of users included on an API response. diff --git a/resources/route_binding.go b/resources/route_binding.go index cb71b99a02..5f73948db0 100644 --- a/resources/route_binding.go +++ b/resources/route_binding.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/route_binding_test.go b/resources/route_binding_test.go index 8817335942..52178510f6 100644 --- a/resources/route_binding_test.go +++ b/resources/route_binding_test.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/resources/route_resource.go b/resources/route_resource.go index 5bf31b49b2..e998b6bf35 100644 --- a/resources/route_resource.go +++ b/resources/route_resource.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller" ) type RouteDestinationApp struct { diff --git a/resources/security_group_resource_test.go b/resources/security_group_resource_test.go index b4e5e284f0..2008a05247 100644 --- a/resources/security_group_resource_test.go +++ b/resources/security_group_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/resources" . "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 024346b08d..6079a8d096 100644 --- a/resources/service_broker_resource_test.go +++ b/resources/service_broker_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_credential_binding_resource.go b/resources/service_credential_binding_resource.go index 0cd9bb988d..013cf66f06 100644 --- a/resources/service_credential_binding_resource.go +++ b/resources/service_credential_binding_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_credential_binding_resource_test.go b/resources/service_credential_binding_resource_test.go index bb7c0d2733..607569142b 100644 --- a/resources/service_credential_binding_resource_test.go +++ b/resources/service_credential_binding_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_instance_resource.go b/resources/service_instance_resource.go index 3259c3e1cf..b57a31ffca 100644 --- a/resources/service_instance_resource.go +++ b/resources/service_instance_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_instance_resource_test.go b/resources/service_instance_resource_test.go index 2f8beea737..52f1cbbc45 100644 --- a/resources/service_instance_resource_test.go +++ b/resources/service_instance_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_instance_usage_summary_resource_test.go b/resources/service_instance_usage_summary_resource_test.go index 0f2a3293a5..e441471eb0 100644 --- a/resources/service_instance_usage_summary_resource_test.go +++ b/resources/service_instance_usage_summary_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_offering_resource.go b/resources/service_offering_resource.go index dbdc8da59a..8a26192f9d 100644 --- a/resources/service_offering_resource.go +++ b/resources/service_offering_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_offering_resource_test.go b/resources/service_offering_resource_test.go index 8c699b1655..088f3b8bd6 100644 --- a/resources/service_offering_resource_test.go +++ b/resources/service_offering_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "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 fbe932baf3..6306b93209 100644 --- a/resources/service_plan_resource_test.go +++ b/resources/service_plan_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v8/types" . "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 7661b0f9a3..882c360911 100644 --- a/resources/service_plan_visibility_resource_test.go +++ b/resources/service_plan_visibility_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/shared_to_spaces_resource_test.go b/resources/shared_to_spaces_resource_test.go index bd976368c2..ce7cec617b 100644 --- a/resources/shared_to_spaces_resource_test.go +++ b/resources/shared_to_spaces_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v8/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/sidecar_resource.go b/resources/sidecar_resource.go index fc3c53fcea..415207e8d0 100644 --- a/resources/sidecar_resource.go +++ b/resources/sidecar_resource.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/types" +import "code.cloudfoundry.org/cli/v8/types" type Sidecar struct { GUID string `json:"guid"` diff --git a/resources/task_resource.go b/resources/task_resource.go index 62f1f500ed..7ba7f42b80 100644 --- a/resources/task_resource.go +++ b/resources/task_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) // Task represents a Cloud Controller V3 Task. diff --git a/types/filtered_interface_test.go b/types/filtered_interface_test.go index 09da42ec70..77367b4240 100644 --- a/types/filtered_interface_test.go +++ b/types/filtered_interface_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/filtered_string_test.go b/types/filtered_string_test.go index bb0dd23090..07ca30a2b6 100644 --- a/types/filtered_string_test.go +++ b/types/filtered_string_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/json_object_test.go b/types/json_object_test.go index 45390c1ef1..5d2a507ad4 100644 --- a/types/json_object_test.go +++ b/types/json_object_test.go @@ -3,7 +3,7 @@ package types_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_bool_test.go b/types/null_bool_test.go index 9e73bcbc91..adb4218f52 100644 --- a/types/null_bool_test.go +++ b/types/null_bool_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/types" . "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 f713e3d270..0554471da5 100644 --- a/types/null_bytesize_in_mb_test.go +++ b/types/null_bytesize_in_mb_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_int_test.go b/types/null_int_test.go index 455a9eec1d..76097bae1f 100644 --- a/types/null_int_test.go +++ b/types/null_int_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/types" "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/types/null_string_test.go b/types/null_string_test.go index ddeca89c2b..f1aa312e4e 100644 --- a/types/null_string_test.go +++ b/types/null_string_test.go @@ -3,7 +3,7 @@ package types_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_uint64_test.go b/types/null_uint64_test.go index 884a69d311..54dfa37a7f 100644 --- a/types/null_uint64_test.go +++ b/types/null_uint64_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v8/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/optional_boolean_test.go b/types/optional_boolean_test.go index 77ee762701..4eaec5080a 100644 --- a/types/optional_boolean_test.go +++ b/types/optional_boolean_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_object_test.go b/types/optional_object_test.go index 6ba1e53dd6..9338430d74 100644 --- a/types/optional_object_test.go +++ b/types/optional_object_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_string_slice_test.go b/types/optional_string_slice_test.go index 63e7ca0c39..932d966fdf 100644 --- a/types/optional_string_slice_test.go +++ b/types/optional_string_slice_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_string_test.go b/types/optional_string_test.go index 6539dd72b9..a0408ef83d 100644 --- a/types/optional_string_test.go +++ b/types/optional_string_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/batcher/batcher.go b/util/batcher/batcher.go index ad5ad47e8d..561e2c6539 100644 --- a/util/batcher/batcher.go +++ b/util/batcher/batcher.go @@ -1,6 +1,6 @@ package batcher -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" const BatchSize = 200 diff --git a/util/batcher/batcher_test.go b/util/batcher/batcher_test.go index bf7531a888..8fe4432bb6 100644 --- a/util/batcher/batcher_test.go +++ b/util/batcher/batcher_test.go @@ -3,10 +3,10 @@ package batcher_test import ( "fmt" - "code.cloudfoundry.org/cli/cf/errors" + "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/checksum_test.go b/util/checksum_test.go index 4dcade0594..68ff3bb62f 100644 --- a/util/checksum_test.go +++ b/util/checksum_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/util" + . "code.cloudfoundry.org/cli/v8/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/clissh/clisshfakes/fake_listener_factory.go b/util/clissh/clisshfakes/fake_listener_factory.go index dbd41adab1..f9414a3cc7 100644 --- a/util/clissh/clisshfakes/fake_listener_factory.go +++ b/util/clissh/clisshfakes/fake_listener_factory.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v8/util/clissh" ) type FakeListenerFactory struct { diff --git a/util/clissh/clisshfakes/fake_secure_client.go b/util/clissh/clisshfakes/fake_secure_client.go index f4643d9683..5dca1b7b4a 100644 --- a/util/clissh/clisshfakes/fake_secure_client.go +++ b/util/clissh/clisshfakes/fake_secure_client.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v8/util/clissh" "golang.org/x/crypto/ssh" ) diff --git a/util/clissh/clisshfakes/fake_secure_dialer.go b/util/clissh/clisshfakes/fake_secure_dialer.go index 18d537a544..6c799b145d 100644 --- a/util/clissh/clisshfakes/fake_secure_dialer.go +++ b/util/clissh/clisshfakes/fake_secure_dialer.go @@ -4,7 +4,7 @@ package clisshfakes import ( "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v8/util/clissh" "golang.org/x/crypto/ssh" ) diff --git a/util/clissh/clisshfakes/fake_secure_session.go b/util/clissh/clisshfakes/fake_secure_session.go index 9c9f57c01b..745fd6ae7a 100644 --- a/util/clissh/clisshfakes/fake_secure_session.go +++ b/util/clissh/clisshfakes/fake_secure_session.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v8/util/clissh" "golang.org/x/crypto/ssh" ) diff --git a/util/clissh/clisshfakes/fake_terminal_helper.go b/util/clissh/clisshfakes/fake_terminal_helper.go index 3128914d98..7e0e26ed5e 100644 --- a/util/clissh/clisshfakes/fake_terminal_helper.go +++ b/util/clissh/clisshfakes/fake_terminal_helper.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/util/clissh" + "code.cloudfoundry.org/cli/v8/util/clissh" "github.com/moby/term" ) diff --git a/util/clissh/ssh.go b/util/clissh/ssh.go index a6f32ce711..851d3b479e 100644 --- a/util/clissh/ssh.go +++ b/util/clissh/ssh.go @@ -17,8 +17,8 @@ import ( "syscall" "time" - "code.cloudfoundry.org/cli/cf/ssh/sigwinch" - "code.cloudfoundry.org/cli/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v8/cf/ssh/sigwinch" + "code.cloudfoundry.org/cli/v8/util/clissh/ssherror" "github.com/moby/term" 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 2451e2a39d..e98b12bfc3 100644 --- a/util/clissh/ssh_test.go +++ b/util/clissh/ssh_test.go @@ -17,9 +17,9 @@ import ( "syscall" "time" - . "code.cloudfoundry.org/cli/util/clissh" - "code.cloudfoundry.org/cli/util/clissh/clisshfakes" - "code.cloudfoundry.org/cli/util/clissh/ssherror" + . "code.cloudfoundry.org/cli/v8/util/clissh" + "code.cloudfoundry.org/cli/v8/util/clissh/clisshfakes" + "code.cloudfoundry.org/cli/v8/util/clissh/ssherror" "code.cloudfoundry.org/diego-ssh/server" fake_server "code.cloudfoundry.org/diego-ssh/server/fakes" "code.cloudfoundry.org/diego-ssh/test_helpers" diff --git a/util/command_parser/command_parser.go b/util/command_parser/command_parser.go index 5a847731b6..75ab630e73 100644 --- a/util/command_parser/command_parser.go +++ b/util/command_parser/command_parser.go @@ -7,13 +7,13 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/cf/cmd" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/cf/cmd" + "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" "github.com/jessevdk/go-flags" log "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" @@ -227,7 +227,7 @@ func (p *CommandParser) parse(args []string, commandList interface{}) (int, erro return 1, nil } else if err == ParseErr { fmt.Println() - p.parse([]string{"help", args[0]}, commandList) //nolint: errcheck + p.parse([]string{"help", args[0]}, commandList) // nolint: errcheck return 1, err } else if exitError, ok := err.(*ssh.ExitError); ok { return exitError.ExitStatus(), nil diff --git a/util/command_parser/command_parser_test.go b/util/command_parser/command_parser_test.go index e12c373529..ea30a0cf65 100644 --- a/util/command_parser/command_parser_test.go +++ b/util/command_parser/command_parser_test.go @@ -3,10 +3,10 @@ package command_parser_test import ( "io" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/util/command_parser" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/util/command_parser" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/command_parser/prevent_extra_args_v7.go b/util/command_parser/prevent_extra_args_v7.go index 1f1800dd2d..b1ca94816b 100644 --- a/util/command_parser/prevent_extra_args_v7.go +++ b/util/command_parser/prevent_extra_args_v7.go @@ -3,7 +3,7 @@ package command_parser import ( "strings" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) func preventExtraArgs(args []string) error { diff --git a/util/command_parser/unknown_command_error.go b/util/command_parser/unknown_command_error.go index 72374f060e..26e2881224 100644 --- a/util/command_parser/unknown_command_error.go +++ b/util/command_parser/unknown_command_error.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "code.cloudfoundry.org/cli/cf/util/spellcheck" - "code.cloudfoundry.org/cli/command/common" + "code.cloudfoundry.org/cli/v8/cf/util/spellcheck" + "code.cloudfoundry.org/cli/v8/command/common" ) type UnknownCommandError struct { diff --git a/util/configv3/color_test.go b/util/configv3/color_test.go index d3ae227e00..3c80305d8e 100644 --- a/util/configv3/color_test.go +++ b/util/configv3/color_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config.go b/util/configv3/config.go index c6afb35ff5..b25df4a14e 100644 --- a/util/configv3/config.go +++ b/util/configv3/config.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strconv" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/version" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserConfig diff --git a/util/configv3/config_suite_test.go b/util/configv3/config_suite_test.go index cb2416295a..ed141f6c4f 100644 --- a/util/configv3/config_suite_test.go +++ b/util/configv3/config_suite_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v8/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config_test.go b/util/configv3/config_test.go index 81418a9e98..2112ec5263 100644 --- a/util/configv3/config_test.go +++ b/util/configv3/config_test.go @@ -3,7 +3,7 @@ package configv3_test import ( "os" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" . "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 1d06e71acc..3bdea01088 100644 --- a/util/configv3/config_unix_test.go +++ b/util/configv3/config_unix_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "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 e478e4da39..75b3874b4a 100644 --- a/util/configv3/config_windows_test.go +++ b/util/configv3/config_windows_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/configv3fakes/fake_user_config.go b/util/configv3/configv3fakes/fake_user_config.go index 72198fbd8a..7436d9b5bb 100644 --- a/util/configv3/configv3fakes/fake_user_config.go +++ b/util/configv3/configv3fakes/fake_user_config.go @@ -4,7 +4,7 @@ package configv3fakes import ( "sync" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" ) type FakeUserConfig struct { diff --git a/util/configv3/default_user_config_test.go b/util/configv3/default_user_config_test.go index 496de4924d..b7d13ca6fe 100644 --- a/util/configv3/default_user_config_test.go +++ b/util/configv3/default_user_config_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/dynamic_user_config_test.go b/util/configv3/dynamic_user_config_test.go index e4d11aaa22..e094a51b52 100644 --- a/util/configv3/dynamic_user_config_test.go +++ b/util/configv3/dynamic_user_config_test.go @@ -3,8 +3,8 @@ package configv3_test import ( "errors" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/configv3/configv3fakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3/configv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/env_test.go b/util/configv3/env_test.go index 0f7a060f6c..d20dced7e8 100644 --- a/util/configv3/env_test.go +++ b/util/configv3/env_test.go @@ -3,7 +3,7 @@ package configv3_test import ( "time" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "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 236579b428..ef2a1a7b93 100644 --- a/util/configv3/json_config_test.go +++ b/util/configv3/json_config_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/k8s_test.go b/util/configv3/k8s_test.go index 83dbc839cc..342dbdfc51 100644 --- a/util/configv3/k8s_test.go +++ b/util/configv3/k8s_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" ) var _ = Describe("K8s", func() { diff --git a/util/configv3/kubernetes_user_config_test.go b/util/configv3/kubernetes_user_config_test.go index 4e74a2e344..518315e63c 100644 --- a/util/configv3/kubernetes_user_config_test.go +++ b/util/configv3/kubernetes_user_config_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/load_config.go b/util/configv3/load_config.go index 883b2cd31c..5eddefd8cd 100644 --- a/util/configv3/load_config.go +++ b/util/configv3/load_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/translatableerror" "golang.org/x/term" ) diff --git a/util/configv3/load_config_test.go b/util/configv3/load_config_test.go index b8321eea92..4971a65d13 100644 --- a/util/configv3/load_config_test.go +++ b/util/configv3/load_config_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/locale_test.go b/util/configv3/locale_test.go index 53d2c3b77c..69ed4b99c8 100644 --- a/util/configv3/locale_test.go +++ b/util/configv3/locale_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "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 4ed60b41e4..952e86d40a 100644 --- a/util/configv3/plugin_repository_test.go +++ b/util/configv3/plugin_repository_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/plugins_config.go b/util/configv3/plugins_config.go index a084b71f56..7f47e477b4 100644 --- a/util/configv3/plugins_config.go +++ b/util/configv3/plugins_config.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/util" ) const notApplicable = "N/A" diff --git a/util/configv3/plugins_config_test.go b/util/configv3/plugins_config_test.go index 7a5ce1a0d2..f320db663f 100644 --- a/util/configv3/plugins_config_test.go +++ b/util/configv3/plugins_config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "syscall" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/configv3" . "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 3b8760de7e..89536ded55 100644 --- a/util/configv3/write_config_test.go +++ b/util/configv3/write_config_test.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/util/configv3" "gopkg.in/yaml.v2" . "github.com/onsi/ginkgo/v2" diff --git a/util/download/downloader.go b/util/download/downloader.go index e779e84c6d..9d5679696f 100644 --- a/util/download/downloader.go +++ b/util/download/downloader.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/util" ) type Downloader struct { diff --git a/util/download/downloader_test.go b/util/download/downloader_test.go index 44dbfc550c..439c2c09bf 100644 --- a/util/download/downloader_test.go +++ b/util/download/downloader_test.go @@ -10,8 +10,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/util/download" - "code.cloudfoundry.org/cli/util/download/downloadfakes" + . "code.cloudfoundry.org/cli/v8/util/download" + "code.cloudfoundry.org/cli/v8/util/download/downloadfakes" ) var _ = Describe("Downloader", func() { diff --git a/util/download/downloadfakes/fake_httpclient.go b/util/download/downloadfakes/fake_httpclient.go index 1d37dec2fd..bc01e2da01 100644 --- a/util/download/downloadfakes/fake_httpclient.go +++ b/util/download/downloadfakes/fake_httpclient.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v8/util/download" ) type FakeHTTPClient struct { diff --git a/util/download/downloadfakes/fake_progress_bar.go b/util/download/downloadfakes/fake_progress_bar.go index c23e09c601..a37e0047be 100644 --- a/util/download/downloadfakes/fake_progress_bar.go +++ b/util/download/downloadfakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v8/util/download" pb "gopkg.in/cheggaaa/pb.v1" ) diff --git a/util/extract/extract.go b/util/extract/extract.go index 917960e654..25ff0435ad 100644 --- a/util/extract/extract.go +++ b/util/extract/extract.go @@ -4,7 +4,7 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/util/unique" + "code.cloudfoundry.org/cli/v8/util/unique" ) type appender func(string) diff --git a/util/extract/extract_test.go b/util/extract/extract_test.go index 035bbefc0e..b7fc5955c3 100644 --- a/util/extract/extract_test.go +++ b/util/extract/extract_test.go @@ -1,7 +1,7 @@ package extract_test import ( - "code.cloudfoundry.org/cli/util/extract" + "code.cloudfoundry.org/cli/v8/util/extract" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/architecture_test.go b/util/generic/architecture_test.go index 1dc8775d3d..1ae5bb0843 100644 --- a/util/generic/architecture_test.go +++ b/util/generic/architecture_test.go @@ -1,7 +1,7 @@ package generic_test import ( - . "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v8/util/generic" . "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 d6700b0456..620340c5d4 100644 --- a/util/generic/executable_filename_unix_test.go +++ b/util/generic/executable_filename_unix_test.go @@ -6,7 +6,7 @@ package generic_test import ( "path/filepath" - . "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v8/util/generic" . "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 95fd6a4b8d..82fc055e56 100644 --- a/util/generic/executable_filename_windows_test.go +++ b/util/generic/executable_filename_windows_test.go @@ -7,7 +7,7 @@ import ( "fmt" "path/filepath" - . "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/map_test.go b/util/generic/map_test.go index 9b51c82a3d..3be5bdc51c 100644 --- a/util/generic/map_test.go +++ b/util/generic/map_test.go @@ -1,7 +1,7 @@ package generic_test import ( - . "code.cloudfoundry.org/cli/util/generic" + . "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/slice_test.go b/util/generic/slice_test.go index 48403e9b3b..f4dfcec92a 100644 --- a/util/generic/slice_test.go +++ b/util/generic/slice_test.go @@ -1,7 +1,7 @@ package generic_test import ( - "code.cloudfoundry.org/cli/util/generic" + "code.cloudfoundry.org/cli/v8/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/lookuptable/name_from_guid_test.go b/util/lookuptable/name_from_guid_test.go index 5e07fe5456..d44a4f88a7 100644 --- a/util/lookuptable/name_from_guid_test.go +++ b/util/lookuptable/name_from_guid_test.go @@ -1,7 +1,7 @@ package lookuptable_test import ( - "code.cloudfoundry.org/cli/util/lookuptable" + "code.cloudfoundry.org/cli/v8/util/lookuptable" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/lookuptable/resource_from_guid.go b/util/lookuptable/resource_from_guid.go index 878a6b93bd..e8a42d7648 100644 --- a/util/lookuptable/resource_from_guid.go +++ b/util/lookuptable/resource_from_guid.go @@ -1,6 +1,6 @@ package lookuptable -import "code.cloudfoundry.org/cli/resources" +import "code.cloudfoundry.org/cli/v8/resources" func OrgFromGUID(orgs []resources.Organization) map[string]resources.Organization { result := make(map[string]resources.Organization) diff --git a/util/manifest/application.go b/util/manifest/application.go index b748c1753f..708f2d1622 100644 --- a/util/manifest/application.go +++ b/util/manifest/application.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" ) type Application struct { diff --git a/util/manifest/manifest_test.go b/util/manifest/manifest_test.go index fbbe5f419b..e43cf7bf1a 100644 --- a/util/manifest/manifest_test.go +++ b/util/manifest/manifest_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/types" - . "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v8/util/manifest" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" diff --git a/util/manifest/manifest_unix_test.go b/util/manifest/manifest_unix_test.go index e4a5db67e5..26476a80a6 100644 --- a/util/manifest/manifest_unix_test.go +++ b/util/manifest/manifest_unix_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v8/util/manifest" . "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 d425c41920..9c81592795 100644 --- a/util/manifest/manifest_windows_test.go +++ b/util/manifest/manifest_windows_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v8/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/application.go b/util/manifestparser/application.go index 2ce7d93670..6c0f5c8dc3 100644 --- a/util/manifestparser/application.go +++ b/util/manifestparser/application.go @@ -4,7 +4,7 @@ import ( "errors" "reflect" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) type Docker struct { diff --git a/util/manifestparser/application_test.go b/util/manifestparser/application_test.go index 3376f264db..9f52d3a16c 100644 --- a/util/manifestparser/application_test.go +++ b/util/manifestparser/application_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/util/manifestparser" "gopkg.in/yaml.v2" . "github.com/onsi/ginkgo/v2" diff --git a/util/manifestparser/locator_test.go b/util/manifestparser/locator_test.go index 120a28fa3c..74099d2531 100644 --- a/util/manifestparser/locator_test.go +++ b/util/manifestparser/locator_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/manifest_test.go b/util/manifestparser/manifest_test.go index 0a8fcde3db..855cc81488 100644 --- a/util/manifestparser/manifest_test.go +++ b/util/manifestparser/manifest_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" diff --git a/util/manifestparser/parser_test.go b/util/manifestparser/parser_test.go index 6085ec3d86..16e1071e52 100644 --- a/util/manifestparser/parser_test.go +++ b/util/manifestparser/parser_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/process.go b/util/manifestparser/process.go index 07d2c35bc5..39b9113e63 100644 --- a/util/manifestparser/process.go +++ b/util/manifestparser/process.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" ) type Process struct { diff --git a/util/manifestparser/process_test.go b/util/manifestparser/process_test.go index 618a793930..29ca131311 100644 --- a/util/manifestparser/process_test.go +++ b/util/manifestparser/process_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v8/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" diff --git a/util/panichandler/handler.go b/util/panichandler/handler.go index 73e0c1fadd..c8e1a1c317 100644 --- a/util/panichandler/handler.go +++ b/util/panichandler/handler.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/version" ) const maxStackSizeLimit = 1024 * 1024 diff --git a/util/plugin/plugin.go b/util/plugin/plugin.go index b184d598df..7ee637ae42 100644 --- a/util/plugin/plugin.go +++ b/util/plugin/plugin.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - plugin_transition "code.cloudfoundry.org/cli/plugin/transition" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + plugin_transition "code.cloudfoundry.org/cli/v8/plugin/transition" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v8/command/translatableerror" ) var ErrFailed = errors.New("command failed") diff --git a/util/railway/railway.go b/util/railway/railway.go index 1564004d39..04b8cc529d 100644 --- a/util/railway/railway.go +++ b/util/railway/railway.go @@ -1,6 +1,6 @@ package railway -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" type funcWithWarningsAndError = func() (ccv3.Warnings, error) diff --git a/util/railway/railway_test.go b/util/railway/railway_test.go index 3caea2dad7..9e8c0e80ac 100644 --- a/util/railway/railway_test.go +++ b/util/railway/railway_test.go @@ -3,8 +3,8 @@ package railway_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/railway" + "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v8/util/railway" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/randomword/generator_test.go b/util/randomword/generator_test.go index 944d4abe51..606f0455fd 100644 --- a/util/randomword/generator_test.go +++ b/util/randomword/generator_test.go @@ -1,7 +1,7 @@ package randomword_test import ( - . "code.cloudfoundry.org/cli/util/randomword" + . "code.cloudfoundry.org/cli/v8/util/randomword" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/sorting/alphabetic_test.go b/util/sorting/alphabetic_test.go index 14756731ac..53a57b8417 100644 --- a/util/sorting/alphabetic_test.go +++ b/util/sorting/alphabetic_test.go @@ -3,7 +3,7 @@ package sorting_test import ( "sort" - . "code.cloudfoundry.org/cli/util/sorting" + . "code.cloudfoundry.org/cli/v8/util/sorting" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/tls_test.go b/util/tls_test.go index 6ca055dda2..b3df44184c 100644 --- a/util/tls_test.go +++ b/util/tls_test.go @@ -5,7 +5,7 @@ import ( "crypto/x509" "encoding/pem" - . "code.cloudfoundry.org/cli/util" + . "code.cloudfoundry.org/cli/v8/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/ui/config.go b/util/ui/config.go index f17cd6e380..33145ced07 100644 --- a/util/ui/config.go +++ b/util/ui/config.go @@ -1,6 +1,6 @@ package ui -import "code.cloudfoundry.org/cli/util/configv3" +import "code.cloudfoundry.org/cli/v8/util/configv3" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/util/ui/i18n.go b/util/ui/i18n.go index 559a0e6db2..3aa2eb03b6 100644 --- a/util/ui/i18n.go +++ b/util/ui/i18n.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "code.cloudfoundry.org/cli/i18n/resources" + "code.cloudfoundry.org/cli/v8/i18n/resources" log "github.com/sirupsen/logrus" "golang.org/x/text/language" ) diff --git a/util/ui/i18n_test.go b/util/ui/i18n_test.go index 01f85f7d09..c7697ecf75 100644 --- a/util/ui/i18n_test.go +++ b/util/ui/i18n_test.go @@ -1,8 +1,8 @@ package ui_test import ( - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + . "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui/uifakes" . "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 66790b582c..da9796d320 100644 --- a/util/ui/log_message_test.go +++ b/util/ui/log_message_test.go @@ -3,9 +3,9 @@ package ui_test import ( "time" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui/uifakes" . "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 1234e003aa..387423c162 100644 --- a/util/ui/prompt_test.go +++ b/util/ui/prompt_test.go @@ -3,9 +3,9 @@ package ui_test import ( "regexp" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/request_logger_file_writer_test.go b/util/ui/request_logger_file_writer_test.go index 780497bec0..a7a3e190ef 100644 --- a/util/ui/request_logger_file_writer_test.go +++ b/util/ui/request_logger_file_writer_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/request_logger_terminal_display_test.go b/util/ui/request_logger_terminal_display_test.go index 77b780954f..5159b2ef1c 100644 --- a/util/ui/request_logger_terminal_display_test.go +++ b/util/ui/request_logger_terminal_display_test.go @@ -5,7 +5,7 @@ import ( "regexp" "time" - . "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/sanitize_json_test.go b/util/ui/sanitize_json_test.go index 82c48558f6..5511ae3b0c 100644 --- a/util/ui/sanitize_json_test.go +++ b/util/ui/sanitize_json_test.go @@ -3,7 +3,7 @@ package ui_test import ( "strings" - . "code.cloudfoundry.org/cli/util/ui" + . "code.cloudfoundry.org/cli/v8/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/table_test.go b/util/ui/table_test.go index aeef5fe957..abfb7721cf 100644 --- a/util/ui/table_test.go +++ b/util/ui/table_test.go @@ -3,9 +3,9 @@ package ui_test import ( "strings" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui.go b/util/ui/ui.go index 435dc4da50..53f9ffa8a5 100644 --- a/util/ui/ui.go +++ b/util/ui/ui.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v8/util/configv3" "github.com/fatih/color" runewidth "github.com/mattn/go-runewidth" "github.com/vito/go-interact/interact" diff --git a/util/ui/ui_for_app_test.go b/util/ui/ui_for_app_test.go index 7051f80769..54779afba2 100644 --- a/util/ui/ui_for_app_test.go +++ b/util/ui/ui_for_app_test.go @@ -1,9 +1,9 @@ package ui_test import ( - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui_for_push.go b/util/ui/ui_for_push.go index 1cffd9deb5..2d84d075f1 100644 --- a/util/ui/ui_for_push.go +++ b/util/ui/ui_for_push.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v8/types" "github.com/fatih/color" ) diff --git a/util/ui/ui_for_push_test.go b/util/ui/ui_for_push_test.go index 92738b8b40..d686cdeb5a 100644 --- a/util/ui/ui_for_push_test.go +++ b/util/ui/ui_for_push_test.go @@ -3,10 +3,10 @@ package ui_test import ( "regexp" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui_test.go b/util/ui/ui_test.go index 67fb070dc8..801ea9cc92 100644 --- a/util/ui/ui_test.go +++ b/util/ui/ui_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/command/translatableerror/translatableerrorfakes" - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v8/command/translatableerror/translatableerrorfakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui/uifakes" . "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 f33445c1a6..8570f9f836 100644 --- a/util/ui/ui_v7_test.go +++ b/util/ui/ui_v7_test.go @@ -1,9 +1,9 @@ package ui_test import ( - "code.cloudfoundry.org/cli/util/configv3" - . "code.cloudfoundry.org/cli/util/ui" - "code.cloudfoundry.org/cli/util/ui/uifakes" + "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/uifakes/fake_config.go b/util/ui/uifakes/fake_config.go index a4cacace19..b4844f0d96 100644 --- a/util/ui/uifakes/fake_config.go +++ b/util/ui/uifakes/fake_config.go @@ -4,8 +4,8 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v8/util/ui" ) type FakeConfig struct { diff --git a/util/ui/uifakes/fake_exiter.go b/util/ui/uifakes/fake_exiter.go index ce8d58b6e4..ce558bdbef 100644 --- a/util/ui/uifakes/fake_exiter.go +++ b/util/ui/uifakes/fake_exiter.go @@ -4,7 +4,7 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" ) type FakeExiter struct { diff --git a/util/ui/uifakes/fake_interactor.go b/util/ui/uifakes/fake_interactor.go index 55cc9a8a9c..2c86eaa9e2 100644 --- a/util/ui/uifakes/fake_interactor.go +++ b/util/ui/uifakes/fake_interactor.go @@ -4,7 +4,7 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" "github.com/vito/go-interact/interact" ) diff --git a/util/ui/uifakes/fake_log_message.go b/util/ui/uifakes/fake_log_message.go index ec1f175288..3e05a8b6b5 100644 --- a/util/ui/uifakes/fake_log_message.go +++ b/util/ui/uifakes/fake_log_message.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" ) type FakeLogMessage struct { diff --git a/util/ui/uifakes/fake_resolver.go b/util/ui/uifakes/fake_resolver.go index 0bd677edbf..e92be1e891 100644 --- a/util/ui/uifakes/fake_resolver.go +++ b/util/ui/uifakes/fake_resolver.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v8/util/ui" ) type FakeResolver struct { diff --git a/util/unique/string_slice_test.go b/util/unique/string_slice_test.go index acab41a0ee..34d6ec71de 100644 --- a/util/unique/string_slice_test.go +++ b/util/unique/string_slice_test.go @@ -1,7 +1,7 @@ package unique_test import ( - "code.cloudfoundry.org/cli/util/unique" + "code.cloudfoundry.org/cli/v8/util/unique" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/url_test.go b/util/url_test.go index 2a4cf89d2e..811a06ef61 100644 --- a/util/url_test.go +++ b/util/url_test.go @@ -1,7 +1,7 @@ package util_test import ( - . "code.cloudfoundry.org/cli/util" + . "code.cloudfoundry.org/cli/v8/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/utilfakes/fake_sha1checksum.go b/util/utilfakes/fake_sha1checksum.go index b26eeb24fd..436c48ef65 100644 --- a/util/utilfakes/fake_sha1checksum.go +++ b/util/utilfakes/fake_sha1checksum.go @@ -4,7 +4,7 @@ package utilfakes import ( "sync" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v8/util" ) type FakeSha1Checksum struct { diff --git a/version/version_test.go b/version/version_test.go index 2d1c333740..f1a65d9c04 100644 --- a/version/version_test.go +++ b/version/version_test.go @@ -1,7 +1,7 @@ package version_test import ( - "code.cloudfoundry.org/cli/version" + "code.cloudfoundry.org/cli/v8/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) From 7d96527e6a3203ca7aa0b277f25bcdf853e530ab Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:19:32 +0200 Subject: [PATCH 02/19] support 4 character timezone abbreviations --- command/v7/shared/app_summary_displayer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/v7/shared/app_summary_displayer_test.go b/command/v7/shared/app_summary_displayer_test.go index a751cfb6d4..20bcf234d4 100644 --- a/command/v7/shared/app_summary_displayer_test.go +++ b/command/v7/shared/app_summary_displayer_test.go @@ -694,7 +694,7 @@ var _ = Describe("app summary displayer", func() { When("there is an active deployment", func() { var LastStatusChangeTimeString = "2024-07-29T17:32:29Z" - var dateTimeRegexPattern = `[a-zA-Z]{3}\s\d{2}\s[a-zA-Z]{3}\s\d{2}\:\d{2}\:\d{2}\s[A-Z]{3}\s\d{4}` + var dateTimeRegexPattern = `[a-zA-Z]{3}\s\d{2}\s[a-zA-Z]{3}\s\d{2}\:\d{2}\:\d{2}\s[A-Z]{3,4}\s\d{4}` var maxInFlightDefaultValue = 1 When("the deployment strategy is rolling", func() { From 7a9526f3595d4e77c56b3a2ef2730dc31c8292e0 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:52:25 +0200 Subject: [PATCH 03/19] have the fake config not null to return the legacy uaa client --- command/v7/shared/new_networking_client_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/v7/shared/new_networking_client_test.go b/command/v7/shared/new_networking_client_test.go index 60ebd1d74b..d1ec72d355 100644 --- a/command/v7/shared/new_networking_client_test.go +++ b/command/v7/shared/new_networking_client_test.go @@ -17,7 +17,7 @@ var _ = Describe("New Clients", func() { binaryName string fakeConfig *commandfakes.FakeConfig testUI *ui.UI - fakeUAAClient *uaa.Client + fakeUAAClient = &uaa.Client{} ) BeforeEach(func() { From 5c485a99f3a5348846aabc28ad7a9fb899bb3769 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:57:23 +0200 Subject: [PATCH 04/19] accommodate the extra config calls for the legacy uaa client init --- command/v7/shared/new_clients_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/command/v7/shared/new_clients_test.go b/command/v7/shared/new_clients_test.go index 751d101039..0ba13a69be 100644 --- a/command/v7/shared/new_clients_test.go +++ b/command/v7/shared/new_clients_test.go @@ -52,8 +52,8 @@ var _ = Describe("New Clients", func() { Expect(err).NotTo(HaveOccurred()) Expect(fakeConfig.TargetCallCount()).To(Equal(2)) - Expect(fakeConfig.DialTimeoutCallCount()).To(Equal(3)) - Expect(fakeConfig.SkipSSLValidationCallCount()).To(Equal(3)) + Expect(fakeConfig.DialTimeoutCallCount()).To(Equal(4)) + Expect(fakeConfig.SkipSSLValidationCallCount()).To(Equal(4)) }) }) From 698509cebfd86423b57db0929661fdfe10e8bf67 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Mon, 21 Oct 2024 12:02:15 +0200 Subject: [PATCH 05/19] upgrade module to v9 standard go version workflow --- README.md | 2 +- .../duplicate_service_error_test.go | 2 +- .../duplicate_service_plan_error_test.go | 2 +- actor/actionerror/enrich_api_errors.go | 2 +- actor/actionerror/enrich_api_errors_test.go | 4 +- .../package_not_found_in_app_error_test.go | 2 +- .../actionerror/route_not_found_error_test.go | 2 +- ...security_group_not_bound_to_space_error.go | 2 +- .../service_instance_type_error.go | 2 +- .../service_not_found_error_test.go | 2 +- .../service_offering_name_ambiguity_error.go | 2 +- .../service_plan_not_found_error_test.go | 2 +- .../actionerror/space_not_found_error_test.go | 2 +- actor/actionerror/user_not_found.go | 2 +- .../fake_cloud_controller_client.go | 34 +- .../fake_networking_client.go | 23 +- .../cloud_controller_client.go | 4 +- actor/cfnetworkingaction/policy.go | 12 +- actor/cfnetworkingaction/policy_test.go | 14 +- actor/pluginaction/checksum.go | 2 +- actor/pluginaction/checksum_test.go | 4 +- actor/pluginaction/config.go | 2 +- actor/pluginaction/install.go | 8 +- actor/pluginaction/install_test.go | 14 +- actor/pluginaction/install_unix_test.go | 6 +- actor/pluginaction/install_windows_test.go | 4 +- actor/pluginaction/list.go | 2 +- actor/pluginaction/list_test.go | 10 +- actor/pluginaction/plugin_client.go | 2 +- actor/pluginaction/plugin_info.go | 6 +- actor/pluginaction/plugin_info_test.go | 10 +- actor/pluginaction/plugin_repository.go | 4 +- actor/pluginaction/plugin_repository_test.go | 10 +- .../pluginactionfakes/fake_command_list.go | 16 +- .../pluginactionfakes/fake_config.go | 55 +-- .../pluginactionfakes/fake_plugin_client.go | 18 +- .../pluginactionfakes/fake_plugin_metadata.go | 11 +- .../fake_plugin_uninstaller.go | 9 +- actor/pluginaction/uninstall.go | 2 +- actor/pluginaction/uninstall_test.go | 8 +- actor/sharedaction/auth_test.go | 4 +- actor/sharedaction/check_target.go | 2 +- actor/sharedaction/check_target_test.go | 6 +- actor/sharedaction/help.go | 4 +- actor/sharedaction/help_test.go | 6 +- actor/sharedaction/is_org_targeted_test.go | 4 +- actor/sharedaction/is_space_targeted_test.go | 4 +- actor/sharedaction/logging_test.go | 4 +- actor/sharedaction/resource.go | 4 +- actor/sharedaction/resource_darwin_test.go | 4 +- actor/sharedaction/resource_linux_test.go | 4 +- actor/sharedaction/resource_test.go | 8 +- actor/sharedaction/resource_unix_test.go | 6 +- actor/sharedaction/resource_windows_test.go | 6 +- actor/sharedaction/secure_shell_client.go | 2 +- .../sharedactionfakes/fake_config.go | 65 ++-- .../fake_log_cache_client.go | 9 +- .../fake_secure_shell_client.go | 39 ++- actor/sharedaction/ssh.go | 2 +- actor/sharedaction/ssh_test.go | 6 +- actor/v7action/actor.go | 6 +- actor/v7action/application.go | 14 +- actor/v7action/application_feature.go | 4 +- actor/v7action/application_feature_test.go | 8 +- actor/v7action/application_manifest.go | 4 +- actor/v7action/application_manifest_test.go | 12 +- actor/v7action/application_summary.go | 10 +- actor/v7action/application_summary_test.go | 16 +- actor/v7action/application_test.go | 18 +- actor/v7action/auth.go | 8 +- actor/v7action/auth_test.go | 10 +- actor/v7action/build.go | 8 +- actor/v7action/build_test.go | 12 +- actor/v7action/buildpack.go | 10 +- actor/v7action/buildpack_test.go | 14 +- actor/v7action/buildpack_unix_test.go | 4 +- actor/v7action/buildpack_windows_test.go | 4 +- actor/v7action/cloud_controller_client.go | 8 +- actor/v7action/config.go | 2 +- actor/v7action/curl.go | 2 +- actor/v7action/curl_test.go | 6 +- actor/v7action/deployment.go | 8 +- actor/v7action/deployment_test.go | 14 +- actor/v7action/domain.go | 8 +- actor/v7action/domain_test.go | 12 +- actor/v7action/droplet.go | 8 +- actor/v7action/droplet_test.go | 14 +- actor/v7action/environment_variable.go | 10 +- actor/v7action/environment_variable_test.go | 14 +- actor/v7action/event.go | 4 +- actor/v7action/event_test.go | 8 +- actor/v7action/feature_flag.go | 6 +- actor/v7action/feature_flag_test.go | 12 +- actor/v7action/info.go | 2 +- actor/v7action/info_test.go | 8 +- actor/v7action/isolation_segment.go | 8 +- actor/v7action/isolation_segment_test.go | 12 +- actor/v7action/job.go | 4 +- actor/v7action/job_test.go | 10 +- actor/v7action/k8s_auth.go | 10 +- actor/v7action/k8s_auth_test.go | 12 +- actor/v7action/label.go | 6 +- actor/v7action/label_test.go | 14 +- actor/v7action/logging.go | 2 +- actor/v7action/logging_test.go | 12 +- actor/v7action/marketplace.go | 2 +- actor/v7action/marketplace_test.go | 8 +- actor/v7action/organization.go | 6 +- actor/v7action/organization_quota.go | 8 +- actor/v7action/organization_quota_test.go | 12 +- actor/v7action/organization_summary.go | 2 +- actor/v7action/organization_summary_test.go | 8 +- actor/v7action/organization_test.go | 10 +- actor/v7action/package.go | 10 +- actor/v7action/package_test.go | 14 +- actor/v7action/process.go | 8 +- actor/v7action/process_health_check.go | 2 +- actor/v7action/process_health_check_test.go | 12 +- actor/v7action/process_instance.go | 8 +- actor/v7action/process_instance_test.go | 12 +- actor/v7action/process_summary.go | 4 +- actor/v7action/process_summary_test.go | 6 +- actor/v7action/process_test.go | 16 +- actor/v7action/resource_match.go | 6 +- actor/v7action/resource_match_test.go | 12 +- actor/v7action/revisions.go | 10 +- actor/v7action/revisions_test.go | 12 +- actor/v7action/role.go | 10 +- actor/v7action/role_test.go | 14 +- actor/v7action/route.go | 20 +- actor/v7action/route_binding.go | 12 +- actor/v7action/route_binding_test.go | 18 +- actor/v7action/route_test.go | 16 +- actor/v7action/router_group.go | 6 +- actor/v7action/router_group_test.go | 10 +- actor/v7action/routing_client.go | 2 +- actor/v7action/security_group.go | 14 +- actor/v7action/security_group_test.go | 16 +- actor/v7action/service_access.go | 6 +- actor/v7action/service_access_test.go | 12 +- actor/v7action/service_app_binding.go | 12 +- actor/v7action/service_app_binding_test.go | 16 +- actor/v7action/service_broker.go | 8 +- actor/v7action/service_broker_test.go | 10 +- actor/v7action/service_instance.go | 14 +- actor/v7action/service_instance_details.go | 12 +- .../v7action/service_instance_details_test.go | 14 +- actor/v7action/service_instance_list.go | 14 +- actor/v7action/service_instance_list_test.go | 12 +- actor/v7action/service_instance_sharing.go | 8 +- .../v7action/service_instance_sharing_test.go | 14 +- actor/v7action/service_instance_test.go | 16 +- actor/v7action/service_key.go | 12 +- actor/v7action/service_key_test.go | 18 +- actor/v7action/service_offering.go | 8 +- actor/v7action/service_offering_test.go | 12 +- actor/v7action/service_plan.go | 6 +- actor/v7action/service_plan_test.go | 10 +- actor/v7action/shared_actor.go | 2 +- actor/v7action/space.go | 10 +- actor/v7action/space_feature.go | 2 +- actor/v7action/space_feature_test.go | 10 +- actor/v7action/space_manifest.go | 6 +- actor/v7action/space_manifest_test.go | 12 +- actor/v7action/space_quota.go | 6 +- actor/v7action/space_quota_test.go | 12 +- actor/v7action/space_test.go | 14 +- actor/v7action/ssh.go | 4 +- actor/v7action/ssh_actor.go | 2 +- actor/v7action/ssh_test.go | 12 +- actor/v7action/stack.go | 6 +- actor/v7action/stack_test.go | 10 +- actor/v7action/target.go | 4 +- actor/v7action/target_test.go | 8 +- actor/v7action/task.go | 10 +- actor/v7action/task_test.go | 14 +- actor/v7action/token_test.go | 8 +- actor/v7action/uaa_client.go | 4 +- actor/v7action/user.go | 8 +- actor/v7action/user_test.go | 14 +- actor/v7action/v7action_suite_test.go | 4 +- .../fake_cloud_controller_client.go | 10 +- actor/v7action/v7actionfakes/fake_config.go | 119 ++++--- .../v7action/v7actionfakes/fake_downloader.go | 9 +- .../fake_kubernetes_config_getter.go | 9 +- .../v7actionfakes/fake_manifest_parser.go | 16 +- .../v7actionfakes/fake_routing_client.go | 18 +- .../v7actionfakes/fake_shared_actor.go | 32 +- .../v7actionfakes/fake_simple_progress_bar.go | 12 +- actor/v7action/v7actionfakes/fake_sshactor.go | 11 +- .../v7action/v7actionfakes/fake_uaaclient.go | 83 +++-- .../v7action/v7actionfakes/fake_who_am_ier.go | 13 +- actor/v7action/version_test.go | 4 +- actor/v7pushaction/actor_test.go | 4 +- actor/v7pushaction/actualize_test.go | 10 +- .../create_bits_package_for_application.go | 10 +- ...reate_bits_package_for_application_test.go | 16 +- .../create_deployment_for_push_plan.go | 4 +- .../create_deployment_for_push_plan_test.go | 10 +- ...ate_docker_package_for_application_test.go | 10 +- .../create_droplet_for_application.go | 6 +- .../create_droplet_for_application_test.go | 12 +- actor/v7pushaction/create_push_plans.go | 6 +- actor/v7pushaction/create_push_plans_test.go | 10 +- .../v7pushaction/handle_app_name_override.go | 6 +- .../handle_app_name_override_test.go | 6 +- .../v7pushaction/handle_app_path_override.go | 4 +- .../handle_app_path_override_test.go | 8 +- .../handle_buildpacks_override.go | 4 +- .../handle_buildpacks_override_test.go | 6 +- .../handle_cnb_credentials_override.go | 4 +- .../handle_cnb_credentials_override_test.go | 4 +- .../handle_default_route_override.go | 2 +- .../handle_default_route_override_test.go | 4 +- actor/v7pushaction/handle_disk_override.go | 4 +- .../v7pushaction/handle_disk_override_test.go | 6 +- .../handle_docker_image_override.go | 4 +- .../handle_docker_image_override_test.go | 6 +- .../handle_docker_username_override.go | 4 +- .../handle_docker_username_override_test.go | 6 +- .../handle_droplet_path_override.go | 4 +- .../handle_droplet_path_override_test.go | 6 +- .../v7pushaction/handle_flag_override_func.go | 2 +- actor/v7pushaction/handle_flag_overrides.go | 2 +- .../handle_flag_overrides_test.go | 4 +- .../handle_health_check_endpoint_override.go | 6 +- ...dle_health_check_endpoint_override_test.go | 6 +- .../handle_health_check_timeout_override.go | 4 +- ...ndle_health_check_timeout_override_test.go | 6 +- .../handle_health_check_type_override.go | 6 +- .../handle_health_check_type_override_test.go | 8 +- .../v7pushaction/handle_instances_override.go | 4 +- .../handle_instances_override_test.go | 8 +- .../v7pushaction/handle_lifecycle_override.go | 4 +- .../handle_log_rate_limit_override.go | 4 +- .../handle_log_rate_limit_override_test.go | 6 +- actor/v7pushaction/handle_memory_override.go | 4 +- .../handle_memory_override_test.go | 6 +- .../v7pushaction/handle_no_route_override.go | 4 +- .../handle_no_route_override_test.go | 6 +- .../handle_random_route_override.go | 4 +- .../handle_random_route_override_test.go | 6 +- actor/v7pushaction/handle_stack_override.go | 4 +- .../handle_stack_override_test.go | 6 +- .../handle_start_command_override.go | 4 +- .../handle_start_command_override_test.go | 8 +- .../v7pushaction/handle_strategy_override.go | 4 +- .../handle_strategy_override_test.go | 8 +- actor/v7pushaction/handle_task_override.go | 4 +- .../v7pushaction/handle_task_override_test.go | 6 +- actor/v7pushaction/push_plan.go | 10 +- actor/v7pushaction/resource_match.go | 2 +- actor/v7pushaction/resource_match_test.go | 10 +- .../v7pushaction/restart_application_test.go | 10 +- actor/v7pushaction/sequence.go | 2 +- actor/v7pushaction/sequence_test.go | 10 +- ...et_default_bits_path_for_push_plan_test.go | 4 +- .../set_droplet_for_application_test.go | 8 +- .../setup_all_resources_for_push_plan.go | 4 +- .../setup_all_resources_for_push_plan_test.go | 8 +- ...up_deployment_information_for_push_plan.go | 2 +- ...ployment_information_for_push_plan_test.go | 4 +- .../setup_droplet_path_for_push_plan_test.go | 2 +- .../setup_no_start_for_push_plan_test.go | 2 +- .../setup_no_wait_for_push_plan_test.go | 2 +- .../setup_task_app_for_push_plan_test.go | 2 +- actor/v7pushaction/shared_actor.go | 2 +- .../stage_package_for_application_test.go | 8 +- actor/v7pushaction/stop_application.go | 2 +- actor/v7pushaction/stop_application_test.go | 10 +- actor/v7pushaction/v7_actor.go | 6 +- actor/v7pushaction/v7pushaction_suite_test.go | 4 +- .../v7pushactionfakes/fake_progress_bar.go | 9 +- .../v7pushactionfakes/fake_read_closer.go | 14 +- .../v7pushactionfakes/fake_shared_actor.go | 39 ++- .../v7pushactionfakes/fake_v7actor.go | 8 +- .../minimum_version_check_test.go | 2 +- .../ccerror/multi_error_test.go | 2 +- ...vice_offering_name_ambiguity_error_test.go | 2 +- .../service_offering_not_found_error_test.go | 2 +- api/cloudcontroller/ccerror/user_not_found.go | 2 +- .../v2_unexpected_response_error_test.go | 2 +- .../ccerror/v3_job_failed_error.go | 2 +- .../v3_unexpected_response_error_test.go | 2 +- api/cloudcontroller/ccv3/application.go | 6 +- .../ccv3/application_feature.go | 4 +- .../ccv3/application_feature_test.go | 6 +- api/cloudcontroller/ccv3/application_test.go | 14 +- api/cloudcontroller/ccv3/build.go | 4 +- api/cloudcontroller/ccv3/build_test.go | 8 +- api/cloudcontroller/ccv3/buildpack.go | 6 +- api/cloudcontroller/ccv3/buildpack_test.go | 20 +- api/cloudcontroller/ccv3/ccv3_suite_test.go | 4 +- .../ccv3/ccv3fakes/fake_clock.go | 9 +- .../ccv3/ccv3fakes/fake_connection_wrapper.go | 18 +- .../ccv3/ccv3fakes/fake_reader.go | 7 +- .../ccv3/ccv3fakes/fake_requester.go | 55 +-- api/cloudcontroller/ccv3/client.go | 2 +- api/cloudcontroller/ccv3/client_test.go | 4 +- .../ccv3/connection_wrapper.go | 2 +- api/cloudcontroller/ccv3/deployment.go | 4 +- api/cloudcontroller/ccv3/deployment_test.go | 8 +- api/cloudcontroller/ccv3/domain.go | 6 +- api/cloudcontroller/ccv3/domain_test.go | 8 +- api/cloudcontroller/ccv3/droplet.go | 8 +- api/cloudcontroller/ccv3/droplet_test.go | 18 +- api/cloudcontroller/ccv3/environment.go | 2 +- api/cloudcontroller/ccv3/environment_test.go | 4 +- .../ccv3/environment_variables.go | 6 +- .../ccv3/environment_variables_test.go | 8 +- api/cloudcontroller/ccv3/errors.go | 4 +- api/cloudcontroller/ccv3/errors_test.go | 4 +- api/cloudcontroller/ccv3/event.go | 4 +- api/cloudcontroller/ccv3/event_test.go | 4 +- api/cloudcontroller/ccv3/feature_flag.go | 4 +- api/cloudcontroller/ccv3/feature_flag_test.go | 6 +- .../ccv3/included_resources.go | 2 +- api/cloudcontroller/ccv3/info.go | 6 +- api/cloudcontroller/ccv3/info_test.go | 4 +- .../ccv3/internal/routing_test.go | 2 +- api/cloudcontroller/ccv3/isolation_segment.go | 4 +- .../ccv3/isolation_segment_test.go | 6 +- api/cloudcontroller/ccv3/job.go | 4 +- api/cloudcontroller/ccv3/job_test.go | 8 +- api/cloudcontroller/ccv3/job_url.go | 2 +- api/cloudcontroller/ccv3/job_url_test.go | 4 +- api/cloudcontroller/ccv3/manifest.go | 4 +- api/cloudcontroller/ccv3/manifest_test.go | 14 +- api/cloudcontroller/ccv3/metadata.go | 4 +- api/cloudcontroller/ccv3/metadata_test.go | 8 +- api/cloudcontroller/ccv3/organization.go | 4 +- .../ccv3/organization_quota.go | 4 +- .../ccv3/organization_quota_test.go | 8 +- api/cloudcontroller/ccv3/organization_test.go | 10 +- api/cloudcontroller/ccv3/package.go | 10 +- api/cloudcontroller/ccv3/package_test.go | 14 +- api/cloudcontroller/ccv3/paginate.go | 2 +- .../ccv3/paginated_resources_test.go | 8 +- api/cloudcontroller/ccv3/process.go | 6 +- api/cloudcontroller/ccv3/process_instance.go | 8 +- .../ccv3/process_instance_test.go | 8 +- api/cloudcontroller/ccv3/process_test.go | 10 +- api/cloudcontroller/ccv3/query_test.go | 2 +- api/cloudcontroller/ccv3/relationship.go | 4 +- api/cloudcontroller/ccv3/relationship_list.go | 4 +- .../ccv3/relationship_list_test.go | 6 +- api/cloudcontroller/ccv3/relationship_test.go | 6 +- api/cloudcontroller/ccv3/request.go | 4 +- api/cloudcontroller/ccv3/requester.go | 4 +- api/cloudcontroller/ccv3/requester_test.go | 14 +- api/cloudcontroller/ccv3/resource.go | 4 +- api/cloudcontroller/ccv3/resource_test.go | 4 +- api/cloudcontroller/ccv3/revisions.go | 4 +- api/cloudcontroller/ccv3/revisions_test.go | 10 +- api/cloudcontroller/ccv3/role.go | 4 +- api/cloudcontroller/ccv3/role_test.go | 8 +- api/cloudcontroller/ccv3/route.go | 4 +- api/cloudcontroller/ccv3/route_binding.go | 4 +- .../ccv3/route_binding_test.go | 10 +- api/cloudcontroller/ccv3/route_test.go | 8 +- api/cloudcontroller/ccv3/security_group.go | 4 +- .../ccv3/security_group_test.go | 10 +- api/cloudcontroller/ccv3/service_broker.go | 4 +- .../ccv3/service_broker_test.go | 8 +- .../ccv3/service_credential_binding.go | 6 +- .../ccv3/service_credential_binding_test.go | 12 +- api/cloudcontroller/ccv3/service_instance.go | 12 +- .../ccv3/service_instance_test.go | 12 +- api/cloudcontroller/ccv3/service_offering.go | 8 +- .../ccv3/service_offering_test.go | 10 +- api/cloudcontroller/ccv3/service_plan.go | 10 +- api/cloudcontroller/ccv3/service_plan_test.go | 10 +- .../ccv3/service_plan_visibility.go | 4 +- .../ccv3/service_plan_visibility_test.go | 6 +- api/cloudcontroller/ccv3/sidecar.go | 4 +- api/cloudcontroller/ccv3/sidecar_test.go | 8 +- api/cloudcontroller/ccv3/space.go | 4 +- api/cloudcontroller/ccv3/space_feature.go | 4 +- .../ccv3/space_feature_test.go | 4 +- api/cloudcontroller/ccv3/space_quota.go | 4 +- api/cloudcontroller/ccv3/space_quota_test.go | 8 +- api/cloudcontroller/ccv3/space_test.go | 12 +- api/cloudcontroller/ccv3/stack.go | 4 +- api/cloudcontroller/ccv3/stack_test.go | 6 +- api/cloudcontroller/ccv3/target_test.go | 6 +- api/cloudcontroller/ccv3/task.go | 4 +- api/cloudcontroller/ccv3/task_test.go | 8 +- api/cloudcontroller/ccv3/user.go | 4 +- api/cloudcontroller/ccv3/user_test.go | 6 +- .../ccv3/v2_formatted_resource.go | 2 +- .../ccv3/v2_formatted_resource_test.go | 2 +- .../cloud_controller_connection.go | 4 +- .../cloud_controller_connection_test.go | 4 +- .../cloudcontrollerfakes/fake_connection.go | 9 +- api/cloudcontroller/pipebomb.go | 2 +- api/cloudcontroller/uploads/upload.go | 2 +- api/cloudcontroller/wrapper/custom_wrapper.go | 2 +- .../wrapper/kubernetes_authentication.go | 8 +- .../wrapper/kubernetes_authentication_test.go | 12 +- api/cloudcontroller/wrapper/request_logger.go | 2 +- .../wrapper/request_logger_test.go | 8 +- api/cloudcontroller/wrapper/retry_request.go | 4 +- .../wrapper/retry_request_test.go | 8 +- .../wrapper/uaa_authentication.go | 4 +- .../wrapper/uaa_authentication_test.go | 14 +- .../fake_request_logger_output.go | 68 ++-- .../wrapper/wrapperfakes/fake_token_cache.go | 22 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 11 +- api/logcache/log_cache_client.go | 8 +- api/plugin/client_test.go | 4 +- api/plugin/download_plugin_test.go | 6 +- api/plugin/plugin_connection.go | 4 +- api/plugin/plugin_connection_test.go | 6 +- api/plugin/plugin_repository_test.go | 4 +- api/plugin/plugin_suite_test.go | 2 +- api/plugin/pluginfakes/fake_connection.go | 9 +- .../pluginfakes/fake_connection_wrapper.go | 16 +- api/plugin/pluginfakes/fake_proxy_reader.go | 15 +- api/plugin/wrapper/request_logger.go | 2 +- api/plugin/wrapper/request_logger_test.go | 8 +- api/plugin/wrapper/retry_request.go | 2 +- api/plugin/wrapper/retry_request_test.go | 8 +- .../fake_request_logger_output.go | 68 ++-- api/router/client.go | 2 +- api/router/router_connection.go | 6 +- api/router/router_group.go | 4 +- api/router/router_group_test.go | 6 +- api/router/router_suite_test.go | 2 +- api/router/routerfakes/fake_connection.go | 9 +- .../routerfakes/fake_connection_wrapper.go | 16 +- api/router/wrapper/error_wrapper.go | 4 +- api/router/wrapper/error_wrapper_test.go | 8 +- api/router/wrapper/request_logger.go | 2 +- api/router/wrapper/request_logger_test.go | 8 +- api/router/wrapper/uaa_authentication.go | 6 +- api/router/wrapper/uaa_authentication_test.go | 14 +- .../fake_request_logger_output.go | 68 ++-- .../wrapper/wrapperfakes/fake_token_cache.go | 22 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 11 +- api/shared/sharedfakes/fake_round_tripper.go | 7 +- api/shared/wrap_for_cf_on_k8s.go | 4 +- api/shared/wrap_for_cf_on_k8s_test.go | 10 +- api/uaa/auth.go | 4 +- api/uaa/auth_test.go | 6 +- api/uaa/client.go | 2 +- api/uaa/client_test.go | 4 +- api/uaa/error_converter_test.go | 4 +- api/uaa/info_test.go | 2 +- api/uaa/internal/routing_test.go | 2 +- .../noaabridgefakes/fake_token_cache.go | 15 +- .../noaabridgefakes/fake_uaaclient.go | 11 +- api/uaa/noaabridge/token_refresher.go | 2 +- api/uaa/noaabridge/token_refresher_test.go | 6 +- api/uaa/prompts_test.go | 6 +- api/uaa/refresh_token.go | 4 +- api/uaa/refresh_token_test.go | 6 +- api/uaa/request.go | 2 +- api/uaa/resources.go | 2 +- api/uaa/resources_test.go | 4 +- api/uaa/ssh.go | 2 +- api/uaa/ssh_test.go | 4 +- api/uaa/uaa_connection.go | 2 +- api/uaa/uaa_connection_test.go | 2 +- api/uaa/uaa_suite_test.go | 4 +- api/uaa/uaafakes/fake_config.go | 61 ++-- api/uaa/uaafakes/fake_connection.go | 9 +- api/uaa/uaafakes/fake_connection_wrapper.go | 16 +- api/uaa/user.go | 4 +- api/uaa/user_test.go | 6 +- api/uaa/version_test.go | 6 +- api/uaa/wrapper/request_logger.go | 2 +- api/uaa/wrapper/request_logger_test.go | 8 +- api/uaa/wrapper/retry_request.go | 2 +- api/uaa/wrapper/retry_request_test.go | 6 +- api/uaa/wrapper/uaa_authentication.go | 2 +- api/uaa/wrapper/uaa_authentication_test.go | 10 +- .../fake_request_logger_output.go | 68 ++-- .../wrapper/wrapperfakes/fake_token_cache.go | 22 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 11 +- cf/actors/actors_suite_test.go | 4 +- cf/actors/actorsfakes/fake_push_actor.go | 41 ++- cf/actors/actorsfakes/fake_route_actor.go | 60 ++-- cf/actors/actorsfakes/fake_service_actor.go | 11 +- .../actorsfakes/fake_service_plan_actor.go | 37 +- cf/actors/brokerbuilder/broker_builder.go | 6 +- .../brokerbuilder/broker_builder_test.go | 8 +- .../brokerbuilderfakes/fake_broker_builder.go | 39 ++- cf/actors/planbuilder/plan_builder.go | 6 +- cf/actors/planbuilder/plan_builder_test.go | 8 +- .../planbuilderfakes/fake_plan_builder.go | 53 +-- .../plugininstaller/plugin_downloader.go | 6 +- cf/actors/plugininstaller/plugin_installer.go | 10 +- .../plugin_installer_with_repo.go | 10 +- .../plugin_installer_without_repo.go | 4 +- .../fake_plugin_installer.go | 9 +- cf/actors/pluginrepo/plugin_repo.go | 4 +- .../pluginrepo/plugin_repo_suite_test.go | 4 +- cf/actors/pluginrepo/plugin_repo_test.go | 6 +- .../pluginrepofakes/fake_plugin_repo.go | 6 +- cf/actors/push.go | 10 +- cf/actors/push_test.go | 14 +- cf/actors/routes.go | 12 +- cf/actors/routes_test.go | 12 +- cf/actors/servicebuilder/service_builder.go | 6 +- .../servicebuilder/service_builder_test.go | 8 +- .../fake_service_builder.go | 102 +++--- cf/actors/services.go | 8 +- cf/actors/services_plans.go | 10 +- cf/actors/services_plans_test.go | 16 +- cf/actors/services_test.go | 12 +- cf/actors/userprint/plugin.go | 4 +- cf/actors/userprint/ui.go | 6 +- .../userprintfakes/fake_user_printer.go | 5 +- cf/api/api_suite_test.go | 4 +- .../apifakes/fake_app_summary_repository.go | 18 +- .../fake_buildpack_bits_repository.go | 18 +- cf/api/apifakes/fake_buildpack_repository.go | 53 +-- cf/api/apifakes/fake_client_repository.go | 9 +- cf/api/apifakes/fake_curl_repository.go | 9 +- cf/api/apifakes/fake_domain_repository.go | 67 ++-- cf/api/apifakes/fake_route_repository.go | 67 ++-- .../fake_route_service_binding_repository.go | 16 +- cf/api/apifakes/fake_routing_apirepository.go | 11 +- .../fake_service_auth_token_repository.go | 39 ++- .../fake_service_binding_repository.go | 25 +- .../fake_service_broker_repository.go | 53 +-- .../apifakes/fake_service_key_repository.go | 32 +- .../apifakes/fake_service_plan_repository.go | 25 +- ...fake_service_plan_visibility_repository.go | 32 +- cf/api/apifakes/fake_service_repository.go | 132 ++++---- .../fake_service_summary_repository.go | 11 +- ...er_provided_service_instance_repository.go | 25 +- cf/api/apifakes/fake_user_repository.go | 102 +++--- cf/api/apifakes/old_fake_app_summary_repo.go | 4 +- cf/api/apifakes/old_fake_auth_token_repo.go | 2 +- .../apifakes/old_fake_buildpack_bits_repo.go | 4 +- cf/api/apifakes/old_fake_buildpack_repo.go | 4 +- cf/api/apifakes/old_fake_cc_request.go | 2 +- cf/api/apifakes/old_fake_password_repo.go | 2 +- cf/api/apifakes/old_fake_service_key_repo.go | 2 +- cf/api/apifakes/old_fake_service_plan_repo.go | 2 +- .../apifakes/old_fake_service_summary_repo.go | 2 +- cf/api/app_summary.go | 6 +- cf/api/app_summary_test.go | 16 +- cf/api/appevents/app_events.go | 8 +- cf/api/appevents/app_events_suite_test.go | 4 +- cf/api/appevents/app_events_test.go | 16 +- .../fake_app_events_repository.go | 4 +- .../appeventsfakes/fake_repository.go | 11 +- cf/api/appfiles/app_files.go | 4 +- cf/api/appfiles/app_files_suite_test.go | 4 +- cf/api/appfiles/app_files_test.go | 16 +- .../fake_app_files_repository.go | 2 +- .../appfiles/appfilesfakes/fake_repository.go | 9 +- cf/api/appinstances/app_instances.go | 6 +- .../appinstances/app_instances_suite_test.go | 4 +- cf/api/appinstances/app_instances_test.go | 20 +- .../fake_app_instances_repository.go | 4 +- .../appinstancesfakes/fake_repository.go | 18 +- cf/api/applicationbits/application_bits.go | 8 +- .../application_bits_suite_test.go | 4 +- .../applicationbits/application_bits_test.go | 20 +- .../fake_application_bits_repository.go | 4 +- .../applicationbitsfakes/fake_repository.go | 18 +- cf/api/applications/applications.go | 12 +- .../applications/applications_suite_test.go | 4 +- cf/api/applications/applications_test.go | 26 +- .../applicationsfakes/fake_repository.go | 67 ++-- cf/api/authentication/authentication.go | 10 +- .../authentication_suite_test.go | 4 +- cf/api/authentication/authentication_test.go | 18 +- .../authenticationfakes/fake_repository.go | 45 +-- .../fake_token_refresher.go | 9 +- cf/api/buildpack_bits.go | 14 +- cf/api/buildpack_bits_test.go | 22 +- cf/api/buildpacks.go | 12 +- cf/api/buildpacks_test.go | 22 +- cf/api/clients.go | 10 +- cf/api/clients_test.go | 14 +- .../copy_application_source.go | 4 +- .../copy_application_source_suite_test.go | 4 +- .../copy_application_source_test.go | 18 +- .../fake_repository.go | 9 +- cf/api/curl.go | 8 +- cf/api/curl_test.go | 20 +- cf/api/domains.go | 12 +- cf/api/domains_test.go | 24 +- cf/api/endpoints.go | 4 +- cf/api/endpoints_test.go | 16 +- .../environment_variable_groups.go | 6 +- .../environment_variable_groups_suite_test.go | 4 +- .../environment_variable_groups_test.go | 14 +- .../fake_repository.go | 32 +- cf/api/featureflags/feature_flags.go | 6 +- .../featureflags/feature_flags_suite_test.go | 4 +- cf/api/featureflags/feature_flags_test.go | 20 +- .../fake_feature_flag_repository.go | 25 +- cf/api/logs/log_cache_message.go | 2 +- cf/api/logs/log_cache_message_test.go | 6 +- cf/api/logs/log_cache_repository.go | 4 +- cf/api/logs/log_cache_repository_test.go | 6 +- cf/api/logs/logsfakes/fake_color_logger.go | 23 +- cf/api/logs/logsfakes/fake_loggable.go | 23 +- cf/api/logs/logsfakes/fake_repository.go | 15 +- cf/api/organizations/organizations.go | 10 +- .../organizations/organizations_suite_test.go | 4 +- cf/api/organizations/organizations_test.go | 22 +- .../fake_organization_repository.go | 60 ++-- cf/api/password/password.go | 8 +- cf/api/password/password_suite_test.go | 4 +- cf/api/password/password_test.go | 16 +- .../password/passwordfakes/fake_repository.go | 9 +- cf/api/quotas/quotas.go | 10 +- cf/api/quotas/quotas_suite_test.go | 4 +- cf/api/quotas/quotas_test.go | 14 +- .../quotasfakes/fake_quota_repository.go | 46 +-- cf/api/repository_locator.go | 56 +-- cf/api/resources/applications.go | 2 +- cf/api/resources/applications_test.go | 4 +- cf/api/resources/auth_tokens.go | 2 +- cf/api/resources/buildpacks.go | 2 +- cf/api/resources/domains.go | 2 +- cf/api/resources/events.go | 6 +- cf/api/resources/events_test.go | 2 +- cf/api/resources/feature_flags.go | 2 +- cf/api/resources/organizations.go | 2 +- cf/api/resources/quotas.go | 2 +- cf/api/resources/quotas_test.go | 4 +- cf/api/resources/resources_test.go | 4 +- cf/api/resources/routes.go | 2 +- cf/api/resources/security_groups.go | 2 +- cf/api/resources/service_bindings.go | 2 +- cf/api/resources/service_brokers.go | 2 +- cf/api/resources/service_instances.go | 2 +- cf/api/resources/service_instances_test.go | 2 +- cf/api/resources/service_keys.go | 2 +- cf/api/resources/service_keys_test.go | 2 +- cf/api/resources/service_offerings.go | 2 +- cf/api/resources/service_plan_visibility.go | 2 +- cf/api/resources/service_plans.go | 2 +- cf/api/resources/space_quotas.go | 2 +- cf/api/resources/spaces.go | 2 +- cf/api/resources/stacks.go | 2 +- cf/api/resources/users.go | 2 +- cf/api/route_service_binding_repository.go | 4 +- .../route_service_binding_repository_test.go | 14 +- cf/api/routes.go | 10 +- cf/api/routes_test.go | 24 +- cf/api/routing_api.go | 6 +- cf/api/routing_api_test.go | 16 +- cf/api/securitygroups/defaults/defaults.go | 8 +- .../defaults/running/running.go | 8 +- .../defaults/running/running_suite_test.go | 4 +- .../defaults/running/running_test.go | 22 +- .../runningfakes/fake_security_groups_repo.go | 25 +- .../defaults/staging/staging.go | 8 +- .../defaults/staging/staging_suite_test.go | 4 +- .../defaults/staging/staging_test.go | 22 +- .../stagingfakes/fake_security_groups_repo.go | 25 +- cf/api/securitygroups/security_groups.go | 10 +- .../security_groups_suite_test.go | 4 +- cf/api/securitygroups/security_groups_test.go | 22 +- .../fake_security_group_repo.go | 39 ++- cf/api/securitygroups/spaces/space_binder.go | 6 +- .../spaces/space_binder_test.go | 18 +- .../fake_security_group_space_binder.go | 16 +- cf/api/securitygroups/spaces/suite_test.go | 4 +- cf/api/service_auth_tokens.go | 10 +- cf/api/service_auth_tokens_test.go | 24 +- cf/api/service_bindings.go | 8 +- cf/api/service_bindings_test.go | 18 +- cf/api/service_brokers.go | 10 +- cf/api/service_brokers_test.go | 20 +- cf/api/service_keys.go | 10 +- cf/api/service_keys_test.go | 18 +- cf/api/service_plan.go | 8 +- cf/api/service_plan_test.go | 20 +- cf/api/service_plan_visibility.go | 8 +- cf/api/service_plan_visibility_test.go | 20 +- cf/api/service_summary.go | 6 +- cf/api/service_summary_test.go | 16 +- cf/api/services.go | 10 +- cf/api/services_test.go | 26 +- cf/api/spacequotas/space_quotas.go | 10 +- cf/api/spacequotas/space_quotas_suite_test.go | 4 +- cf/api/spacequotas/space_quotas_test.go | 16 +- .../fake_space_quota_repository.go | 67 ++-- cf/api/spaces/spaces.go | 10 +- cf/api/spaces/spaces_suite_test.go | 4 +- cf/api/spaces/spaces_test.go | 22 +- .../spacesfakes/fake_space_repository.go | 60 ++-- cf/api/stacks/stacks.go | 12 +- cf/api/stacks/stacks_suite_test.go | 4 +- cf/api/stacks/stacks_test.go | 16 +- .../stacksfakes/fake_stack_repository.go | 25 +- cf/api/user_provided_service_instances.go | 6 +- .../user_provided_service_instances_test.go | 20 +- cf/api/users.go | 12 +- cf/api/users_test.go | 18 +- cf/appfiles/app_files.go | 2 +- cf/appfiles/app_files_suite_test.go | 4 +- cf/appfiles/app_files_test.go | 4 +- cf/appfiles/appfilesfakes/fake_app_files.go | 32 +- cf/appfiles/appfilesfakes/fake_cf_ignore.go | 9 +- cf/appfiles/appfilesfakes/fake_zipper.go | 30 +- cf/appfiles/cf_ignore.go | 2 +- cf/appfiles/cf_ignore_test.go | 2 +- cf/appfiles/zipper.go | 2 +- cf/appfiles/zipper_test.go | 2 +- cf/cmd/cmd.go | 30 +- cf/commandregistry/command.go | 4 +- .../commandregistryfakes/fake_command.go | 34 +- .../fake_random_word_generator.go | 9 +- cf/commandregistry/dependency.go | 36 +- cf/commandregistry/dependency_test.go | 4 +- .../fakecommand/fake_command1.go | 6 +- .../fakecommand/fake_command2.go | 6 +- .../fake_command_max_length_name.go | 6 +- cf/commandregistry/registry.go | 12 +- cf/commandregistry/registry_test.go | 8 +- cf/commands/api.go | 16 +- cf/commands/api_test.go | 22 +- cf/commands/application/app.go | 30 +- cf/commands/application/app_test.go | 40 +-- .../application/application_suite_test.go | 4 +- .../applicationfakes/fake_app_displayer.go | 8 +- .../applicationfakes/fake_displayer.go | 11 +- .../applicationfakes/fake_restarter.go | 45 +-- .../applicationfakes/fake_staging_watcher.go | 11 +- .../applicationfakes/fake_starter.go | 48 +-- .../applicationfakes/fake_stopper.go | 45 +-- cf/commands/application/apps.go | 24 +- cf/commands/application/apps_test.go | 28 +- cf/commands/application/copy_source.go | 24 +- cf/commands/application/copy_source_test.go | 36 +- cf/commands/application/delete.go | 18 +- cf/commands/application/delete_test.go | 24 +- cf/commands/application/disable_ssh.go | 16 +- cf/commands/application/disable_ssh_test.go | 22 +- cf/commands/application/enable_ssh.go | 16 +- cf/commands/application/enable_ssh_test.go | 22 +- cf/commands/application/env.go | 18 +- cf/commands/application/env_test.go | 24 +- cf/commands/application/events.go | 14 +- cf/commands/application/events_test.go | 26 +- cf/commands/application/files.go | 14 +- cf/commands/application/files_test.go | 26 +- cf/commands/application/get_health_check.go | 14 +- .../application/get_health_check_test.go | 22 +- cf/commands/application/logs.go | 18 +- cf/commands/application/logs_test.go | 26 +- cf/commands/application/push.go | 36 +- cf/commands/application/push_test.go | 50 +-- cf/commands/application/rename.go | 16 +- cf/commands/application/rename_test.go | 20 +- cf/commands/application/restage.go | 18 +- cf/commands/application/restage_test.go | 24 +- cf/commands/application/restart.go | 14 +- .../application/restart_app_instance.go | 14 +- .../application/restart_app_instance_test.go | 22 +- cf/commands/application/restart_test.go | 24 +- cf/commands/application/scale.go | 18 +- cf/commands/application/scale_test.go | 22 +- cf/commands/application/set_env.go | 18 +- cf/commands/application/set_env_test.go | 22 +- cf/commands/application/set_health_check.go | 18 +- .../application/set_health_check_test.go | 22 +- cf/commands/application/ssh.go | 22 +- cf/commands/application/ssh_enabled.go | 12 +- cf/commands/application/ssh_enabled_test.go | 20 +- cf/commands/application/ssh_test.go | 32 +- cf/commands/application/start.go | 22 +- cf/commands/application/start_test.go | 40 +-- cf/commands/application/stop.go | 18 +- cf/commands/application/stop_test.go | 24 +- cf/commands/application/unset_env.go | 18 +- cf/commands/application/unset_env_test.go | 22 +- cf/commands/auth.go | 16 +- cf/commands/auth_test.go | 22 +- cf/commands/buildpack/buildpack_suite_test.go | 4 +- cf/commands/buildpack/buildpacks.go | 14 +- cf/commands/buildpack/buildpacks_test.go | 22 +- cf/commands/buildpack/create_buildpack.go | 20 +- .../buildpack/create_buildpack_test.go | 20 +- cf/commands/buildpack/delete_buildpack.go | 16 +- .../buildpack/delete_buildpack_test.go | 18 +- cf/commands/buildpack/rename_buildpack.go | 12 +- .../buildpack/rename_buildpack_test.go | 18 +- cf/commands/buildpack/update_buildpack.go | 12 +- .../buildpack/update_buildpack_test.go | 18 +- cf/commands/commands_suite_test.go | 6 +- .../commandsfakes/fake_sshcode_getter.go | 43 +-- cf/commands/config.go | 12 +- cf/commands/config_test.go | 16 +- cf/commands/create_app_manifest.go | 24 +- cf/commands/create_app_manifest_test.go | 28 +- cf/commands/curl.go | 22 +- cf/commands/curl_test.go | 22 +- cf/commands/domain/create_domain.go | 14 +- cf/commands/domain/create_domain_test.go | 20 +- cf/commands/domain/create_shared_domain.go | 16 +- .../domain/create_shared_domain_test.go | 22 +- cf/commands/domain/delete_domain.go | 16 +- cf/commands/domain/delete_domain_test.go | 22 +- cf/commands/domain/delete_shared_domain.go | 16 +- .../domain/delete_shared_domain_test.go | 24 +- cf/commands/domain/domain_suite_test.go | 4 +- cf/commands/domain/domains.go | 16 +- cf/commands/domain/domains_test.go | 24 +- .../environmentvariablegroup_suite_test.go | 4 +- .../running_environment_variable_group.go | 16 +- ...running_environment_variable_group_test.go | 24 +- .../set_running_environment_variable_group.go | 16 +- ...running_environment_variable_group_test.go | 20 +- .../set_staging_environment_variable_group.go | 16 +- ...staging_environment_variable_group_test.go | 20 +- .../staging_environment_variable_group.go | 16 +- ...staging_environment_variable_group_test.go | 24 +- .../featureflag/disable_feature_flag.go | 14 +- .../featureflag/disable_feature_flag_test.go | 18 +- .../featureflag/enable_feature_flag.go | 14 +- .../featureflag/enable_feature_flag_test.go | 18 +- cf/commands/featureflag/feature_flag.go | 14 +- cf/commands/featureflag/feature_flag_test.go | 20 +- cf/commands/featureflag/feature_flags.go | 14 +- cf/commands/featureflag/feature_flags_test.go | 24 +- .../featureflag/featureflag_suite_test.go | 4 +- cf/commands/help.go | 16 +- cf/commands/help_test.go | 20 +- cf/commands/login.go | 28 +- cf/commands/login_test.go | 24 +- cf/commands/logout.go | 12 +- cf/commands/logout_test.go | 12 +- cf/commands/oauth_token.go | 16 +- cf/commands/oauth_token_test.go | 22 +- cf/commands/organization/create_org.go | 26 +- cf/commands/organization/create_org_test.go | 32 +- cf/commands/organization/delete_org.go | 18 +- cf/commands/organization/delete_org_test.go | 26 +- cf/commands/organization/org.go | 20 +- cf/commands/organization/org_test.go | 24 +- .../organization/organization_suite_test.go | 4 +- cf/commands/organization/orgs.go | 18 +- cf/commands/organization/orgs_test.go | 28 +- cf/commands/organization/rename_org.go | 14 +- cf/commands/organization/rename_org_test.go | 20 +- cf/commands/organization/set_quota.go | 14 +- cf/commands/organization/set_quota_test.go | 22 +- .../organization/share_private_domain.go | 16 +- .../organization/unshare_private_domain.go | 16 +- cf/commands/passwd.go | 16 +- cf/commands/passwd_test.go | 20 +- cf/commands/plugin/install_plugin.go | 26 +- cf/commands/plugin/install_plugin_test.go | 38 +-- cf/commands/plugin/plugin_suite_test.go | 8 +- cf/commands/plugin/plugins.go | 16 +- cf/commands/plugin/plugins_test.go | 20 +- cf/commands/plugin/uninstall_plugin.go | 14 +- cf/commands/plugin/uninstall_plugin_test.go | 16 +- cf/commands/pluginrepo/add_plugin_repo.go | 14 +- .../pluginrepo/add_plugin_repo_test.go | 18 +- cf/commands/pluginrepo/list_plugin_repos.go | 12 +- .../pluginrepo/list_plugin_repos_test.go | 16 +- .../pluginrepo/plugin_repo_suite_test.go | 6 +- cf/commands/pluginrepo/remove_plugin_repo.go | 12 +- .../pluginrepo/remove_plugin_repo_test.go | 16 +- cf/commands/pluginrepo/repo_plugins.go | 16 +- cf/commands/pluginrepo/repo_plugins_test.go | 20 +- cf/commands/quota/create_quota.go | 22 +- cf/commands/quota/create_quota_test.go | 26 +- cf/commands/quota/delete_quota.go | 16 +- cf/commands/quota/delete_quota_test.go | 24 +- cf/commands/quota/quota.go | 20 +- cf/commands/quota/quota_suite_test.go | 4 +- cf/commands/quota/quota_test.go | 22 +- cf/commands/quota/quotas.go | 20 +- cf/commands/quota/quotas_test.go | 30 +- cf/commands/quota/update_quota.go | 16 +- cf/commands/quota/update_quota_test.go | 28 +- cf/commands/route/check_route.go | 14 +- cf/commands/route/check_route_test.go | 22 +- cf/commands/route/create_route.go | 16 +- cf/commands/route/create_route_test.go | 20 +- cf/commands/route/delete_orphaned_routes.go | 16 +- .../route/delete_orphaned_routes_test.go | 26 +- cf/commands/route/delete_route.go | 18 +- cf/commands/route/delete_route_test.go | 24 +- cf/commands/route/map_route.go | 14 +- cf/commands/route/map_route_test.go | 24 +- cf/commands/route/route_suite_test.go | 4 +- cf/commands/route/routefakes/fake_creator.go | 11 +- .../routefakes/old_fake_route_creator.go | 10 +- cf/commands/route/routes.go | 18 +- cf/commands/route/routes_test.go | 26 +- cf/commands/route/unmap_route.go | 14 +- cf/commands/route/unmap_route_test.go | 22 +- cf/commands/routergroups/router_groups.go | 16 +- .../routergroups/router_groups_test.go | 24 +- .../routergroups/routergroups_suite_test.go | 4 +- .../bind_running_security_group.go | 16 +- .../bind_running_security_group_test.go | 24 +- .../securitygroup/bind_security_group.go | 22 +- .../securitygroup/bind_security_group_test.go | 30 +- .../bind_staging_security_group.go | 16 +- .../bind_staging_security_group_test.go | 24 +- .../securitygroup/create_security_group.go | 20 +- .../create_security_group_test.go | 22 +- .../securitygroup/delete_security_group.go | 16 +- .../delete_security_group_test.go | 24 +- .../securitygroup/running_security_groups.go | 14 +- .../running_security_groups_test.go | 22 +- cf/commands/securitygroup/security_group.go | 16 +- .../securitygroup/security_group_test.go | 24 +- cf/commands/securitygroup/security_groups.go | 18 +- .../securitygroup/security_groups_test.go | 28 +- .../securitygroup/staging_security_groups.go | 14 +- .../staging_security_groups_test.go | 22 +- cf/commands/securitygroup/suite_test.go | 4 +- .../unbind_running_security_group.go | 18 +- .../unbind_running_security_group_test.go | 26 +- .../securitygroup/unbind_security_group.go | 20 +- .../unbind_security_group_test.go | 28 +- .../unbind_staging_security_group.go | 18 +- .../unbind_staging_security_group_test.go | 26 +- .../securitygroup/update_security_group.go | 16 +- .../update_security_group_test.go | 24 +- cf/commands/service/bind_route_service.go | 18 +- .../service/bind_route_service_test.go | 28 +- cf/commands/service/bind_service.go | 22 +- cf/commands/service/bind_service_test.go | 22 +- cf/commands/service/create_service.go | 24 +- cf/commands/service/create_service_test.go | 24 +- .../service/create_user_provided_service.go | 20 +- .../create_user_provided_service_test.go | 20 +- cf/commands/service/delete_service.go | 16 +- cf/commands/service/delete_service_test.go | 22 +- cf/commands/service/marketplace.go | 18 +- cf/commands/service/marketplace_test.go | 24 +- .../service/migrate_service_instances.go | 22 +- .../service/migrate_service_instances_test.go | 22 +- cf/commands/service/purge_service_instance.go | 14 +- .../service/purge_service_instance_test.go | 24 +- cf/commands/service/purge_service_offering.go | 18 +- .../service/purge_service_offering_test.go | 28 +- cf/commands/service/rename_service.go | 18 +- cf/commands/service/rename_service_test.go | 22 +- cf/commands/service/service.go | 16 +- cf/commands/service/service_suite_test.go | 4 +- cf/commands/service/service_test.go | 22 +- .../service/servicefakes/fake_app_binder.go | 8 +- .../service/servicefakes/fake_binder.go | 11 +- .../fake_route_service_unbinder.go | 11 +- cf/commands/service/services.go | 18 +- cf/commands/service/services_test.go | 34 +- cf/commands/service/unbind_route_service.go | 18 +- .../service/unbind_route_service_test.go | 28 +- cf/commands/service/unbind_service.go | 14 +- cf/commands/service/unbind_service_test.go | 20 +- cf/commands/service/update_service.go | 22 +- cf/commands/service/update_service_test.go | 22 +- .../service/update_user_provided_service.go | 22 +- .../update_user_provided_service_test.go | 22 +- .../serviceaccess/disable_service_access.go | 16 +- .../disable_service_access_test.go | 20 +- .../serviceaccess/enable_service_access.go | 18 +- .../enable_service_access_test.go | 22 +- cf/commands/serviceaccess/service_access.go | 18 +- .../serviceaccess/service_access_test.go | 28 +- .../serviceaccess/serviceaccess_suite_test.go | 4 +- .../create_service_auth_token.go | 18 +- .../create_service_auth_token_test.go | 20 +- .../delete_service_auth_token.go | 20 +- .../delete_service_auth_token_test.go | 22 +- .../serviceauthtoken/service_auth_tokens.go | 16 +- .../service_auth_tokens_test.go | 26 +- .../serviceauthtoken_suite_test.go | 4 +- .../update_service_auth_token.go | 16 +- .../update_service_auth_token_test.go | 20 +- .../servicebroker/create_service_broker.go | 14 +- .../create_service_broker_test.go | 24 +- .../servicebroker/delete_service_broker.go | 16 +- .../delete_service_broker_test.go | 22 +- .../servicebroker/rename_service_broker.go | 14 +- .../rename_service_broker_test.go | 20 +- cf/commands/servicebroker/service_brokers.go | 16 +- .../servicebroker/service_brokers_test.go | 24 +- .../servicebroker/servicebroker_suite_test.go | 4 +- .../servicebroker/update_service_broker.go | 14 +- .../update_service_broker_test.go | 20 +- cf/commands/servicekey/create_service_key.go | 20 +- .../servicekey/create_service_key_test.go | 26 +- cf/commands/servicekey/delete_service_key.go | 18 +- .../servicekey/delete_service_key_test.go | 26 +- cf/commands/servicekey/service_key.go | 18 +- cf/commands/servicekey/service_key_test.go | 26 +- cf/commands/servicekey/service_keys.go | 16 +- cf/commands/servicekey/service_keys_test.go | 20 +- .../servicekey/servicekey_suite_test.go | 4 +- cf/commands/space/allow_space_ssh.go | 14 +- cf/commands/space/allow_space_ssh_test.go | 22 +- cf/commands/space/create_space.go | 28 +- cf/commands/space/create_space_test.go | 34 +- cf/commands/space/delete_space.go | 20 +- cf/commands/space/delete_space_test.go | 22 +- cf/commands/space/disallow_space_ssh.go | 14 +- cf/commands/space/disallow_space_ssh_test.go | 22 +- cf/commands/space/rename_space.go | 14 +- cf/commands/space/rename_space_test.go | 20 +- cf/commands/space/space.go | 22 +- cf/commands/space/space_ssh_allowed.go | 14 +- cf/commands/space/space_ssh_allowed_test.go | 14 +- cf/commands/space/space_suite_test.go | 4 +- cf/commands/space/space_test.go | 24 +- cf/commands/space/spaces.go | 18 +- cf/commands/space/spaces_test.go | 30 +- cf/commands/spacequota/create_space_quota.go | 22 +- .../spacequota/create_space_quota_test.go | 30 +- cf/commands/spacequota/delete_space_quota.go | 18 +- .../spacequota/delete_space_quota_test.go | 26 +- cf/commands/spacequota/set_space_quota.go | 16 +- .../spacequota/set_space_quota_test.go | 26 +- cf/commands/spacequota/space_quota.go | 16 +- cf/commands/spacequota/space_quota_test.go | 24 +- cf/commands/spacequota/space_quotas.go | 16 +- cf/commands/spacequota/space_quotas_test.go | 28 +- .../spacequota/spacequota_suite_test.go | 4 +- cf/commands/spacequota/unset_space_quota.go | 16 +- .../spacequota/unset_space_quota_test.go | 24 +- cf/commands/spacequota/update_space_quota.go | 16 +- .../spacequota/update_space_quota_test.go | 22 +- cf/commands/ssh_code.go | 16 +- cf/commands/ssh_code_test.go | 26 +- cf/commands/stack.go | 14 +- cf/commands/stack_test.go | 20 +- cf/commands/stacks.go | 14 +- cf/commands/stacks_test.go | 24 +- cf/commands/target.go | 20 +- cf/commands/target_test.go | 28 +- cf/commands/user/create_user.go | 18 +- cf/commands/user/create_user_test.go | 20 +- cf/commands/user/delete_user.go | 16 +- cf/commands/user/delete_user_test.go | 22 +- cf/commands/user/org_users.go | 20 +- cf/commands/user/org_users_test.go | 24 +- cf/commands/user/set_org_role.go | 18 +- cf/commands/user/set_org_role_test.go | 28 +- cf/commands/user/set_space_role.go | 22 +- cf/commands/user/set_space_role_test.go | 30 +- cf/commands/user/space_users.go | 22 +- cf/commands/user/space_users_test.go | 26 +- cf/commands/user/unset_org_role.go | 18 +- cf/commands/user/unset_org_role_test.go | 28 +- cf/commands/user/unset_space_role.go | 20 +- cf/commands/user/unset_space_role_test.go | 30 +- cf/commands/user/user_suite_test.go | 4 +- .../user/userfakes/fake_org_role_setter.go | 45 +-- .../user/userfakes/fake_space_role_setter.go | 45 +-- cf/commands/version.go | 14 +- cf/commands/version_test.go | 10 +- cf/commandsloader/commands_loader.go | 42 +-- cf/commandsloader/commands_loader_test.go | 4 +- .../config_disk_persistor_test.go | 2 +- .../configurationfakes/fake_data_interface.go | 16 +- .../configurationfakes/fake_persistor.go | 26 +- .../coreconfig/access_token_test.go | 2 +- .../coreconfig/api_config_refresher.go | 2 +- .../coreconfig/api_config_refresher_test.go | 8 +- cf/configuration/coreconfig/config_data.go | 4 +- .../coreconfig/config_data_test.go | 4 +- .../coreconfig/config_repository.go | 6 +- .../coreconfig/config_repository_test.go | 10 +- .../fake_endpoint_repository.go | 9 +- .../coreconfigfakes/fake_read_writer.go | 315 ++++++++++------- .../coreconfigfakes/fake_repository.go | 318 +++++++++++------- .../pluginconfig/plugin_config.go | 2 +- .../pluginconfig/plugin_config_test.go | 10 +- cf/configuration/pluginconfig/plugin_data.go | 2 +- .../fake_plugin_configuration.go | 29 +- cf/errors/access_denied_error.go | 2 +- cf/errors/ambiguous_model_error.go | 2 +- cf/errors/curl_http_error.go | 2 +- cf/errors/empty_dir_error.go | 2 +- cf/errors/errorsfakes/fake_httperror.go | 23 +- cf/errors/gateway_error.go | 2 +- cf/errors/http_error.go | 2 +- cf/errors/invalid_ssl_cert_error.go | 2 +- cf/errors/invalid_token_error.go | 2 +- cf/errors/model_already_exists_error.go | 2 +- cf/errors/model_not_found_error.go | 2 +- cf/errors/not_authorized_error.go | 2 +- cf/errors/service_association_error.go | 2 +- cf/errors/unbindable_service_error.go | 2 +- cf/flagcontext/flag_content_helper_test.go | 2 +- cf/flags/flag_constructor_test.go | 2 +- cf/flags/flags_test.go | 2 +- cf/flags/flags_usage_test.go | 2 +- cf/formatters/bools.go | 2 +- cf/formatters/bools_test.go | 2 +- cf/formatters/bytes.go | 2 +- cf/formatters/bytes_test.go | 2 +- cf/formatters/formatters_suite_test.go | 4 +- cf/formatters/memoryLimit_test.go | 2 +- cf/help/help.go | 14 +- cf/help/help_suite_test.go | 2 +- cf/help/help_test.go | 8 +- cf/help/template.go | 2 +- cf/i18n/i18n.go | 2 +- cf/i18n/locale.go | 4 +- cf/i18n/locale_test.go | 2 +- cf/manifest/generate_manifest.go | 4 +- cf/manifest/generate_manifest_test.go | 2 +- cf/manifest/manifest.go | 10 +- cf/manifest/manifest_disk_repository.go | 6 +- cf/manifest/manifest_disk_repository_test.go | 2 +- cf/manifest/manifest_suite_test.go | 4 +- cf/manifest/manifest_test.go | 6 +- cf/manifest/manifestfakes/fake_app.go | 54 +-- cf/manifest/manifestfakes/fake_repository.go | 9 +- cf/models/application_test.go | 2 +- cf/models/domain_test.go | 2 +- cf/models/route_summary_test.go | 2 +- cf/models/route_test.go | 2 +- cf/models/service_instance_test.go | 2 +- cf/models/service_plan_test.go | 2 +- cf/models/space_quota.go | 4 +- cf/net/cloud_controller_gateway.go | 8 +- cf/net/cloud_controller_gateway_test.go | 12 +- cf/net/gateway.go | 14 +- cf/net/gateway_test.go | 20 +- cf/net/http_client.go | 4 +- cf/net/http_client_test.go | 6 +- cf/net/net_suite_test.go | 4 +- cf/net/netfakes/fake_httpclient_interface.go | 22 +- .../netfakes/fake_request_dumper_interface.go | 8 +- cf/net/netfakes/fake_warning_producer.go | 9 +- cf/net/progress_reader.go | 4 +- cf/net/progress_reader_test.go | 4 +- cf/net/request_dumper.go | 8 +- cf/net/request_dumper_test.go | 4 +- cf/net/routing_api_gateway.go | 8 +- cf/net/routing_api_gateway_test.go | 12 +- cf/net/uaa_gateway.go | 8 +- cf/net/uaa_gateway_test.go | 12 +- cf/net/warnings_collector.go | 2 +- cf/net/warnings_collector_test.go | 6 +- cf/requirements/api_endpoint.go | 8 +- cf/requirements/api_endpoint_test.go | 6 +- cf/requirements/application.go | 4 +- cf/requirements/application_test.go | 8 +- cf/requirements/buildpack.go | 4 +- cf/requirements/buildpack_test.go | 6 +- .../config_refreshing_requirement.go | 2 +- .../config_refreshing_requirement_test.go | 4 +- cf/requirements/dea_application.go | 8 +- cf/requirements/dea_application_test.go | 6 +- cf/requirements/domain.go | 6 +- cf/requirements/domain_test.go | 12 +- cf/requirements/factory.go | 4 +- cf/requirements/login.go | 4 +- cf/requirements/login_test.go | 6 +- cf/requirements/max_api_version.go | 4 +- cf/requirements/max_api_version_test.go | 6 +- cf/requirements/min_api_version.go | 4 +- cf/requirements/min_api_version_test.go | 6 +- cf/requirements/number_arguments.go | 2 +- cf/requirements/number_arguments_test.go | 2 +- cf/requirements/organization.go | 4 +- cf/requirements/organization_test.go | 6 +- cf/requirements/requirements_suite_test.go | 4 +- cf/requirements/requirements_test.go | 4 +- .../fake_application_requirement.go | 18 +- .../fake_buildpack_requirement.go | 18 +- .../fake_config_refresher.go | 11 +- .../fake_deaapplication_requirement.go | 18 +- .../fake_domain_requirement.go | 18 +- .../requirementsfakes/fake_factory.go | 130 ++++--- .../fake_organization_requirement.go | 21 +- .../requirementsfakes/fake_requirement.go | 9 +- .../fake_service_instance_requirement.go | 18 +- .../fake_space_requirement.go | 21 +- .../fake_targeted_org_requirement.go | 18 +- .../fake_user_requirement.go | 18 +- cf/requirements/service_instance.go | 4 +- cf/requirements/service_instance_test.go | 8 +- cf/requirements/space.go | 4 +- cf/requirements/space_test.go | 6 +- cf/requirements/targeted_organization.go | 10 +- cf/requirements/targeted_organization_test.go | 8 +- cf/requirements/targeted_space.go | 8 +- cf/requirements/targeted_space_test.go | 8 +- cf/requirements/unsupported_legacy_flag.go | 2 +- .../unsupported_legacy_flag_test.go | 2 +- cf/requirements/usage_requirement.go | 2 +- cf/requirements/usage_requirement_test.go | 2 +- cf/requirements/user.go | 4 +- cf/requirements/user_test.go | 6 +- cf/ssh/options/ssh_options.go | 2 +- cf/ssh/options/ssh_options_test.go | 4 +- cf/ssh/ssh.go | 8 +- cf/ssh/ssh_test.go | 12 +- cf/ssh/sshfakes/fake_listener_factory.go | 9 +- cf/ssh/sshfakes/fake_secure_client.go | 37 +- cf/ssh/sshfakes/fake_secure_dialer.go | 9 +- cf/ssh/sshfakes/fake_secure_session.go | 65 ++-- cf/ssh/sshfakes/fake_secure_shell.go | 39 ++- cf/ssh/terminal/helper_test.go | 2 +- .../terminalfakes/fake_terminal_helper.go | 44 +-- cf/terminal/color_test.go | 2 +- cf/terminal/table_test.go | 4 +- cf/terminal/tee_printer_test.go | 4 +- cf/terminal/terminal_suite_test.go | 4 +- cf/terminal/terminalfakes/fake_ui.go | 84 +++-- cf/terminal/ui.go | 8 +- cf/terminal/ui_test.go | 24 +- cf/terminal/ui_unix.go | 2 +- cf/trace/combined_printer_test.go | 4 +- cf/trace/logger_provider.go | 2 +- cf/trace/logger_provider_test.go | 2 +- cf/trace/trace.go | 2 +- cf/trace/trace_suite_test.go | 4 +- cf/trace/trace_test.go | 2 +- cf/trace/tracefakes/fake_printer.go | 18 +- cf/uihelpers/tags_parser_test.go | 2 +- cf/uihelpers/ui.go | 6 +- cf/util/downloader/file_download.go | 2 +- cf/util/downloader/file_download_test.go | 2 +- cf/util/json/json_parser_test.go | 2 +- cf/util/spellcheck/spellcheck_test.go | 2 +- cf/util/testhelpers/commands/requirements.go | 2 +- cf/util/testhelpers/commands/runner.go | 8 +- .../testhelpers/configuration/access_token.go | 2 +- .../configuration/fake_config_persistance.go | 4 +- .../testhelpers/configuration/test_config.go | 4 +- cf/util/testhelpers/io/io_test.go | 2 +- .../matchers/all_requests_called_matcher.go | 2 +- .../matchers/be_in_display_order.go | 2 +- .../matchers/be_in_display_order_test.go | 2 +- .../matchers/contain_element_times_test.go | 2 +- .../contain_elements_in_order_test.go | 2 +- .../matchers/contain_substrings.go | 2 +- .../testhelpers/matchers/have_succeeded.go | 2 +- .../testhelpers/matchers/have_type_of_test.go | 2 +- .../matchers/match_func_name_test.go | 2 +- .../testhelpers/matchers/match_path_test.go | 2 +- .../matchers/passed_requirements.go | 2 +- .../rpcserver/rpcserverfakes/fake_handlers.go | 216 +++++++----- cf/util/testhelpers/rpcserver/server.go | 4 +- cf/util/testhelpers/terminal/ui.go | 4 +- cf/util/utilfakes/fake_sha1checksum.go | 2 +- command/api_version_warning.go | 4 +- command/api_version_warning_test.go | 10 +- command/commandfakes/fake_config.go | 4 +- command/commandfakes/fake_shared_actor.go | 44 +-- command/commandfakes/fake_ui.go | 11 +- command/common/command_list_v7.go | 4 +- command/common/command_list_v7_test.go | 2 +- command/common/commonfakes/fake_help_actor.go | 18 +- .../commonfakes/fake_install_plugin_actor.go | 78 +++-- command/common/help_command.go | 12 +- command/common/install_plugin_command.go | 20 +- command/common/install_plugin_command_test.go | 18 +- .../install_plugin_from_repo_command_test.go | 24 +- .../common/internal/help_all_display_test.go | 4 +- command/common/internal/help_display.go | 6 +- command/common/version_command.go | 2 +- command/common/version_command_test.go | 6 +- command/config.go | 2 +- command/flag/app_type_test.go | 2 +- command/flag/binding_name_test.go | 2 +- command/flag/buildpack.go | 2 +- command/flag/buildpack_test.go | 2 +- command/flag/bytes_with_unlimited.go | 2 +- command/flag/bytes_with_unlimited_test.go | 2 +- command/flag/color_test.go | 2 +- command/flag/command.go | 2 +- command/flag/command_test.go | 2 +- command/flag/credentials_or_json.go | 2 +- command/flag/credentials_or_json_test.go | 2 +- command/flag/deployment_strategy.go | 2 +- command/flag/deployment_strategy_test.go | 4 +- command/flag/docker_test.go | 2 +- command/flag/droplet_test.go | 2 +- command/flag/environment_variable_test.go | 2 +- command/flag/health_check_type.go | 2 +- command/flag/health_check_type_test.go | 4 +- ...h_check_type_with_deprecated_value_test.go | 2 +- command/flag/instances.go | 2 +- command/flag/instances_test.go | 4 +- command/flag/integer_limit.go | 2 +- command/flag/integer_limit_test.go | 2 +- command/flag/locale.go | 2 +- command/flag/locale_test.go | 2 +- command/flag/megabytes.go | 2 +- command/flag/megabytes_test.go | 2 +- command/flag/megabytes_with_unlimited.go | 2 +- command/flag/megabytes_with_unlimited_test.go | 2 +- command/flag/network_port_test.go | 2 +- command/flag/network_protocol_test.go | 2 +- command/flag/optional_string.go | 2 +- command/flag/optional_string_test.go | 2 +- command/flag/org_role_test.go | 2 +- command/flag/path.go | 4 +- command/flag/path_test.go | 4 +- command/flag/port.go | 2 +- command/flag/port_test.go | 4 +- command/flag/positive_integer_test.go | 2 +- command/flag/revision.go | 2 +- command/flag/revision_test.go | 4 +- command/flag/route_path_test.go | 2 +- command/flag/security_group_lifecycle_test.go | 2 +- command/flag/space_role_test.go | 2 +- command/flag/ssh_port_forwarding_test.go | 2 +- command/flag/tags.go | 2 +- command/flag/tags_test.go | 2 +- command/flag/timeout.go | 2 +- command/flag/timeout_test.go | 2 +- command/flag/trimmed_string_test.go | 2 +- command/minimum_version_check.go | 2 +- command/minimum_version_check_test.go | 6 +- command/plugin/add_plugin_repo_command.go | 10 +- .../plugin/add_plugin_repo_command_test.go | 10 +- command/plugin/list_plugin_repos_command.go | 4 +- .../pluginfakes/fake_add_plugin_repo_actor.go | 9 +- .../plugin/pluginfakes/fake_plugins_actor.go | 11 +- .../fake_uninstall_plugin_actor.go | 11 +- command/plugin/plugins_command.go | 12 +- command/plugin/plugins_command_test.go | 16 +- command/plugin/remove_plugin_repo_command.go | 6 +- command/plugin/repo_plugins_command.go | 4 +- command/plugin/shared/new_client.go | 6 +- command/plugin/shared/rpc.go | 8 +- command/plugin/uninstall_plugin_command.go | 12 +- .../plugin/uninstall_plugin_command_test.go | 14 +- .../convert_to_translatable_error.go | 14 +- .../convert_to_translatable_error_test.go | 16 +- ...nimum_cf_api_version_not_met_error_test.go | 2 +- .../minimum_cli_version_not_met_error_test.go | 2 +- ...imum_uaa_api_version_not_met_error_test.go | 2 +- .../missing_credential_error_test.go | 2 +- ...rvice_instance_not_shareable_error_test.go | 2 +- .../service_plan_not_found_error_test.go | 2 +- .../staging_timeout_error_test.go | 2 +- .../tip_decorator_error_test.go | 4 +- .../fake_translatable_error.go | 16 +- command/translatableerror/translate_test.go | 2 +- .../unauthorized_error_test.go | 2 +- command/ui.go | 2 +- command/v7/actor.go | 18 +- command/v7/add_network_policy_command.go | 14 +- command/v7/add_network_policy_command_test.go | 22 +- command/v7/allow_space_ssh_command.go | 4 +- command/v7/allow_space_ssh_command_test.go | 14 +- command/v7/api_command.go | 8 +- command/v7/api_command_test.go | 12 +- command/v7/app_command.go | 4 +- command/v7/app_command_test.go | 22 +- command/v7/apply_manifest_command.go | 14 +- command/v7/apply_manifest_command_test.go | 24 +- command/v7/apps_command.go | 4 +- command/v7/apps_command_test.go | 20 +- command/v7/auth_command.go | 12 +- command/v7/auth_command_test.go | 20 +- command/v7/base_command.go | 12 +- command/v7/bind_route_service_command.go | 10 +- command/v7/bind_route_service_command_test.go | 16 +- .../v7/bind_running_security_group_command.go | 4 +- ...ind_running_security_group_command_test.go | 16 +- command/v7/bind_security_group_command.go | 8 +- .../v7/bind_security_group_command_test.go | 20 +- command/v7/bind_service_command.go | 10 +- command/v7/bind_service_command_test.go | 16 +- .../v7/bind_staging_security_group_command.go | 4 +- ...ind_staging_security_group_command_test.go | 16 +- command/v7/buildpacks_command.go | 4 +- command/v7/buildpacks_command_test.go | 22 +- command/v7/cancel_deployment_command.go | 2 +- command/v7/cancel_deployment_command_test.go | 18 +- command/v7/check_route_command.go | 2 +- command/v7/check_route_command_test.go | 18 +- command/v7/config_command.go | 6 +- command/v7/config_command_test.go | 14 +- command/v7/continue_deployment_command.go | 4 +- .../v7/continue_deployment_command_test.go | 18 +- command/v7/copy_source_command.go | 16 +- command/v7/copy_source_command_test.go | 24 +- command/v7/create_app_command.go | 8 +- command/v7/create_app_command_test.go | 22 +- command/v7/create_app_manifest_command.go | 6 +- .../v7/create_app_manifest_command_test.go | 16 +- command/v7/create_buildpack_command.go | 16 +- command/v7/create_buildpack_command_test.go | 26 +- .../v7/create_isolation_segment_command.go | 6 +- .../create_isolation_segment_command_test.go | 16 +- command/v7/create_org_command.go | 4 +- command/v7/create_org_command_test.go | 22 +- command/v7/create_org_quota_command.go | 8 +- command/v7/create_org_quota_command_test.go | 18 +- command/v7/create_package_command.go | 12 +- command/v7/create_package_command_test.go | 22 +- command/v7/create_private_domain_command.go | 4 +- .../v7/create_private_domain_command_test.go | 16 +- command/v7/create_route_command.go | 4 +- command/v7/create_route_command_test.go | 18 +- command/v7/create_security_group_command.go | 6 +- .../v7/create_security_group_command_test.go | 18 +- command/v7/create_service_broker_command.go | 10 +- .../v7/create_service_broker_command_test.go | 16 +- command/v7/create_service_command.go | 10 +- command/v7/create_service_command_test.go | 18 +- command/v7/create_service_key_command.go | 10 +- command/v7/create_service_key_command_test.go | 16 +- command/v7/create_shared_domain_command.go | 2 +- .../v7/create_shared_domain_command_test.go | 16 +- command/v7/create_space_command.go | 10 +- command/v7/create_space_command_test.go | 20 +- command/v7/create_space_quota_command.go | 6 +- command/v7/create_space_quota_command_test.go | 20 +- command/v7/create_user_command.go | 8 +- command/v7/create_user_command_test.go | 20 +- .../create_user_provided_service_command.go | 8 +- ...eate_user_provided_service_command_test.go | 20 +- command/v7/curl_command.go | 4 +- command/v7/curl_command_test.go | 10 +- command/v7/delete_buildpack_command.go | 4 +- command/v7/delete_buildpack_command_test.go | 12 +- command/v7/delete_command.go | 4 +- command/v7/delete_command_test.go | 16 +- .../v7/delete_isolation_segment_command.go | 4 +- .../delete_isolation_segment_command_test.go | 14 +- command/v7/delete_org_command.go | 4 +- command/v7/delete_org_command_test.go | 14 +- command/v7/delete_org_quota_command.go | 4 +- command/v7/delete_org_quota_command_test.go | 16 +- .../v7/delete_orphaned_routes_command_test.go | 14 +- command/v7/delete_private_domain_command.go | 4 +- .../v7/delete_private_domain_command_test.go | 20 +- command/v7/delete_route_command.go | 4 +- command/v7/delete_route_command_test.go | 16 +- command/v7/delete_security_group_command.go | 4 +- .../v7/delete_security_group_command_test.go | 14 +- command/v7/delete_service_broker_command.go | 4 +- .../v7/delete_service_broker_command_test.go | 16 +- command/v7/delete_service_command.go | 6 +- command/v7/delete_service_command_test.go | 14 +- command/v7/delete_service_key_command.go | 8 +- command/v7/delete_service_key_command_test.go | 18 +- command/v7/delete_shared_domain_command.go | 6 +- .../v7/delete_shared_domain_command_test.go | 22 +- command/v7/delete_space_command.go | 4 +- command/v7/delete_space_command_test.go | 14 +- command/v7/delete_space_quota_command.go | 4 +- command/v7/delete_space_quota_command_test.go | 16 +- command/v7/delete_user_command.go | 4 +- command/v7/delete_user_command_test.go | 18 +- command/v7/disable_feature_flag_command.go | 2 +- .../v7/disable_feature_flag_command_test.go | 14 +- command/v7/disable_org_isolation_command.go | 2 +- .../v7/disable_org_isolation_command_test.go | 14 +- command/v7/disable_service_access_command.go | 2 +- .../v7/disable_service_access_command_test.go | 12 +- command/v7/disable_ssh_command.go | 2 +- command/v7/disable_ssh_command_test.go | 16 +- command/v7/disallow_space_ssh_command.go | 4 +- command/v7/disallow_space_ssh_command_test.go | 14 +- command/v7/docker_password_getter_test.go | 6 +- command/v7/domains_command.go | 6 +- command/v7/domains_command_test.go | 20 +- command/v7/download_droplet_command.go | 8 +- command/v7/download_droplet_command_test.go | 16 +- command/v7/droplets_command.go | 4 +- command/v7/droplets_command_test.go | 22 +- command/v7/enable_feature_flag_command.go | 2 +- .../v7/enable_feature_flag_command_test.go | 14 +- command/v7/enable_org_isolation_command.go | 2 +- .../v7/enable_org_isolation_command_test.go | 14 +- command/v7/enable_service_access_command.go | 6 +- .../v7/enable_service_access_command_test.go | 12 +- command/v7/enable_ssh_command.go | 2 +- command/v7/enable_ssh_command_test.go | 18 +- command/v7/env_command.go | 2 +- command/v7/env_command_test.go | 14 +- command/v7/events_command.go | 4 +- command/v7/events_command_test.go | 20 +- command/v7/feature_flag_command.go | 8 +- command/v7/feature_flag_command_test.go | 16 +- command/v7/feature_flags_command.go | 6 +- command/v7/feature_flags_command_test.go | 16 +- command/v7/get_health_check_command.go | 6 +- command/v7/get_health_check_command_test.go | 18 +- command/v7/isolation_segments_command.go | 2 +- command/v7/isolation_segments_command_test.go | 14 +- command/v7/label_updater.go | 10 +- command/v7/label_updater_test.go | 16 +- command/v7/labels_command.go | 10 +- command/v7/labels_command_test.go | 18 +- command/v7/login_command.go | 22 +- command/v7/login_command_test.go | 26 +- command/v7/logout_command.go | 8 +- command/v7/logout_command_test.go | 12 +- command/v7/logs_command.go | 12 +- command/v7/logs_command_test.go | 18 +- command/v7/map_route_command.go | 4 +- command/v7/map_route_command_test.go | 18 +- command/v7/marketplace_command.go | 8 +- command/v7/marketplace_command_test.go | 16 +- command/v7/move_route_command.go | 4 +- command/v7/move_route_command_test.go | 20 +- command/v7/network_policies_command.go | 8 +- command/v7/network_policies_command_test.go | 14 +- command/v7/oauth_token_command.go | 2 +- command/v7/oauth_token_command_test.go | 10 +- command/v7/org_command.go | 2 +- command/v7/org_command_test.go | 16 +- command/v7/org_quota_command.go | 6 +- command/v7/org_quota_command_test.go | 18 +- command/v7/org_quotas_command.go | 4 +- command/v7/org_quotas_command_test.go | 18 +- command/v7/org_users_command.go | 8 +- command/v7/org_users_command_test.go | 18 +- command/v7/orgs_command.go | 4 +- command/v7/orgs_command_test.go | 16 +- command/v7/packages_command.go | 4 +- command/v7/packages_command_test.go | 22 +- command/v7/passwd_command.go | 2 +- command/v7/passwd_command_test.go | 12 +- command/v7/purge_service_instance_command.go | 4 +- .../v7/purge_service_instance_command_test.go | 14 +- command/v7/purge_service_offering_command.go | 4 +- .../v7/purge_service_offering_command_test.go | 12 +- command/v7/push_command.go | 32 +- command/v7/push_command_test.go | 34 +- command/v7/remove_network_policy_command.go | 12 +- .../v7/remove_network_policy_command_test.go | 22 +- command/v7/rename_command.go | 2 +- command/v7/rename_command_test.go | 14 +- command/v7/rename_org_command.go | 2 +- command/v7/rename_org_command_test.go | 14 +- command/v7/rename_service_broker_command.go | 4 +- .../v7/rename_service_broker_command_test.go | 16 +- command/v7/rename_service_command.go | 6 +- command/v7/rename_service_command_test.go | 16 +- command/v7/rename_space_command.go | 2 +- command/v7/rename_space_command_test.go | 16 +- ...t_org_default_isolation_segment_command.go | 2 +- ..._default_isolation_segment_command_test.go | 16 +- .../reset_space_isolation_segment_command.go | 2 +- ...et_space_isolation_segment_command_test.go | 16 +- command/v7/restage_command.go | 16 +- command/v7/restage_command_test.go | 24 +- command/v7/restart_app_instance_command.go | 2 +- .../v7/restart_app_instance_command_test.go | 16 +- command/v7/restart_command.go | 14 +- command/v7/restart_command_test.go | 24 +- command/v7/revision_command.go | 4 +- command/v7/revision_command_test.go | 8 +- command/v7/revisions_command.go | 8 +- command/v7/revisions_command_test.go | 20 +- command/v7/rollback_command.go | 14 +- command/v7/rollback_command_test.go | 26 +- command/v7/route_command.go | 4 +- command/v7/route_command_test.go | 20 +- command/v7/router_groups_command.go | 4 +- command/v7/router_groups_command_test.go | 14 +- command/v7/routes_command.go | 6 +- command/v7/routes_command_test.go | 16 +- command/v7/run_task_command.go | 4 +- command/v7/run_task_command_test.go | 22 +- ...ning_environment_variable_group_command.go | 4 +- ...environment_variable_group_command_test.go | 14 +- command/v7/running_security_groups_command.go | 2 +- .../running_security_groups_command_test.go | 16 +- command/v7/scale_command.go | 14 +- command/v7/scale_command_test.go | 24 +- command/v7/security_group_command.go | 4 +- command/v7/security_group_command_test.go | 18 +- command/v7/security_groups_command.go | 2 +- command/v7/security_groups_command_test.go | 18 +- command/v7/service_access_command.go | 6 +- command/v7/service_access_command_test.go | 14 +- command/v7/service_brokers_command.go | 4 +- command/v7/service_brokers_command_test.go | 16 +- command/v7/service_command.go | 8 +- command/v7/service_command_test.go | 16 +- command/v7/service_key_command.go | 2 +- command/v7/service_key_command_test.go | 14 +- command/v7/service_keys_command.go | 6 +- command/v7/service_keys_command_test.go | 14 +- command/v7/services_command.go | 8 +- command/v7/services_command_test.go | 18 +- command/v7/set_droplet_command.go | 2 +- command/v7/set_droplet_command_test.go | 16 +- command/v7/set_env_command.go | 4 +- command/v7/set_env_command_test.go | 14 +- command/v7/set_health_check_command.go | 2 +- command/v7/set_health_check_command_test.go | 20 +- command/v7/set_label_command.go | 6 +- command/v7/set_label_command_test.go | 8 +- ...t_org_default_isolation_segment_command.go | 2 +- ..._default_isolation_segment_command_test.go | 18 +- command/v7/set_org_quota_command.go | 2 +- command/v7/set_org_quota_command_test.go | 20 +- command/v7/set_org_role_command.go | 10 +- command/v7/set_org_role_command_test.go | 26 +- ...ning_environment_variable_group_command.go | 8 +- ...environment_variable_group_command_test.go | 20 +- .../v7/set_space_isolation_segment_command.go | 2 +- ...et_space_isolation_segment_command_test.go | 16 +- command/v7/set_space_quota_command.go | 2 +- command/v7/set_space_quota_command_test.go | 22 +- command/v7/set_space_role_command.go | 10 +- command/v7/set_space_role_command_test.go | 26 +- ...ging_environment_variable_group_command.go | 8 +- ...environment_variable_group_command_test.go | 20 +- command/v7/share_private_domain_command.go | 2 +- .../v7/share_private_domain_command_test.go | 18 +- command/v7/share_route_command.go | 4 +- command/v7/share_route_command_test.go | 20 +- command/v7/share_service_command.go | 8 +- command/v7/share_service_command_test.go | 18 +- command/v7/shared/app_stager.go | 12 +- command/v7/shared/app_stager_test.go | 22 +- command/v7/shared/app_summary_displayer.go | 10 +- .../v7/shared/app_summary_displayer_test.go | 14 +- command/v7/shared/manifest_diff_displayer.go | 4 +- .../v7/shared/manifest_diff_displayer_test.go | 6 +- command/v7/shared/new_clients.go | 18 +- command/v7/shared/new_clients_test.go | 8 +- command/v7/shared/new_networking_client.go | 6 +- .../v7/shared/new_networking_client_test.go | 8 +- command/v7/shared/package_displayer.go | 2 +- command/v7/shared/quota_displayer.go | 8 +- command/v7/shared/result_waiter.go | 4 +- .../v7/shared/sharedfakes/fake_app_stager.go | 6 +- command/v7/shared/v3_poll_stage.go | 10 +- command/v7/shared/v3_poll_stage_test.go | 12 +- command/v7/shared/version_checker.go | 2 +- command/v7/shared/version_checker_test.go | 2 +- command/v7/space_command.go | 8 +- command/v7/space_command_test.go | 20 +- command/v7/space_quota_command.go | 6 +- command/v7/space_quota_command_test.go | 18 +- command/v7/space_quotas_command.go | 4 +- command/v7/space_quotas_command_test.go | 18 +- command/v7/space_ssh_allowed_command.go | 4 +- command/v7/space_ssh_allowed_command_test.go | 16 +- command/v7/space_users_command.go | 8 +- command/v7/space_users_command_test.go | 18 +- command/v7/spaces_command.go | 4 +- command/v7/spaces_command_test.go | 16 +- command/v7/ssh_code_command_test.go | 12 +- command/v7/ssh_command.go | 10 +- command/v7/ssh_command_test.go | 20 +- command/v7/ssh_enabled_command.go | 2 +- command/v7/ssh_enabled_command_test.go | 14 +- command/v7/stack_command.go | 4 +- command/v7/stack_command_test.go | 18 +- command/v7/stacks_command.go | 6 +- command/v7/stacks_command_test.go | 16 +- command/v7/stage_package_command.go | 14 +- command/v7/stage_package_command_test.go | 24 +- ...ging_environment_variable_group_command.go | 6 +- ...environment_variable_group_command_test.go | 14 +- command/v7/staging_security_groups_command.go | 2 +- .../staging_security_groups_command_test.go | 16 +- command/v7/start_command.go | 14 +- command/v7/start_command_test.go | 24 +- command/v7/stop_command.go | 2 +- command/v7/stop_command_test.go | 20 +- command/v7/target_command.go | 4 +- command/v7/target_command_test.go | 20 +- command/v7/tasks_command.go | 6 +- command/v7/tasks_command_test.go | 20 +- command/v7/terminate_task_command.go | 4 +- command/v7/terminate_task_command_test.go | 20 +- command/v7/unbind_route_service_command.go | 8 +- .../v7/unbind_route_service_command_test.go | 16 +- .../v7/unbind_running_group_command_test.go | 14 +- .../unbind_running_security_group_command.go | 6 +- command/v7/unbind_security_group.go | 8 +- command/v7/unbind_security_group_test.go | 16 +- command/v7/unbind_service_command.go | 8 +- command/v7/unbind_service_command_test.go | 14 +- .../unbind_staging_security_group_command.go | 6 +- ...ind_staging_security_group_command_test.go | 14 +- command/v7/unmap_route_command.go | 4 +- command/v7/unmap_route_command_test.go | 18 +- command/v7/unset_env_command.go | 4 +- command/v7/unset_env_command_test.go | 14 +- command/v7/unset_label_command.go | 6 +- command/v7/unset_label_command_test.go | 8 +- command/v7/unset_org_role_command.go | 4 +- command/v7/unset_org_role_command_test.go | 24 +- command/v7/unset_space_quota_command.go | 2 +- command/v7/unset_space_quota_command_test.go | 18 +- command/v7/unset_space_role_command.go | 4 +- command/v7/unset_space_role_command_test.go | 24 +- command/v7/unshare_private_domain_command.go | 2 +- .../v7/unshare_private_domain_command_test.go | 18 +- command/v7/unshare_route_command.go | 4 +- command/v7/unshare_route_command_test.go | 18 +- command/v7/unshare_service_command.go | 6 +- command/v7/unshare_service_command_test.go | 16 +- command/v7/update_buildpack_command.go | 20 +- command/v7/update_buildpack_command_test.go | 28 +- command/v7/update_destination_command.go | 4 +- command/v7/update_destination_command_test.go | 20 +- command/v7/update_org_quota_command.go | 6 +- command/v7/update_org_quota_command_test.go | 20 +- command/v7/update_security_group_command.go | 4 +- .../v7/update_security_group_command_test.go | 16 +- command/v7/update_service_broker_command.go | 6 +- .../v7/update_service_broker_command_test.go | 18 +- command/v7/update_service_command.go | 10 +- command/v7/update_service_command_test.go | 18 +- command/v7/update_space_quota_command.go | 6 +- command/v7/update_space_quota_command_test.go | 20 +- .../update_user_provided_service_command.go | 10 +- ...date_user_provided_service_command_test.go | 26 +- command/v7/upgrade_service_command.go | 8 +- command/v7/upgrade_service_command_test.go | 16 +- command/v7/v7fakes/fake_actor.go | 20 +- command/v7/v7fakes/fake_actor_reloader.go | 11 +- command/v7/v7fakes/fake_diff_displayer.go | 11 +- command/v7/v7fakes/fake_label_setter.go | 11 +- command/v7/v7fakes/fake_label_unsetter.go | 11 +- command/v7/v7fakes/fake_manifest_locator.go | 9 +- command/v7/v7fakes/fake_manifest_parser.go | 25 +- .../v7/v7fakes/fake_network_policies_actor.go | 18 +- command/v7/v7fakes/fake_networking_actor.go | 11 +- command/v7/v7fakes/fake_progress_bar.go | 15 +- command/v7/v7fakes/fake_push_actor.go | 29 +- .../fake_remove_network_policy_actor.go | 11 +- command/v7/v7fakes/fake_revisions_actor.go | 13 +- command/v7/v7fakes/fake_set_label_actor.go | 92 ++--- command/v7/v7fakes/fake_shared_sshactor.go | 11 +- command/v7/v7fakes/fake_v7actor_for_push.go | 43 +-- fixtures/plugins/alias_conflicts.go | 2 +- fixtures/plugins/call_core_cmd.go | 2 +- fixtures/plugins/empty_plugin.go | 2 +- fixtures/plugins/input.go | 2 +- fixtures/plugins/my_say.go | 2 +- fixtures/plugins/panics.go | 2 +- fixtures/plugins/test_1.go | 2 +- fixtures/plugins/test_2.go | 2 +- fixtures/plugins/test_with_help.go | 2 +- fixtures/plugins/test_with_orgs.go | 2 +- fixtures/plugins/test_with_orgs_short_name.go | 2 +- fixtures/plugins/test_with_push.go | 2 +- fixtures/plugins/test_with_push_short_name.go | 2 +- go.mod | 2 +- .../assets/configurable_plugin/test_plugin.go | 2 +- .../test_plugin_fails_uninstall.go | 2 +- integration/assets/hydrabroker/app/app.go | 2 +- integration/assets/hydrabroker/app/broker.go | 6 +- integration/assets/hydrabroker/app/config.go | 4 +- integration/assets/hydrabroker/app/helpers.go | 2 +- .../database/database_suite_test.go | 3 + .../hydrabroker/database/database_test.go | 4 +- .../integrationtest_suite_test.go | 3 + .../integrationtest/integrationtest_test.go | 9 +- integration/assets/hydrabroker/main.go | 2 +- .../assets/hydrabroker/store/bindings.go | 4 +- .../assets/hydrabroker/store/bindings_test.go | 8 +- .../assets/hydrabroker/store/brokers.go | 4 +- .../assets/hydrabroker/store/brokers_test.go | 7 +- .../assets/hydrabroker/store/instances.go | 6 +- .../hydrabroker/store/instances_test.go | 9 +- integration/assets/hydrabroker/store/store.go | 2 +- .../hydrabroker/store/store_suite_test.go | 3 + integration/assets/test_plugin/test_plugin.go | 2 +- .../test_plugin_fails_metadata/test_plugin.go | 2 +- .../test_plugin.go | 2 +- .../test_plugin_with_panic/test_plugin.go | 2 +- .../helpers/app_instance_table_test.go | 2 +- integration/helpers/app_test.go | 2 +- .../commonisolated/common_isolated_setup.go | 4 +- integration/helpers/config.go | 2 +- integration/helpers/plugin.go | 2 +- integration/helpers/plugin_repo.go | 4 +- integration/helpers/route.go | 2 +- integration/helpers/security_group.go | 2 +- integration/helpers/servicebrokerstub/api.go | 4 +- .../helpers/servicebrokerstub/app_config.go | 4 +- .../helpers/servicebrokerstub/app_deploy.go | 2 +- integration/helpers/servicebrokerstub/cf.go | 2 +- integration/helpers/version.go | 2 +- .../experimental/experimental_suite_test.go | 2 +- .../shared/global/global_suite_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../shared/isolated/apps_command_test.go | 2 +- integration/shared/isolated/config_test.go | 2 +- .../shared/isolated/error_handling_test.go | 2 +- .../isolated/internationalization_test.go | 2 +- .../shared/isolated/isolated_suite_test.go | 2 +- .../shared/isolated/logs_command_test.go | 2 +- .../restart_app_instance_command_test.go | 2 +- .../shared/isolated/spaces_command_test.go | 2 +- .../shared/isolated/version_command_test.go | 2 +- .../performance/performance_suite_test.go | 2 +- .../shared/plugin/add_plugin_repo_test.go | 2 +- integration/shared/plugin/api_test.go | 4 +- integration/shared/plugin/help_test.go | 2 +- .../plugin/install_plugin_command_test.go | 10 +- .../install_plugin_command_unix_test.go | 2 +- .../install_plugin_from_repo_command_test.go | 4 +- integration/shared/plugin/logs_test.go | 2 +- .../shared/plugin/plugin_suite_test.go | 8 +- .../shared/plugin/plugins_command_test.go | 4 +- integration/shared/plugin/runner_test.go | 2 +- .../plugin/uninstall_plugin_command_test.go | 4 +- .../uninstall_plugin_command_unix_test.go | 4 +- ...ind_running_security_group_command_test.go | 4 +- .../bind_security_group_command_test.go | 4 +- ...ind_staging_security_group_command_test.go | 4 +- .../global/create_buildpack_command_test.go | 2 +- .../create_security_group_command_test.go | 4 +- .../global/delete_buildpack_command_test.go | 2 +- .../disable_feature_flag_command_test.go | 2 +- .../enable_feature_flag_command_test.go | 2 +- integration/v7/global/env_command_test.go | 2 +- integration/v7/global/global_suite_test.go | 2 +- .../v7/global/org_quota_command_test.go | 2 +- .../v7/global/org_quotas_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../running_security_groups_command_test.go | 4 +- .../v7/global/security_group_command_test.go | 4 +- .../v7/global/set_org_role_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../v7/global/set_space_role_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../staging_security_groups_command_test.go | 4 +- ...ind_running_security_group_command_test.go | 4 +- .../unbind_security_group_command_test.go | 2 +- ...ind_staging_security_group_command_test.go | 4 +- .../global/update_buildpack_command_test.go | 2 +- .../update_security_group_command_test.go | 4 +- .../add_network_policy_command_test.go | 2 +- .../isolated/allow_space_ssh_command_test.go | 4 +- integration/v7/isolated/api_command_test.go | 4 +- integration/v7/isolated/app_command_test.go | 4 +- .../isolated/apply_manifest_command_test.go | 4 +- integration/v7/isolated/apps_command_test.go | 4 +- integration/v7/isolated/auth_command_test.go | 6 +- .../bind_route_service_command_test.go | 6 +- .../v7/isolated/bind_service_command_test.go | 6 +- .../v7/isolated/buildpacks_command_test.go | 4 +- .../v7/isolated/cancel_deployment_test.go | 4 +- .../v7/isolated/check_route_command_test.go | 4 +- .../v7/isolated/config_command_test.go | 2 +- integration/v7/isolated/config_test.go | 4 +- .../v7/isolated/continue_deployment_test.go | 4 +- .../v7/isolated/copy_source_command_test.go | 4 +- .../v7/isolated/create_app_command_test.go | 4 +- .../create_app_manifest_command_test.go | 4 +- .../create_isolation_segment_command_test.go | 2 +- .../v7/isolated/create_org_command_test.go | 4 +- .../isolated/create_org_quota_command_test.go | 6 +- .../isolated/create_package_cfignore_test.go | 2 +- .../isolated/create_package_command_test.go | 4 +- .../v7/isolated/create_private_domain_test.go | 4 +- .../v7/isolated/create_route_command_test.go | 4 +- .../create_service_broker_command_test.go | 6 +- .../isolated/create_service_command_test.go | 4 +- .../create_service_key_command_test.go | 6 +- .../v7/isolated/create_shared_domain_test.go | 4 +- .../v7/isolated/create_space_command_test.go | 4 +- .../create_space_quota_command_test.go | 6 +- .../v7/isolated/create_user_command_test.go | 2 +- ...eate_user_provided_service_command_test.go | 2 +- integration/v7/isolated/curl_command_test.go | 4 +- .../v7/isolated/delete_command_test.go | 4 +- .../delete_isolation_segment_command_test.go | 2 +- .../v7/isolated/delete_org_command_test.go | 4 +- .../isolated/delete_org_quota_command_test.go | 2 +- .../delete_orphaned_routes_command_test.go | 4 +- .../delete_private_domain_command_test.go | 4 +- .../v7/isolated/delete_route_command_test.go | 4 +- .../delete_security_group_command_test.go | 4 +- .../delete_service_broker_command_test.go | 6 +- .../isolated/delete_service_command_test.go | 4 +- .../delete_service_key_command_test.go | 4 +- .../delete_shared_domain_command_test.go | 4 +- .../v7/isolated/delete_space_command_test.go | 2 +- .../delete_space_quota_command_test.go | 2 +- .../v7/isolated/delete_user_command_test.go | 2 +- .../disable_org_isolation_command_test.go | 2 +- .../disable_service_access_command_test.go | 4 +- .../v7/isolated/disable_ssh_command_test.go | 4 +- .../disallow_space_ssh_command_test.go | 4 +- .../v7/isolated/domains_command_test.go | 4 +- .../isolated/download_droplet_command_test.go | 4 +- .../v7/isolated/droplets_command_test.go | 4 +- .../enable_org_isolation_command_test.go | 2 +- .../enable_service_access_command_test.go | 4 +- .../v7/isolated/enable_ssh_command_test.go | 4 +- .../isolated/error_on_extra_arguments_test.go | 2 +- .../v7/isolated/events_command_test.go | 4 +- .../v7/isolated/feature_flag_command_test.go | 4 +- .../v7/isolated/feature_flags_command_test.go | 4 +- .../isolated/get_health_check_command_test.go | 4 +- integration/v7/isolated/help_command_test.go | 4 +- .../v7/isolated/isolated_suite_test.go | 2 +- .../isolation_segments_command_test.go | 2 +- .../v7/isolated/labels_command_test.go | 6 +- integration/v7/isolated/login_command_test.go | 4 +- .../v7/isolated/logout_command_test.go | 4 +- integration/v7/isolated/logs_command_test.go | 4 +- .../v7/isolated/map_route_command_test.go | 6 +- .../v7/isolated/marketplace_command_test.go | 6 +- .../v7/isolated/move_route_command_test.go | 6 +- .../isolated/network_policies_command_test.go | 2 +- integration/v7/isolated/oauth_client_test.go | 4 +- .../v7/isolated/oauth_token_command_test.go | 4 +- integration/v7/isolated/org_command_test.go | 2 +- .../v7/isolated/org_users_command_test.go | 2 +- integration/v7/isolated/orgs_command_test.go | 2 +- .../v7/isolated/packages_command_test.go | 4 +- .../v7/isolated/passwd_command_test.go | 4 +- .../v7/isolated/proxy_connection_test.go | 2 +- .../purge_service_instance_command_test.go | 4 +- .../purge_service_offering_command_test.go | 4 +- .../remove_network_policy_command_test.go | 2 +- .../v7/isolated/rename_command_test.go | 4 +- .../v7/isolated/rename_org_command_test.go | 4 +- .../rename_service_broker_command_test.go | 4 +- .../isolated/rename_service_command_test.go | 4 +- .../v7/isolated/rename_space_command_test.go | 4 +- ..._default_isolation_segment_command_test.go | 2 +- .../reset_space_isolation_segment_test.go | 2 +- .../v7/isolated/restage_command_test.go | 2 +- .../restart_app_instance_command_test.go | 6 +- .../v7/isolated/restart_command_test.go | 4 +- .../v7/isolated/revision_command_test.go | 4 +- .../v7/isolated/revisions_command_test.go | 4 +- .../v7/isolated/rollback_command_test.go | 4 +- integration/v7/isolated/route_command_test.go | 6 +- .../v7/isolated/router_groups_command_test.go | 2 +- .../v7/isolated/routes_command_test.go | 6 +- .../v7/isolated/run_task_command_test.go | 4 +- integration/v7/isolated/scale_command_test.go | 6 +- .../isolated/security_groups_command_test.go | 4 +- .../isolated/service_access_command_test.go | 4 +- .../isolated/service_brokers_command_test.go | 4 +- .../v7/isolated/service_command_test.go | 4 +- .../v7/isolated/service_key_command_test.go | 4 +- .../v7/isolated/service_keys_command_test.go | 4 +- .../v7/isolated/services_command_test.go | 6 +- .../v7/isolated/set_droplet_command_test.go | 4 +- .../v7/isolated/set_env_command_test.go | 4 +- .../isolated/set_health_check_command_test.go | 4 +- .../v7/isolated/set_label_command_test.go | 6 +- ..._default_isolation_segment_command_test.go | 2 +- .../v7/isolated/set_org_quota_command_test.go | 4 +- .../v7/isolated/set_org_role_command_test.go | 4 +- ...et_space_isolation_segment_command_test.go | 2 +- .../isolated/set_space_quota_command_test.go | 4 +- .../isolated/set_space_role_command_test.go | 2 +- .../v7/isolated/share_private_domain_test.go | 4 +- .../v7/isolated/share_route_command_test.go | 6 +- .../v7/isolated/share_service_command_test.go | 4 +- integration/v7/isolated/space_command_test.go | 6 +- .../v7/isolated/space_quota_command_test.go | 2 +- .../v7/isolated/space_quotas_command_test.go | 2 +- .../space_ssh_allowed_command_test.go | 2 +- .../v7/isolated/space_users_command_test.go | 4 +- .../v7/isolated/spaces_command_test.go | 2 +- .../v7/isolated/ssh_code_command_test.go | 2 +- integration/v7/isolated/ssh_command_test.go | 4 +- .../v7/isolated/ssh_enabled_command_test.go | 4 +- integration/v7/isolated/stack_command_test.go | 4 +- .../v7/isolated/stacks_command_test.go | 4 +- .../v7/isolated/stage_package_command_test.go | 4 +- integration/v7/isolated/start_command_test.go | 4 +- integration/v7/isolated/stop_command_test.go | 4 +- .../v7/isolated/table_alignment_test.go | 2 +- .../v7/isolated/target_command_test.go | 6 +- integration/v7/isolated/tasks_command_test.go | 2 +- .../isolated/terminate_task_command_test.go | 2 +- integration/v7/isolated/token_refresh_test.go | 4 +- .../unbind_route_service_command_test.go | 6 +- .../isolated/unbind_service_command_test.go | 6 +- .../v7/isolated/unmap_route_command_test.go | 4 +- .../v7/isolated/unset_env_command_test.go | 4 +- .../v7/isolated/unset_label_command_test.go | 6 +- .../isolated/unset_org_role_command_test.go | 2 +- .../unset_space_quota_command_test.go | 4 +- .../isolated/unset_space_role_command_test.go | 2 +- .../isolated/unshare_private_domain_test.go | 4 +- .../v7/isolated/unshare_route_command_test.go | 6 +- .../isolated/unshare_service_command_test.go | 4 +- .../update_destination_command_test.go | 6 +- .../isolated/update_org_quota_command_test.go | 4 +- .../update_service_broker_command_test.go | 4 +- .../isolated/update_service_command_test.go | 4 +- .../update_space_quota_command_test.go | 4 +- ...date_user_provided_service_command_test.go | 2 +- .../isolated/upgrade_service_command_test.go | 6 +- integration/v7/isolated/verbose_flag_test.go | 4 +- .../v7/push/app_start_timeout_flag_test.go | 2 +- integration/v7/push/buildpacks_test.go | 2 +- integration/v7/push/canary_push_test.go | 2 +- integration/v7/push/cfignore_test.go | 2 +- .../combination_manifest_and_flag_test.go | 2 +- integration/v7/push/disk_flag_test.go | 2 +- integration/v7/push/docker_test.go | 2 +- integration/v7/push/droplet_flag_test.go | 2 +- integration/v7/push/health_check_test.go | 2 +- integration/v7/push/help_test.go | 2 +- integration/v7/push/ignore_app_files_test.go | 2 +- integration/v7/push/input_errors_test.go | 2 +- integration/v7/push/instances_flag_test.go | 2 +- .../v7/push/log_rate_limit_flag_test.go | 4 +- integration/v7/push/manifest_diff_test.go | 2 +- integration/v7/push/manifest_location_test.go | 2 +- ...st_with_app_name_and_no_route_flag_test.go | 2 +- .../v7/push/manifest_with_app_name_test.go | 2 +- integration/v7/push/memory_flag_test.go | 2 +- integration/v7/push/name_only_test.go | 2 +- integration/v7/push/no_route_test.go | 2 +- integration/v7/push/no_start_test.go | 2 +- integration/v7/push/no_wait_test.go | 2 +- integration/v7/push/path_test.go | 2 +- integration/v7/push/push_output_test.go | 2 +- integration/v7/push/push_suite_test.go | 2 +- integration/v7/push/random_route_test.go | 2 +- integration/v7/push/resource_matching_test.go | 2 +- integration/v7/push/rolling_push_test.go | 2 +- .../v7/push/simple_manifest_only_test.go | 2 +- integration/v7/push/stacks_test.go | 2 +- integration/v7/push/start_command_test.go | 2 +- integration/v7/push/symlink_resources_test.go | 2 +- integration/v7/push/symlink_test.go | 2 +- integration/v7/push/targeting_test.go | 2 +- integration/v7/push/tasks_test.go | 2 +- .../v7/selfcontained/api_command_test.go | 8 +- .../create_space_command_test.go | 6 +- .../selfcontained/kubernetes_auth_log_test.go | 6 +- .../v7/selfcontained/kubernetes_auth_test.go | 8 +- .../v7/selfcontained/login_command_test.go | 10 +- .../v7/selfcontained/logout_command_test.go | 6 +- .../selfcontained/selfcontained_suite_test.go | 6 +- main.go | 14 +- plugin/cli_connection.go | 2 +- plugin/plugin.go | 2 +- plugin/plugin_examples/basic_plugin.go | 6 +- plugin/plugin_examples/echo.go | 2 +- plugin/plugin_examples/interactive.go | 2 +- plugin/plugin_examples/multiple_commands.go | 2 +- .../test_rpc_server_example.go | 4 +- .../test_rpc_server_example_suite_test.go | 2 +- .../test_rpc_server_example_test.go | 6 +- plugin/plugin_shim_test.go | 6 +- plugin/plugin_suite_test.go | 2 +- plugin/pluginfakes/fake_cli_connection.go | 193 ++++++----- plugin/rpc/call_command_registry.go | 6 +- plugin/rpc/call_command_registry_test.go | 10 +- plugin/rpc/cli_rpc_server.go | 16 +- plugin/rpc/cli_rpc_server_test.go | 24 +- plugin/rpc/fakecommand/fake_command1.go | 8 +- plugin/rpc/fakecommand/fake_command2.go | 8 +- plugin/rpc/fakecommand/fake_command3.go | 6 +- plugin/rpc/fakecommand/fake_command4.go | 6 +- plugin/rpc/rpc_suite_test.go | 2 +- plugin/rpc/rpcfakes/fake_command_runner.go | 11 +- plugin/rpc/rpcfakes/fake_output_capture.go | 5 +- .../rpcfakes/fake_terminal_output_switch.go | 5 +- plugin/rpc/run_plugin.go | 2 +- plugin/transition/run_plugin_legacy.go | 6 +- resources/application_resource.go | 4 +- resources/build_resource.go | 4 +- resources/buildpack_resource.go | 4 +- resources/deployment_resource.go | 4 +- resources/domain_resource.go | 2 +- resources/droplet_resource.go | 2 +- resources/environment_variables_resource.go | 4 +- resources/last_operation_resource_test.go | 2 +- resources/metadata_resource.go | 2 +- resources/package_resource.go | 4 +- resources/process_resource.go | 6 +- resources/process_resource_test.go | 6 +- resources/quota_resource.go | 2 +- resources/quota_resource_test.go | 2 +- resources/relationship_resource.go | 4 +- resources/role_resource.go | 4 +- resources/route_binding.go | 2 +- resources/route_binding_test.go | 2 +- resources/route_resource.go | 2 +- resources/security_group_resource_test.go | 2 +- resources/service_broker_resource_test.go | 4 +- .../service_credential_binding_resource.go | 2 +- ...ervice_credential_binding_resource_test.go | 4 +- resources/service_instance_resource.go | 2 +- resources/service_instance_resource_test.go | 4 +- ...ce_instance_usage_summary_resource_test.go | 2 +- resources/service_offering_resource.go | 2 +- resources/service_offering_resource_test.go | 4 +- resources/service_plan_resource_test.go | 4 +- .../service_plan_visibility_resource_test.go | 2 +- resources/shared_to_spaces_resource_test.go | 4 +- resources/sidecar_resource.go | 2 +- resources/task_resource.go | 2 +- types/filtered_interface_test.go | 2 +- types/filtered_string_test.go | 2 +- types/json_object_test.go | 2 +- types/null_bool_test.go | 2 +- types/null_bytesize_in_mb_test.go | 2 +- types/null_int_test.go | 2 +- types/null_string_test.go | 2 +- types/null_uint64_test.go | 2 +- types/optional_boolean_test.go | 2 +- types/optional_object_test.go | 2 +- types/optional_string_slice_test.go | 2 +- types/optional_string_test.go | 2 +- util/batcher/batcher.go | 2 +- util/batcher/batcher_test.go | 6 +- util/checksum_test.go | 2 +- .../clisshfakes/fake_listener_factory.go | 9 +- util/clissh/clisshfakes/fake_secure_client.go | 37 +- util/clissh/clisshfakes/fake_secure_dialer.go | 9 +- .../clissh/clisshfakes/fake_secure_session.go | 65 ++-- .../clisshfakes/fake_terminal_helper.go | 37 +- util/clissh/ssh.go | 4 +- util/clissh/ssh_test.go | 6 +- util/command_parser/command_parser.go | 14 +- util/command_parser/command_parser_test.go | 8 +- util/command_parser/prevent_extra_args_v7.go | 2 +- util/command_parser/unknown_command_error.go | 4 +- util/configv3/color_test.go | 2 +- util/configv3/config.go | 2 +- util/configv3/config_suite_test.go | 2 +- util/configv3/config_test.go | 2 +- util/configv3/config_unix_test.go | 2 +- util/configv3/config_windows_test.go | 2 +- .../configv3fakes/fake_user_config.go | 16 +- util/configv3/default_user_config_test.go | 2 +- util/configv3/dynamic_user_config_test.go | 4 +- util/configv3/env_test.go | 2 +- util/configv3/json_config_test.go | 4 +- util/configv3/k8s_test.go | 2 +- util/configv3/kubernetes_user_config_test.go | 2 +- util/configv3/load_config.go | 2 +- util/configv3/load_config_test.go | 8 +- util/configv3/locale_test.go | 2 +- util/configv3/plugin_repository_test.go | 2 +- util/configv3/plugins_config.go | 2 +- util/configv3/plugins_config_test.go | 2 +- util/configv3/write_config_test.go | 2 +- util/download/downloader.go | 2 +- util/download/downloader_test.go | 4 +- .../download/downloadfakes/fake_httpclient.go | 9 +- .../downloadfakes/fake_progress_bar.go | 26 +- util/extract/extract.go | 2 +- util/extract/extract_test.go | 2 +- util/generic/architecture_test.go | 2 +- util/generic/executable_filename_unix_test.go | 2 +- .../executable_filename_windows_test.go | 2 +- util/generic/map_test.go | 2 +- util/generic/slice_test.go | 2 +- util/lookuptable/name_from_guid_test.go | 2 +- util/lookuptable/resource_from_guid.go | 2 +- util/manifest/application.go | 2 +- util/manifest/manifest_test.go | 4 +- util/manifest/manifest_unix_test.go | 2 +- util/manifest/manifest_windows_test.go | 2 +- util/manifestparser/application.go | 2 +- util/manifestparser/application_test.go | 2 +- util/manifestparser/locator_test.go | 2 +- util/manifestparser/manifest_test.go | 2 +- util/manifestparser/parser_test.go | 2 +- util/manifestparser/process.go | 2 +- util/manifestparser/process_test.go | 2 +- util/panichandler/handler.go | 2 +- util/plugin/plugin.go | 10 +- util/railway/railway.go | 2 +- util/railway/railway_test.go | 4 +- util/randomword/generator_test.go | 2 +- util/sorting/alphabetic_test.go | 2 +- util/tls_test.go | 2 +- util/ui/config.go | 2 +- util/ui/i18n.go | 2 +- util/ui/i18n_test.go | 4 +- util/ui/log_message_test.go | 6 +- util/ui/prompt_test.go | 6 +- util/ui/request_logger_file_writer_test.go | 2 +- .../request_logger_terminal_display_test.go | 2 +- util/ui/sanitize_json_test.go | 2 +- util/ui/table_test.go | 6 +- util/ui/ui.go | 4 +- util/ui/ui_for_app_test.go | 6 +- util/ui/ui_for_push.go | 2 +- util/ui/ui_for_push_test.go | 8 +- util/ui/ui_test.go | 8 +- util/ui/ui_v7_test.go | 6 +- util/ui/uifakes/fake_config.go | 4 +- util/ui/uifakes/fake_exiter.go | 2 +- util/ui/uifakes/fake_interactor.go | 2 +- util/ui/uifakes/fake_log_message.go | 2 +- util/ui/uifakes/fake_resolver.go | 2 +- util/unique/string_slice_test.go | 2 +- util/url_test.go | 2 +- util/utilfakes/fake_sha1checksum.go | 19 +- version/version_test.go | 2 +- 2204 files changed, 12500 insertions(+), 11616 deletions(-) diff --git a/README.md b/README.md index 4643ff318c..63a25869ee 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,6 @@ information follow: * [The CF CLI plugin development guide](https://github.com/cloudfoundry/cli/tree/main/plugin/plugin_examples) * [The official plugins repository](https://plugins.cloudfoundry.org/) -When importing the plugin code use `import "code.cloudfoundry.org/cli/v8/plugin"`. +When importing the plugin code use `import "code.cloudfoundry.org/cli/v9/plugin"`. Older plugins that import `github.com/cloudfoundry/cli/plugin` will still work as long they vendor the plugins directory. diff --git a/actor/actionerror/duplicate_service_error_test.go b/actor/actionerror/duplicate_service_error_test.go index 2d430af90a..bab3cbfe96 100644 --- a/actor/actionerror/duplicate_service_error_test.go +++ b/actor/actionerror/duplicate_service_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "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 6aa63c5345..6cedf402b2 100644 --- a/actor/actionerror/duplicate_service_plan_error_test.go +++ b/actor/actionerror/duplicate_service_plan_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/enrich_api_errors.go b/actor/actionerror/enrich_api_errors.go index b86d06ca68..95bae17069 100644 --- a/actor/actionerror/enrich_api_errors.go +++ b/actor/actionerror/enrich_api_errors.go @@ -1,6 +1,6 @@ package actionerror -import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" func EnrichAPIErrors(e error) error { switch err := e.(type) { diff --git a/actor/actionerror/enrich_api_errors_test.go b/actor/actionerror/enrich_api_errors_test.go index d8102e46e6..afc57ee36b 100644 --- a/actor/actionerror/enrich_api_errors_test.go +++ b/actor/actionerror/enrich_api_errors_test.go @@ -3,9 +3,9 @@ package actionerror_test import ( "errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "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 1fec5ecd1b..9e2a727bbb 100644 --- a/actor/actionerror/package_not_found_in_app_error_test.go +++ b/actor/actionerror/package_not_found_in_app_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "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 83b694cceb..5f19189eda 100644 --- a/actor/actionerror/route_not_found_error_test.go +++ b/actor/actionerror/route_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/security_group_not_bound_to_space_error.go b/actor/actionerror/security_group_not_bound_to_space_error.go index 29ed14b9af..7fab584226 100644 --- a/actor/actionerror/security_group_not_bound_to_space_error.go +++ b/actor/actionerror/security_group_not_bound_to_space_error.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // SecurityGroupNotBoundToSpaceError is returned when a requested security group is diff --git a/actor/actionerror/service_instance_type_error.go b/actor/actionerror/service_instance_type_error.go index 48843d2894..46a8c34bea 100644 --- a/actor/actionerror/service_instance_type_error.go +++ b/actor/actionerror/service_instance_type_error.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/resources" ) type ServiceInstanceTypeError struct { diff --git a/actor/actionerror/service_not_found_error_test.go b/actor/actionerror/service_not_found_error_test.go index b5b7c97b5e..500b8541e9 100644 --- a/actor/actionerror/service_not_found_error_test.go +++ b/actor/actionerror/service_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/service_offering_name_ambiguity_error.go b/actor/actionerror/service_offering_name_ambiguity_error.go index b45e548bbb..7da5a045c2 100644 --- a/actor/actionerror/service_offering_name_ambiguity_error.go +++ b/actor/actionerror/service_offering_name_ambiguity_error.go @@ -1,6 +1,6 @@ package actionerror -import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" type ServiceOfferingNameAmbiguityError struct { ccerror.ServiceOfferingNameAmbiguityError diff --git a/actor/actionerror/service_plan_not_found_error_test.go b/actor/actionerror/service_plan_not_found_error_test.go index d9cbee3bcd..3f4ebf28df 100644 --- a/actor/actionerror/service_plan_not_found_error_test.go +++ b/actor/actionerror/service_plan_not_found_error_test.go @@ -3,7 +3,7 @@ package actionerror_test import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "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 0708268b43..30bbbf89ab 100644 --- a/actor/actionerror/space_not_found_error_test.go +++ b/actor/actionerror/space_not_found_error_test.go @@ -1,7 +1,7 @@ package actionerror_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/user_not_found.go b/actor/actionerror/user_not_found.go index 5c024a420e..7cf937fedb 100644 --- a/actor/actionerror/user_not_found.go +++ b/actor/actionerror/user_not_found.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // UserNotFoundError is an error wrapper that represents the case diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go index d246095540..7473911923 100644 --- a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go +++ b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go @@ -4,9 +4,9 @@ package cfnetworkingactionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeCloudControllerClient struct { @@ -84,15 +84,16 @@ func (fake *FakeCloudControllerClient) GetApplicationByNameAndSpace(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationByNameAndSpaceStub + fakeReturns := fake.getApplicationByNameAndSpaceReturns fake.recordInvocation("GetApplicationByNameAndSpace", []interface{}{arg1, arg2}) fake.getApplicationByNameAndSpaceMutex.Unlock() - if fake.GetApplicationByNameAndSpaceStub != nil { - return fake.GetApplicationByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -150,15 +151,16 @@ func (fake *FakeCloudControllerClient) GetApplications(arg1 ...ccv3.Query) ([]re fake.getApplicationsArgsForCall = append(fake.getApplicationsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetApplicationsStub + fakeReturns := fake.getApplicationsReturns fake.recordInvocation("GetApplications", []interface{}{arg1}) fake.getApplicationsMutex.Unlock() - if fake.GetApplicationsStub != nil { - return fake.GetApplicationsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -216,15 +218,16 @@ func (fake *FakeCloudControllerClient) GetOrganizations(arg1 ...ccv3.Query) ([]r fake.getOrganizationsArgsForCall = append(fake.getOrganizationsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetOrganizationsStub + fakeReturns := fake.getOrganizationsReturns fake.recordInvocation("GetOrganizations", []interface{}{arg1}) fake.getOrganizationsMutex.Unlock() - if fake.GetOrganizationsStub != nil { - return fake.GetOrganizationsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -282,15 +285,16 @@ func (fake *FakeCloudControllerClient) GetSpaces(arg1 ...ccv3.Query) ([]resource fake.getSpacesArgsForCall = append(fake.getSpacesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetSpacesStub + fakeReturns := fake.getSpacesReturns fake.recordInvocation("GetSpaces", []interface{}{arg1}) fake.getSpacesMutex.Unlock() - if fake.GetSpacesStub != nil { - return fake.GetSpacesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4 } - fakeReturns := fake.getSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4 } diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go index 3462f5aecd..48d4815b4c 100644 --- a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go +++ b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go @@ -5,7 +5,7 @@ import ( "sync" "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" ) type FakeNetworkingClient struct { @@ -59,15 +59,16 @@ func (fake *FakeNetworkingClient) CreatePolicies(arg1 []cfnetv1.Policy) error { fake.createPoliciesArgsForCall = append(fake.createPoliciesArgsForCall, struct { arg1 []cfnetv1.Policy }{arg1Copy}) + stub := fake.CreatePoliciesStub + fakeReturns := fake.createPoliciesReturns fake.recordInvocation("CreatePolicies", []interface{}{arg1Copy}) fake.createPoliciesMutex.Unlock() - if fake.CreatePoliciesStub != nil { - return fake.CreatePoliciesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createPoliciesReturns return fakeReturns.result1 } @@ -119,15 +120,16 @@ func (fake *FakeNetworkingClient) ListPolicies(arg1 ...string) ([]cfnetv1.Policy fake.listPoliciesArgsForCall = append(fake.listPoliciesArgsForCall, struct { arg1 []string }{arg1}) + stub := fake.ListPoliciesStub + fakeReturns := fake.listPoliciesReturns fake.recordInvocation("ListPolicies", []interface{}{arg1}) fake.listPoliciesMutex.Unlock() - if fake.ListPoliciesStub != nil { - return fake.ListPoliciesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listPoliciesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -187,15 +189,16 @@ func (fake *FakeNetworkingClient) RemovePolicies(arg1 []cfnetv1.Policy) error { fake.removePoliciesArgsForCall = append(fake.removePoliciesArgsForCall, struct { arg1 []cfnetv1.Policy }{arg1Copy}) + stub := fake.RemovePoliciesStub + fakeReturns := fake.removePoliciesReturns fake.recordInvocation("RemovePolicies", []interface{}{arg1Copy}) fake.removePoliciesMutex.Unlock() - if fake.RemovePoliciesStub != nil { - return fake.RemovePoliciesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.removePoliciesReturns return fakeReturns.result1 } diff --git a/actor/cfnetworkingaction/cloud_controller_client.go b/actor/cfnetworkingaction/cloud_controller_client.go index be262f0e52..ebf75af73e 100644 --- a/actor/cfnetworkingaction/cloud_controller_client.go +++ b/actor/cfnetworkingaction/cloud_controller_client.go @@ -1,8 +1,8 @@ package cfnetworkingaction import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/cfnetworkingaction/policy.go b/actor/cfnetworkingaction/policy.go index 5313aa5349..fcab2d17bf 100644 --- a/actor/cfnetworkingaction/policy.go +++ b/actor/cfnetworkingaction/policy.go @@ -2,12 +2,12 @@ package cfnetworkingaction import ( "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/batcher" - "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) type Policy struct { diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go index beaf6585ea..f092014052 100644 --- a/actor/cfnetworkingaction/policy_test.go +++ b/actor/cfnetworkingaction/policy_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction/cfnetworkingactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction/cfnetworkingactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/checksum.go b/actor/pluginaction/checksum.go index 8a223bb25b..b99afbb742 100644 --- a/actor/pluginaction/checksum.go +++ b/actor/pluginaction/checksum.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/v8/util/configv3" +import "code.cloudfoundry.org/cli/v9/util/configv3" func (actor Actor) ValidateFileChecksum(path string, checksum string) bool { plugin := configv3.Plugin{Location: path} diff --git a/actor/pluginaction/checksum_test.go b/actor/pluginaction/checksum_test.go index c17519b3f6..394a32f218 100644 --- a/actor/pluginaction/checksum_test.go +++ b/actor/pluginaction/checksum_test.go @@ -3,8 +3,8 @@ package pluginaction_test import ( "os" - . "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/config.go b/actor/pluginaction/config.go index 307aefcdff..7826f9c1b1 100644 --- a/actor/pluginaction/config.go +++ b/actor/pluginaction/config.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/v8/util/configv3" +import "code.cloudfoundry.org/cli/v9/util/configv3" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/pluginaction/install.go b/actor/pluginaction/install.go index 12e95772ab..77d9b3c2e3 100644 --- a/actor/pluginaction/install.go +++ b/actor/pluginaction/install.go @@ -8,10 +8,10 @@ import ( "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/generic" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/actor/pluginaction/install_test.go b/actor/pluginaction/install_test.go index 01861983e0..2448d9855a 100644 --- a/actor/pluginaction/install_test.go +++ b/actor/pluginaction/install_test.go @@ -5,13 +5,13 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/generic" . "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 d1cdb380f4..0e6f50b492 100644 --- a/actor/pluginaction/install_unix_test.go +++ b/actor/pluginaction/install_unix_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" . "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 04a1c11ccf..c5dcc3ce42 100644 --- a/actor/pluginaction/install_windows_test.go +++ b/actor/pluginaction/install_windows_test.go @@ -6,8 +6,8 @@ package pluginaction_test import ( "os" - . "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/list.go b/actor/pluginaction/list.go index 23a76e2a05..5cac33d8eb 100644 --- a/actor/pluginaction/list.go +++ b/actor/pluginaction/list.go @@ -1,7 +1,7 @@ package pluginaction import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" "github.com/blang/semver/v4" ) diff --git a/actor/pluginaction/list_test.go b/actor/pluginaction/list_test.go index d2c8caffff..1c9e328ca8 100644 --- a/actor/pluginaction/list_test.go +++ b/actor/pluginaction/list_test.go @@ -3,11 +3,11 @@ package pluginaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/plugin_client.go b/actor/pluginaction/plugin_client.go index 6c992a243f..5839e06ea1 100644 --- a/actor/pluginaction/plugin_client.go +++ b/actor/pluginaction/plugin_client.go @@ -1,6 +1,6 @@ package pluginaction -import "code.cloudfoundry.org/cli/v8/api/plugin" +import "code.cloudfoundry.org/cli/v9/api/plugin" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginClient diff --git a/actor/pluginaction/plugin_info.go b/actor/pluginaction/plugin_info.go index c0bb3ddec5..171535e696 100644 --- a/actor/pluginaction/plugin_info.go +++ b/actor/pluginaction/plugin_info.go @@ -3,9 +3,9 @@ package pluginaction import ( "runtime" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/generic" ) type PluginInfo struct { diff --git a/actor/pluginaction/plugin_info_test.go b/actor/pluginaction/plugin_info_test.go index eefeb1ec0c..ded5990148 100644 --- a/actor/pluginaction/plugin_info_test.go +++ b/actor/pluginaction/plugin_info_test.go @@ -3,11 +3,11 @@ package pluginaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/plugin_repository.go b/actor/pluginaction/plugin_repository.go index 777a5000ce..9f4ee449d0 100644 --- a/actor/pluginaction/plugin_repository.go +++ b/actor/pluginaction/plugin_repository.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/util/configv3" ) func (actor Actor) AddPluginRepository(repoName string, repoURL string) error { diff --git a/actor/pluginaction/plugin_repository_test.go b/actor/pluginaction/plugin_repository_test.go index de99fdf097..0ccb2de66f 100644 --- a/actor/pluginaction/plugin_repository_test.go +++ b/actor/pluginaction/plugin_repository_test.go @@ -4,11 +4,11 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/pluginactionfakes/fake_command_list.go b/actor/pluginaction/pluginactionfakes/fake_command_list.go index fb8bf73330..870ae30749 100644 --- a/actor/pluginaction/pluginactionfakes/fake_command_list.go +++ b/actor/pluginaction/pluginactionfakes/fake_command_list.go @@ -4,7 +4,7 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" ) type FakeCommandList struct { @@ -40,15 +40,16 @@ func (fake *FakeCommandList) HasAlias(arg1 string) bool { fake.hasAliasArgsForCall = append(fake.hasAliasArgsForCall, struct { arg1 string }{arg1}) + stub := fake.HasAliasStub + fakeReturns := fake.hasAliasReturns fake.recordInvocation("HasAlias", []interface{}{arg1}) fake.hasAliasMutex.Unlock() - if fake.HasAliasStub != nil { - return fake.HasAliasStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasAliasReturns return fakeReturns.result1 } @@ -100,15 +101,16 @@ func (fake *FakeCommandList) HasCommand(arg1 string) bool { fake.hasCommandArgsForCall = append(fake.hasCommandArgsForCall, struct { arg1 string }{arg1}) + stub := fake.HasCommandStub + fakeReturns := fake.hasCommandReturns fake.recordInvocation("HasCommand", []interface{}{arg1}) fake.hasCommandMutex.Unlock() - if fake.HasCommandStub != nil { - return fake.HasCommandStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasCommandReturns return fakeReturns.result1 } diff --git a/actor/pluginaction/pluginactionfakes/fake_config.go b/actor/pluginaction/pluginactionfakes/fake_config.go index 3186786ce6..ac7722f837 100644 --- a/actor/pluginaction/pluginactionfakes/fake_config.go +++ b/actor/pluginaction/pluginactionfakes/fake_config.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeConfig struct { @@ -97,9 +97,10 @@ func (fake *FakeConfig) AddPlugin(arg1 configv3.Plugin) { fake.addPluginArgsForCall = append(fake.addPluginArgsForCall, struct { arg1 configv3.Plugin }{arg1}) + stub := fake.AddPluginStub fake.recordInvocation("AddPlugin", []interface{}{arg1}) fake.addPluginMutex.Unlock() - if fake.AddPluginStub != nil { + if stub != nil { fake.AddPluginStub(arg1) } } @@ -129,9 +130,10 @@ func (fake *FakeConfig) AddPluginRepository(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.AddPluginRepositoryStub fake.recordInvocation("AddPluginRepository", []interface{}{arg1, arg2}) fake.addPluginRepositoryMutex.Unlock() - if fake.AddPluginRepositoryStub != nil { + if stub != nil { fake.AddPluginRepositoryStub(arg1, arg2) } } @@ -160,15 +162,16 @@ func (fake *FakeConfig) BinaryVersion() string { ret, specificReturn := fake.binaryVersionReturnsOnCall[len(fake.binaryVersionArgsForCall)] fake.binaryVersionArgsForCall = append(fake.binaryVersionArgsForCall, struct { }{}) + stub := fake.BinaryVersionStub + fakeReturns := fake.binaryVersionReturns fake.recordInvocation("BinaryVersion", []interface{}{}) fake.binaryVersionMutex.Unlock() - if fake.BinaryVersionStub != nil { - return fake.BinaryVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.binaryVersionReturns return fakeReturns.result1 } @@ -213,15 +216,16 @@ func (fake *FakeConfig) GetPlugin(arg1 string) (configv3.Plugin, bool) { fake.getPluginArgsForCall = append(fake.getPluginArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPluginStub + fakeReturns := fake.getPluginReturns fake.recordInvocation("GetPlugin", []interface{}{arg1}) fake.getPluginMutex.Unlock() - if fake.GetPluginStub != nil { - return fake.GetPluginStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPluginReturns return fakeReturns.result1, fakeReturns.result2 } @@ -275,15 +279,16 @@ func (fake *FakeConfig) PluginHome() string { ret, specificReturn := fake.pluginHomeReturnsOnCall[len(fake.pluginHomeArgsForCall)] fake.pluginHomeArgsForCall = append(fake.pluginHomeArgsForCall, struct { }{}) + stub := fake.PluginHomeStub + fakeReturns := fake.pluginHomeReturns fake.recordInvocation("PluginHome", []interface{}{}) fake.pluginHomeMutex.Unlock() - if fake.PluginHomeStub != nil { - return fake.PluginHomeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginHomeReturns return fakeReturns.result1 } @@ -327,15 +332,16 @@ func (fake *FakeConfig) PluginRepositories() []configv3.PluginRepository { ret, specificReturn := fake.pluginRepositoriesReturnsOnCall[len(fake.pluginRepositoriesArgsForCall)] fake.pluginRepositoriesArgsForCall = append(fake.pluginRepositoriesArgsForCall, struct { }{}) + stub := fake.PluginRepositoriesStub + fakeReturns := fake.pluginRepositoriesReturns fake.recordInvocation("PluginRepositories", []interface{}{}) fake.pluginRepositoriesMutex.Unlock() - if fake.PluginRepositoriesStub != nil { - return fake.PluginRepositoriesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginRepositoriesReturns return fakeReturns.result1 } @@ -379,15 +385,16 @@ func (fake *FakeConfig) Plugins() []configv3.Plugin { ret, specificReturn := fake.pluginsReturnsOnCall[len(fake.pluginsArgsForCall)] fake.pluginsArgsForCall = append(fake.pluginsArgsForCall, struct { }{}) + stub := fake.PluginsStub + fakeReturns := fake.pluginsReturns fake.recordInvocation("Plugins", []interface{}{}) fake.pluginsMutex.Unlock() - if fake.PluginsStub != nil { - return fake.PluginsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginsReturns return fakeReturns.result1 } @@ -431,9 +438,10 @@ func (fake *FakeConfig) RemovePlugin(arg1 string) { fake.removePluginArgsForCall = append(fake.removePluginArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RemovePluginStub fake.recordInvocation("RemovePlugin", []interface{}{arg1}) fake.removePluginMutex.Unlock() - if fake.RemovePluginStub != nil { + if stub != nil { fake.RemovePluginStub(arg1) } } @@ -462,15 +470,16 @@ func (fake *FakeConfig) WritePluginConfig() error { ret, specificReturn := fake.writePluginConfigReturnsOnCall[len(fake.writePluginConfigArgsForCall)] fake.writePluginConfigArgsForCall = append(fake.writePluginConfigArgsForCall, struct { }{}) + stub := fake.WritePluginConfigStub + fakeReturns := fake.writePluginConfigReturns fake.recordInvocation("WritePluginConfig", []interface{}{}) fake.writePluginConfigMutex.Unlock() - if fake.WritePluginConfigStub != nil { - return fake.WritePluginConfigStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.writePluginConfigReturns return fakeReturns.result1 } diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_client.go b/actor/pluginaction/pluginactionfakes/fake_plugin_client.go index 59aa8cc9c7..222feee548 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_client.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_client.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/api/plugin" ) type FakePluginClient struct { @@ -47,15 +47,16 @@ func (fake *FakePluginClient) DownloadPlugin(arg1 string, arg2 string, arg3 plug arg2 string arg3 plugin.ProxyReader }{arg1, arg2, arg3}) + stub := fake.DownloadPluginStub + fakeReturns := fake.downloadPluginReturns fake.recordInvocation("DownloadPlugin", []interface{}{arg1, arg2, arg3}) fake.downloadPluginMutex.Unlock() - if fake.DownloadPluginStub != nil { - return fake.DownloadPluginStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.downloadPluginReturns return fakeReturns.result1 } @@ -107,15 +108,16 @@ func (fake *FakePluginClient) GetPluginRepository(arg1 string) (plugin.PluginRep fake.getPluginRepositoryArgsForCall = append(fake.getPluginRepositoryArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPluginRepositoryStub + fakeReturns := fake.getPluginRepositoryReturns fake.recordInvocation("GetPluginRepository", []interface{}{arg1}) fake.getPluginRepositoryMutex.Unlock() - if fake.GetPluginRepositoryStub != nil { - return fake.GetPluginRepositoryStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPluginRepositoryReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go b/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go index 1d830e1cbc..e68ab5676e 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go @@ -4,8 +4,8 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakePluginMetadata struct { @@ -32,15 +32,16 @@ func (fake *FakePluginMetadata) GetMetadata(arg1 string) (configv3.Plugin, error fake.getMetadataArgsForCall = append(fake.getMetadataArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetMetadataStub + fakeReturns := fake.getMetadataReturns fake.recordInvocation("GetMetadata", []interface{}{arg1}) fake.getMetadataMutex.Unlock() - if fake.GetMetadataStub != nil { - return fake.GetMetadataStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getMetadataReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go b/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go index c56b7f339f..a05f8a739b 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go @@ -4,7 +4,7 @@ package pluginactionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" ) type FakePluginUninstaller struct { @@ -31,15 +31,16 @@ func (fake *FakePluginUninstaller) Run(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.RunStub + fakeReturns := fake.runReturns fake.recordInvocation("Run", []interface{}{arg1, arg2}) fake.runMutex.Unlock() - if fake.RunStub != nil { - return fake.RunStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.runReturns return fakeReturns.result1 } diff --git a/actor/pluginaction/uninstall.go b/actor/pluginaction/uninstall.go index a5b3e90b98..0f808a1e0b 100644 --- a/actor/pluginaction/uninstall.go +++ b/actor/pluginaction/uninstall.go @@ -5,7 +5,7 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginUninstaller diff --git a/actor/pluginaction/uninstall_test.go b/actor/pluginaction/uninstall_test.go index 8bb04794d2..4d9bdda459 100644 --- a/actor/pluginaction/uninstall_test.go +++ b/actor/pluginaction/uninstall_test.go @@ -6,10 +6,10 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/actor/pluginaction/pluginactionfakes" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/auth_test.go b/actor/sharedaction/auth_test.go index dc2e219517..56d276f12d 100644 --- a/actor/sharedaction/auth_test.go +++ b/actor/sharedaction/auth_test.go @@ -3,8 +3,8 @@ package sharedaction_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/check_target.go b/actor/sharedaction/check_target.go index a852ed87de..3ded7b7208 100644 --- a/actor/sharedaction/check_target.go +++ b/actor/sharedaction/check_target.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/v8/actor/actionerror" +import "code.cloudfoundry.org/cli/v9/actor/actionerror" // CheckTarget confirms that the user is logged in. Optionally it will also // check if an organization and space are targeted. diff --git a/actor/sharedaction/check_target_test.go b/actor/sharedaction/check_target_test.go index 0030cef620..19b444371b 100644 --- a/actor/sharedaction/check_target_test.go +++ b/actor/sharedaction/check_target_test.go @@ -3,9 +3,9 @@ package sharedaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/help.go b/actor/sharedaction/help.go index 20667b7e71..8a13c43426 100644 --- a/actor/sharedaction/help.go +++ b/actor/sharedaction/help.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/util/sorting" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/util/sorting" ) const ( diff --git a/actor/sharedaction/help_test.go b/actor/sharedaction/help_test.go index d0f3baf37f..a99bbfa35a 100644 --- a/actor/sharedaction/help_test.go +++ b/actor/sharedaction/help_test.go @@ -1,9 +1,9 @@ package sharedaction_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "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 465eebe771..52d41988cb 100644 --- a/actor/sharedaction/is_org_targeted_test.go +++ b/actor/sharedaction/is_org_targeted_test.go @@ -1,8 +1,8 @@ package sharedaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "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 775c282d49..1e2dfed771 100644 --- a/actor/sharedaction/is_space_targeted_test.go +++ b/actor/sharedaction/is_space_targeted_test.go @@ -1,8 +1,8 @@ package sharedaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/logging_test.go b/actor/sharedaction/logging_test.go index 736582c75e..8ba6369c13 100644 --- a/actor/sharedaction/logging_test.go +++ b/actor/sharedaction/logging_test.go @@ -7,8 +7,8 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" . "github.com/onsi/ginkgo/v2" diff --git a/actor/sharedaction/resource.go b/actor/sharedaction/resource.go index 2a69476cfe..de0d5f16f5 100644 --- a/actor/sharedaction/resource.go +++ b/actor/sharedaction/resource.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" "code.cloudfoundry.org/ykk" ignore "github.com/sabhiram/go-gitignore" log "github.com/sirupsen/logrus" diff --git a/actor/sharedaction/resource_darwin_test.go b/actor/sharedaction/resource_darwin_test.go index 1c710ad5cc..fda16f9205 100644 --- a/actor/sharedaction/resource_darwin_test.go +++ b/actor/sharedaction/resource_darwin_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "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 f85f748566..d76d380d01 100644 --- a/actor/sharedaction/resource_linux_test.go +++ b/actor/sharedaction/resource_linux_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_test.go b/actor/sharedaction/resource_test.go index d57ea238ab..f063461160 100644 --- a/actor/sharedaction/resource_test.go +++ b/actor/sharedaction/resource_test.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "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 ad52c86ecf..58191450e5 100644 --- a/actor/sharedaction/resource_unix_test.go +++ b/actor/sharedaction/resource_unix_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "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 27329679ee..d760683f11 100644 --- a/actor/sharedaction/resource_windows_test.go +++ b/actor/sharedaction/resource_windows_test.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/sharedaction/secure_shell_client.go b/actor/sharedaction/secure_shell_client.go index a9f959decd..a828b8e372 100644 --- a/actor/sharedaction/secure_shell_client.go +++ b/actor/sharedaction/secure_shell_client.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/v8/util/clissh" +import "code.cloudfoundry.org/cli/v9/util/clissh" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecureShellClient diff --git a/actor/sharedaction/sharedactionfakes/fake_config.go b/actor/sharedaction/sharedactionfakes/fake_config.go index cf6dbd9169..6fffa7978c 100644 --- a/actor/sharedaction/sharedactionfakes/fake_config.go +++ b/actor/sharedaction/sharedactionfakes/fake_config.go @@ -4,7 +4,7 @@ package sharedactionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" ) type FakeConfig struct { @@ -111,15 +111,16 @@ func (fake *FakeConfig) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -163,15 +164,16 @@ func (fake *FakeConfig) BinaryName() string { ret, specificReturn := fake.binaryNameReturnsOnCall[len(fake.binaryNameArgsForCall)] fake.binaryNameArgsForCall = append(fake.binaryNameArgsForCall, struct { }{}) + stub := fake.BinaryNameStub + fakeReturns := fake.binaryNameReturns fake.recordInvocation("BinaryName", []interface{}{}) fake.binaryNameMutex.Unlock() - if fake.BinaryNameStub != nil { - return fake.BinaryNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.binaryNameReturns return fakeReturns.result1 } @@ -215,15 +217,16 @@ func (fake *FakeConfig) CurrentUserName() (string, error) { ret, specificReturn := fake.currentUserNameReturnsOnCall[len(fake.currentUserNameArgsForCall)] fake.currentUserNameArgsForCall = append(fake.currentUserNameArgsForCall, struct { }{}) + stub := fake.CurrentUserNameStub + fakeReturns := fake.currentUserNameReturns fake.recordInvocation("CurrentUserName", []interface{}{}) fake.currentUserNameMutex.Unlock() - if fake.CurrentUserNameStub != nil { - return fake.CurrentUserNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.currentUserNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -270,15 +273,16 @@ func (fake *FakeConfig) HasTargetedOrganization() bool { ret, specificReturn := fake.hasTargetedOrganizationReturnsOnCall[len(fake.hasTargetedOrganizationArgsForCall)] fake.hasTargetedOrganizationArgsForCall = append(fake.hasTargetedOrganizationArgsForCall, struct { }{}) + stub := fake.HasTargetedOrganizationStub + fakeReturns := fake.hasTargetedOrganizationReturns fake.recordInvocation("HasTargetedOrganization", []interface{}{}) fake.hasTargetedOrganizationMutex.Unlock() - if fake.HasTargetedOrganizationStub != nil { - return fake.HasTargetedOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasTargetedOrganizationReturns return fakeReturns.result1 } @@ -322,15 +326,16 @@ func (fake *FakeConfig) HasTargetedSpace() bool { ret, specificReturn := fake.hasTargetedSpaceReturnsOnCall[len(fake.hasTargetedSpaceArgsForCall)] fake.hasTargetedSpaceArgsForCall = append(fake.hasTargetedSpaceArgsForCall, struct { }{}) + stub := fake.HasTargetedSpaceStub + fakeReturns := fake.hasTargetedSpaceReturns fake.recordInvocation("HasTargetedSpace", []interface{}{}) fake.hasTargetedSpaceMutex.Unlock() - if fake.HasTargetedSpaceStub != nil { - return fake.HasTargetedSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasTargetedSpaceReturns return fakeReturns.result1 } @@ -374,15 +379,16 @@ func (fake *FakeConfig) IsCFOnK8s() bool { ret, specificReturn := fake.isCFOnK8sReturnsOnCall[len(fake.isCFOnK8sArgsForCall)] fake.isCFOnK8sArgsForCall = append(fake.isCFOnK8sArgsForCall, struct { }{}) + stub := fake.IsCFOnK8sStub + fakeReturns := fake.isCFOnK8sReturns fake.recordInvocation("IsCFOnK8s", []interface{}{}) fake.isCFOnK8sMutex.Unlock() - if fake.IsCFOnK8sStub != nil { - return fake.IsCFOnK8sStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isCFOnK8sReturns return fakeReturns.result1 } @@ -426,15 +432,16 @@ func (fake *FakeConfig) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -478,15 +485,16 @@ func (fake *FakeConfig) TargetedOrganizationName() string { ret, specificReturn := fake.targetedOrganizationNameReturnsOnCall[len(fake.targetedOrganizationNameArgsForCall)] fake.targetedOrganizationNameArgsForCall = append(fake.targetedOrganizationNameArgsForCall, struct { }{}) + stub := fake.TargetedOrganizationNameStub + fakeReturns := fake.targetedOrganizationNameReturns fake.recordInvocation("TargetedOrganizationName", []interface{}{}) fake.targetedOrganizationNameMutex.Unlock() - if fake.TargetedOrganizationNameStub != nil { - return fake.TargetedOrganizationNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.targetedOrganizationNameReturns return fakeReturns.result1 } @@ -530,15 +538,16 @@ func (fake *FakeConfig) Verbose() (bool, []string) { ret, specificReturn := fake.verboseReturnsOnCall[len(fake.verboseArgsForCall)] fake.verboseArgsForCall = append(fake.verboseArgsForCall, struct { }{}) + stub := fake.VerboseStub + fakeReturns := fake.verboseReturns fake.recordInvocation("Verbose", []interface{}{}) fake.verboseMutex.Unlock() - if fake.VerboseStub != nil { - return fake.VerboseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.verboseReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go b/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go index 12468304ee..c0859ab810 100644 --- a/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go +++ b/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" client "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" ) @@ -41,15 +41,16 @@ func (fake *FakeLogCacheClient) Read(arg1 context.Context, arg2 string, arg3 tim arg3 time.Time arg4 []client.ReadOption }{arg1, arg2, arg3, arg4}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1, arg2, arg3, arg4}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1, arg2, arg3, arg4...) + if stub != nil { + return stub(arg1, arg2, arg3, arg4...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go b/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go index 36015e6bae..6122f5ffc1 100644 --- a/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go +++ b/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go @@ -4,8 +4,8 @@ package sharedactionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/util/clissh" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/util/clissh" ) type FakeSecureShellClient struct { @@ -76,15 +76,16 @@ func (fake *FakeSecureShellClient) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -133,15 +134,16 @@ func (fake *FakeSecureShellClient) Connect(arg1 string, arg2 string, arg3 string arg4 string arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.ConnectStub + fakeReturns := fake.connectReturns fake.recordInvocation("Connect", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.connectMutex.Unlock() - if fake.ConnectStub != nil { - return fake.ConnectStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1 } - fakeReturns := fake.connectReturns return fakeReturns.result1 } @@ -199,15 +201,16 @@ func (fake *FakeSecureShellClient) InteractiveSession(arg1 []string, arg2 clissh arg1 []string arg2 clissh.TTYRequest }{arg1Copy, arg2}) + stub := fake.InteractiveSessionStub + fakeReturns := fake.interactiveSessionReturns fake.recordInvocation("InteractiveSession", []interface{}{arg1Copy, arg2}) fake.interactiveSessionMutex.Unlock() - if fake.InteractiveSessionStub != nil { - return fake.InteractiveSessionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.interactiveSessionReturns return fakeReturns.result1 } @@ -264,15 +267,16 @@ func (fake *FakeSecureShellClient) LocalPortForward(arg1 []clissh.LocalPortForwa fake.localPortForwardArgsForCall = append(fake.localPortForwardArgsForCall, struct { arg1 []clissh.LocalPortForward }{arg1Copy}) + stub := fake.LocalPortForwardStub + fakeReturns := fake.localPortForwardReturns fake.recordInvocation("LocalPortForward", []interface{}{arg1Copy}) fake.localPortForwardMutex.Unlock() - if fake.LocalPortForwardStub != nil { - return fake.LocalPortForwardStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.localPortForwardReturns return fakeReturns.result1 } @@ -323,15 +327,16 @@ func (fake *FakeSecureShellClient) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/actor/sharedaction/ssh.go b/actor/sharedaction/ssh.go index 601da7e231..458b8f36aa 100644 --- a/actor/sharedaction/ssh.go +++ b/actor/sharedaction/ssh.go @@ -1,6 +1,6 @@ package sharedaction -import "code.cloudfoundry.org/cli/v8/util/clissh" +import "code.cloudfoundry.org/cli/v9/util/clissh" type TTYOption clissh.TTYRequest diff --git a/actor/sharedaction/ssh_test.go b/actor/sharedaction/ssh_test.go index fb939d820d..4943026bd9 100644 --- a/actor/sharedaction/ssh_test.go +++ b/actor/sharedaction/ssh_test.go @@ -3,9 +3,9 @@ package sharedaction_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/v8/util/clissh" + . "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/util/clissh" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/actor.go b/actor/v7action/actor.go index b42793d27d..b5f4385dad 100644 --- a/actor/v7action/actor.go +++ b/actor/v7action/actor.go @@ -2,9 +2,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/util/configv3" "code.cloudfoundry.org/clock" ) diff --git a/actor/v7action/application.go b/actor/v7action/application.go index 7c45b6ff09..2c1aa47347 100644 --- a/actor/v7action/application.go +++ b/actor/v7action/application.go @@ -5,13 +5,13 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/batcher" - "code.cloudfoundry.org/cli/v8/util/unique" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/unique" ) func (actor Actor) DeleteApplicationByNameAndSpace(name, spaceGUID string, deleteRoutes bool) (Warnings, error) { diff --git a/actor/v7action/application_feature.go b/actor/v7action/application_feature.go index 0c7576d5ad..e21da2da9e 100644 --- a/actor/v7action/application_feature.go +++ b/actor/v7action/application_feature.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) GetAppFeature(appGUID string, featureName string) (resources.ApplicationFeature, Warnings, error) { diff --git a/actor/v7action/application_feature_test.go b/actor/v7action/application_feature_test.go index 1254fc3972..610697c54d 100644 --- a/actor/v7action/application_feature_test.go +++ b/actor/v7action/application_feature_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/application_manifest.go b/actor/v7action/application_manifest.go index 46382bc1d4..642e789f9e 100644 --- a/actor/v7action/application_manifest.go +++ b/actor/v7action/application_manifest.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ManifestParser diff --git a/actor/v7action/application_manifest_test.go b/actor/v7action/application_manifest_test.go index f71cd25855..74613058ce 100644 --- a/actor/v7action/application_manifest_test.go +++ b/actor/v7action/application_manifest_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" diff --git a/actor/v7action/application_summary.go b/actor/v7action/application_summary.go index c989c54ac6..9f92a0b6dd 100644 --- a/actor/v7action/application_summary.go +++ b/actor/v7action/application_summary.go @@ -3,11 +3,11 @@ package v7action import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" ) type ApplicationSummary struct { diff --git a/actor/v7action/application_summary_test.go b/actor/v7action/application_summary_test.go index 966188421d..94396e1dcb 100644 --- a/actor/v7action/application_summary_test.go +++ b/actor/v7action/application_summary_test.go @@ -4,16 +4,16 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/v8/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/application_test.go b/actor/v7action/application_test.go index 3eeb2dd03a..c0aab3d483 100644 --- a/actor/v7action/application_test.go +++ b/actor/v7action/application_test.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/batcher" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/auth.go b/actor/v7action/auth.go index b5d461e7c6..0e87d32120 100644 --- a/actor/v7action/auth.go +++ b/actor/v7action/auth.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type defaultAuthActor struct { diff --git a/actor/v7action/auth_test.go b/actor/v7action/auth_test.go index 53a7b7374c..fbd1d7c827 100644 --- a/actor/v7action/auth_test.go +++ b/actor/v7action/auth_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/build.go b/actor/v7action/build.go index b496c9e6ac..6a7f36c9a4 100644 --- a/actor/v7action/build.go +++ b/actor/v7action/build.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/build_test.go b/actor/v7action/build_test.go index 426cf0915c..3d9a0253da 100644 --- a/actor/v7action/build_test.go +++ b/actor/v7action/build_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/buildpack.go b/actor/v7action/buildpack.go index 87782c9f5d..5757c55448 100644 --- a/actor/v7action/buildpack.go +++ b/actor/v7action/buildpack.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util" ) type JobURL ccv3.JobURL diff --git a/actor/v7action/buildpack_test.go b/actor/v7action/buildpack_test.go index 09991f2e96..e54f22a001 100644 --- a/actor/v7action/buildpack_test.go +++ b/actor/v7action/buildpack_test.go @@ -7,13 +7,13 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "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 3bf553a0b2..9e376b3b1b 100644 --- a/actor/v7action/buildpack_unix_test.go +++ b/actor/v7action/buildpack_unix_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v7action/buildpack_windows_test.go b/actor/v7action/buildpack_windows_test.go index 969e380f01..0a09510609 100644 --- a/actor/v7action/buildpack_windows_test.go +++ b/actor/v7action/buildpack_windows_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v7action/cloud_controller_client.go b/actor/v7action/cloud_controller_client.go index bac2e932b5..e4b63d3312 100644 --- a/actor/v7action/cloud_controller_client.go +++ b/actor/v7action/cloud_controller_client.go @@ -4,10 +4,10 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/v7action/config.go b/actor/v7action/config.go index 5b52080167..30c214386e 100644 --- a/actor/v7action/config.go +++ b/actor/v7action/config.go @@ -3,7 +3,7 @@ package v7action import ( "time" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/v7action/curl.go b/actor/v7action/curl.go index cd38802510..25bb11d3c8 100644 --- a/actor/v7action/curl.go +++ b/actor/v7action/curl.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) func (actor Actor) MakeCurlRequest( diff --git a/actor/v7action/curl_test.go b/actor/v7action/curl_test.go index 4f6120b425..bb3d8d8628 100644 --- a/actor/v7action/curl_test.go +++ b/actor/v7action/curl_test.go @@ -5,9 +5,9 @@ import ( "net/http" "os" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/deployment.go b/actor/v7action/deployment.go index 71836f1443..11c32d9547 100644 --- a/actor/v7action/deployment.go +++ b/actor/v7action/deployment.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) CreateDeployment(dep resources.Deployment) (string, Warnings, error) { diff --git a/actor/v7action/deployment_test.go b/actor/v7action/deployment_test.go index 9f0f90f410..660590d2ac 100644 --- a/actor/v7action/deployment_test.go +++ b/actor/v7action/deployment_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/domain.go b/actor/v7action/domain.go index 28a36c53c8..21cabe6abc 100644 --- a/actor/v7action/domain.go +++ b/actor/v7action/domain.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type SharedOrgs ccv3.SharedOrgs diff --git a/actor/v7action/domain_test.go b/actor/v7action/domain_test.go index 66f6b5bba7..68050c6cef 100644 --- a/actor/v7action/domain_test.go +++ b/actor/v7action/domain_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/droplet.go b/actor/v7action/droplet.go index 313562501e..e75c849b0e 100644 --- a/actor/v7action/droplet.go +++ b/actor/v7action/droplet.go @@ -3,10 +3,10 @@ package v7action import ( "io" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateApplicationDroplet creates a new droplet without a package for the app with diff --git a/actor/v7action/droplet_test.go b/actor/v7action/droplet_test.go index 641cbbfb16..76dc4774fc 100644 --- a/actor/v7action/droplet_test.go +++ b/actor/v7action/droplet_test.go @@ -5,13 +5,13 @@ import ( "io" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/environment_variable.go b/actor/v7action/environment_variable.go index 1f9dae8b96..0b66f196b7 100644 --- a/actor/v7action/environment_variable.go +++ b/actor/v7action/environment_variable.go @@ -1,11 +1,11 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) // EnvironmentVariableGroups represents all environment variables for application diff --git a/actor/v7action/environment_variable_test.go b/actor/v7action/environment_variable_test.go index 66e4d55ddf..f233963fa3 100644 --- a/actor/v7action/environment_variable_test.go +++ b/actor/v7action/environment_variable_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/event.go b/actor/v7action/event.go index 33676b9f07..f5ac3b9715 100644 --- a/actor/v7action/event.go +++ b/actor/v7action/event.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/util/generic" ) type Event struct { diff --git a/actor/v7action/event_test.go b/actor/v7action/event_test.go index 2ed5405e82..e14ce3acc8 100644 --- a/actor/v7action/event_test.go +++ b/actor/v7action/event_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/feature_flag.go b/actor/v7action/feature_flag.go index 983f85165c..687c634e0b 100644 --- a/actor/v7action/feature_flag.go +++ b/actor/v7action/feature_flag.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" ) // GetFeatureFlagByName returns a featureFlag with the provided name. diff --git a/actor/v7action/feature_flag_test.go b/actor/v7action/feature_flag_test.go index ee2dbd3623..dd69f7c5f2 100644 --- a/actor/v7action/feature_flag_test.go +++ b/actor/v7action/feature_flag_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/info.go b/actor/v7action/info.go index fa3c8f2e72..ee1183662e 100644 --- a/actor/v7action/info.go +++ b/actor/v7action/info.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" type Info ccv3.Info diff --git a/actor/v7action/info_test.go b/actor/v7action/info_test.go index a8c0f9261d..e30d0d0bd6 100644 --- a/actor/v7action/info_test.go +++ b/actor/v7action/info_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/isolation_segment.go b/actor/v7action/isolation_segment.go index a0fa3ae946..d0e484b9c9 100644 --- a/actor/v7action/isolation_segment.go +++ b/actor/v7action/isolation_segment.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) type IsolationSegmentSummary struct { diff --git a/actor/v7action/isolation_segment_test.go b/actor/v7action/isolation_segment_test.go index f1569e8349..e751612fa6 100644 --- a/actor/v7action/isolation_segment_test.go +++ b/actor/v7action/isolation_segment_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/job.go b/actor/v7action/job.go index d9558f9e18..ac0741b606 100644 --- a/actor/v7action/job.go +++ b/actor/v7action/job.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type JobState constant.JobState diff --git a/actor/v7action/job_test.go b/actor/v7action/job_test.go index bfe10768e8..ba91e8cb21 100644 --- a/actor/v7action/job_test.go +++ b/actor/v7action/job_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/k8s_auth.go b/actor/v7action/k8s_auth.go index aac1e2be75..29c82c0573 100644 --- a/actor/v7action/k8s_auth.go +++ b/actor/v7action/k8s_auth.go @@ -5,11 +5,11 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/actor/v7action/k8s_auth_test.go b/actor/v7action/k8s_auth_test.go index f2db96bcc4..2e200b4cf1 100644 --- a/actor/v7action/k8s_auth_test.go +++ b/actor/v7action/k8s_auth_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/actor/v7action/label.go b/actor/v7action/label.go index 4d6a0a00e6..3e1789d88f 100644 --- a/actor/v7action/label.go +++ b/actor/v7action/label.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) func (actor *Actor) GetApplicationLabels(appName string, spaceGUID string) (map[string]types.NullString, Warnings, error) { diff --git a/actor/v7action/label_test.go b/actor/v7action/label_test.go index 42fa796c7c..11834cd867 100644 --- a/actor/v7action/label_test.go +++ b/actor/v7action/label_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/logging.go b/actor/v7action/logging.go index ac05671394..6820fd721d 100644 --- a/actor/v7action/logging.go +++ b/actor/v7action/logging.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" "github.com/SermoDigital/jose/jws" ) diff --git a/actor/v7action/logging_test.go b/actor/v7action/logging_test.go index 68fd8ab4ab..9842b6ff50 100644 --- a/actor/v7action/logging_test.go +++ b/actor/v7action/logging_test.go @@ -5,12 +5,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" . "github.com/onsi/ginkgo/v2" diff --git a/actor/v7action/marketplace.go b/actor/v7action/marketplace.go index bf4830dfec..b936671c45 100644 --- a/actor/v7action/marketplace.go +++ b/actor/v7action/marketplace.go @@ -1,7 +1,7 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" ) type ServiceOfferingWithPlans ccv3.ServiceOfferingWithPlans diff --git a/actor/v7action/marketplace_test.go b/actor/v7action/marketplace_test.go index cee3fd1600..3d0b8c79e8 100644 --- a/actor/v7action/marketplace_test.go +++ b/actor/v7action/marketplace_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization.go b/actor/v7action/organization.go index 1ebed1b9d0..df33490377 100644 --- a/actor/v7action/organization.go +++ b/actor/v7action/organization.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) GetOrganizations(labelSelector string) ([]resources.Organization, Warnings, error) { diff --git a/actor/v7action/organization_quota.go b/actor/v7action/organization_quota.go index b76e4cdd03..0592e5a4b3 100644 --- a/actor/v7action/organization_quota.go +++ b/actor/v7action/organization_quota.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type QuotaLimits struct { diff --git a/actor/v7action/organization_quota_test.go b/actor/v7action/organization_quota_test.go index 5552a41b2a..98c4c3d3d4 100644 --- a/actor/v7action/organization_quota_test.go +++ b/actor/v7action/organization_quota_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization_summary.go b/actor/v7action/organization_summary.go index 5553acf96b..f7e67cdead 100644 --- a/actor/v7action/organization_summary.go +++ b/actor/v7action/organization_summary.go @@ -3,7 +3,7 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/resources" ) type OrganizationSummary struct { diff --git a/actor/v7action/organization_summary_test.go b/actor/v7action/organization_summary_test.go index 8445d9b40b..3f4ea5998c 100644 --- a/actor/v7action/organization_summary_test.go +++ b/actor/v7action/organization_summary_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/clock" . "github.com/onsi/ginkgo/v2" diff --git a/actor/v7action/organization_test.go b/actor/v7action/organization_test.go index efeb65de65..83c4c32376 100644 --- a/actor/v7action/organization_test.go +++ b/actor/v7action/organization_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/package.go b/actor/v7action/package.go index d0ef95550c..86d728a492 100644 --- a/actor/v7action/package.go +++ b/actor/v7action/package.go @@ -5,11 +5,11 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/package_test.go b/actor/v7action/package_test.go index 80afcb9783..2b32beff83 100644 --- a/actor/v7action/package_test.go +++ b/actor/v7action/package_test.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/process.go b/actor/v7action/process.go index b9fbd90ecd..31d0e7c7e6 100644 --- a/actor/v7action/process.go +++ b/actor/v7action/process.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) GetProcess(processGUID string) (resources.Process, Warnings, error) { diff --git a/actor/v7action/process_health_check.go b/actor/v7action/process_health_check.go index 90e25b4a9c..6bc78e1174 100644 --- a/actor/v7action/process_health_check.go +++ b/actor/v7action/process_health_check.go @@ -3,7 +3,7 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type ProcessHealthCheck struct { diff --git a/actor/v7action/process_health_check_test.go b/actor/v7action/process_health_check_test.go index 97e15d08f1..64c3d5108e 100644 --- a/actor/v7action/process_health_check_test.go +++ b/actor/v7action/process_health_check_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_instance.go b/actor/v7action/process_instance.go index cefa44757c..ad3fd70403 100644 --- a/actor/v7action/process_instance.go +++ b/actor/v7action/process_instance.go @@ -3,11 +3,11 @@ package v7action import ( "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type ProcessInstance ccv3.ProcessInstance diff --git a/actor/v7action/process_instance_test.go b/actor/v7action/process_instance_test.go index 52b27cf7f0..f484afff06 100644 --- a/actor/v7action/process_instance_test.go +++ b/actor/v7action/process_instance_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_summary.go b/actor/v7action/process_summary.go index 1ed1b49234..0b381d13d9 100644 --- a/actor/v7action/process_summary.go +++ b/actor/v7action/process_summary.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/process_summary_test.go b/actor/v7action/process_summary_test.go index 31b6c20f32..ea9c10573d 100644 --- a/actor/v7action/process_summary_test.go +++ b/actor/v7action/process_summary_test.go @@ -1,9 +1,9 @@ package v7action_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/process_test.go b/actor/v7action/process_test.go index 32f5172a73..2428c9795d 100644 --- a/actor/v7action/process_test.go +++ b/actor/v7action/process_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v7action/resource_match.go b/actor/v7action/resource_match.go index 7251d33c30..93ec5e79f4 100644 --- a/actor/v7action/resource_match.go +++ b/actor/v7action/resource_match.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/resource_match_test.go b/actor/v7action/resource_match_test.go index f508dde21b..240940613e 100644 --- a/actor/v7action/resource_match_test.go +++ b/actor/v7action/resource_match_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/revisions.go b/actor/v7action/revisions.go index f533227003..ccbf1c7301 100644 --- a/actor/v7action/revisions.go +++ b/actor/v7action/revisions.go @@ -3,11 +3,11 @@ package v7action import ( "strconv" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/versioncheck" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/versioncheck" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) const MinimumCCAPIVersionForDeployable = "3.86.0" diff --git a/actor/v7action/revisions_test.go b/actor/v7action/revisions_test.go index fad63c8ad1..9f3b2869c6 100644 --- a/actor/v7action/revisions_test.go +++ b/actor/v7action/revisions_test.go @@ -4,12 +4,12 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/role.go b/actor/v7action/role.go index 9fe786cfa7..bed5893ad1 100644 --- a/actor/v7action/role.go +++ b/actor/v7action/role.go @@ -1,11 +1,11 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) CreateOrgRole(roleType constant.RoleType, orgGUID string, userNameOrGUID string, userOrigin string, isClient bool) (Warnings, error) { diff --git a/actor/v7action/role_test.go b/actor/v7action/role_test.go index 85bad2b4e0..3158af4efa 100644 --- a/actor/v7action/role_test.go +++ b/actor/v7action/role_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/route.go b/actor/v7action/route.go index 6f2ac4e288..8bc8db5324 100644 --- a/actor/v7action/route.go +++ b/actor/v7action/route.go @@ -5,16 +5,16 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/batcher" - "code.cloudfoundry.org/cli/v8/util/extract" - "code.cloudfoundry.org/cli/v8/util/lookuptable" - "code.cloudfoundry.org/cli/v8/util/railway" - "code.cloudfoundry.org/cli/v8/util/sorting" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/extract" + "code.cloudfoundry.org/cli/v9/util/lookuptable" + "code.cloudfoundry.org/cli/v9/util/railway" + "code.cloudfoundry.org/cli/v9/util/sorting" ) type RouteSummary struct { diff --git a/actor/v7action/route_binding.go b/actor/v7action/route_binding.go index ed471d34ac..bed04c81d9 100644 --- a/actor/v7action/route_binding.go +++ b/actor/v7action/route_binding.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type CreateRouteBindingParams struct { diff --git a/actor/v7action/route_binding_test.go b/actor/v7action/route_binding_test.go index ef926c0a00..51356d5789 100644 --- a/actor/v7action/route_binding_test.go +++ b/actor/v7action/route_binding_test.go @@ -1,15 +1,15 @@ package v7action_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/route_test.go b/actor/v7action/route_test.go index e323487b6a..1030a09f87 100644 --- a/actor/v7action/route_test.go +++ b/actor/v7action/route_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/router_group.go b/actor/v7action/router_group.go index 0a19c612d6..a5df848b45 100644 --- a/actor/v7action/router_group.go +++ b/actor/v7action/router_group.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" ) type RouterGroup router.RouterGroup diff --git a/actor/v7action/router_group_test.go b/actor/v7action/router_group_test.go index 8301dd2a66..ded8c84e65 100644 --- a/actor/v7action/router_group_test.go +++ b/actor/v7action/router_group_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/routing_client.go b/actor/v7action/routing_client.go index 37019d9637..cc7c6be362 100644 --- a/actor/v7action/routing_client.go +++ b/actor/v7action/routing_client.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/v8/api/router" +import "code.cloudfoundry.org/cli/v9/api/router" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RoutingClient diff --git a/actor/v7action/security_group.go b/actor/v7action/security_group.go index 825146f028..12b018f86b 100644 --- a/actor/v7action/security_group.go +++ b/actor/v7action/security_group.go @@ -5,13 +5,13 @@ import ( "io" "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/batcher" - "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) type SecurityGroupSummary struct { diff --git a/actor/v7action/security_group_test.go b/actor/v7action/security_group_test.go index 73cbd5cfed..c2f909a463 100644 --- a/actor/v7action/security_group_test.go +++ b/actor/v7action/security_group_test.go @@ -6,14 +6,14 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_access.go b/actor/v7action/service_access.go index e1bc5b1b44..dccdae8de3 100644 --- a/actor/v7action/service_access.go +++ b/actor/v7action/service_access.go @@ -5,9 +5,9 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) type ServicePlanWithSpaceAndOrganization ccv3.ServicePlanWithSpaceAndOrganization diff --git a/actor/v7action/service_access_test.go b/actor/v7action/service_access_test.go index da7025651b..41515abb89 100644 --- a/actor/v7action/service_access_test.go +++ b/actor/v7action/service_access_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_app_binding.go b/actor/v7action/service_app_binding.go index 7ff7f47102..71326c3980 100644 --- a/actor/v7action/service_app_binding.go +++ b/actor/v7action/service_app_binding.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type CreateServiceAppBindingParams struct { diff --git a/actor/v7action/service_app_binding_test.go b/actor/v7action/service_app_binding_test.go index cf0c79083a..8203077cde 100644 --- a/actor/v7action/service_app_binding_test.go +++ b/actor/v7action/service_app_binding_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_broker.go b/actor/v7action/service_broker.go index 6b6da0f637..b7ba8f0a24 100644 --- a/actor/v7action/service_broker.go +++ b/actor/v7action/service_broker.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/railway" ) func (actor Actor) GetServiceBrokers() ([]resources.ServiceBroker, Warnings, error) { diff --git a/actor/v7action/service_broker_test.go b/actor/v7action/service_broker_test.go index 3db82caba1..fe517b5f12 100644 --- a/actor/v7action/service_broker_test.go +++ b/actor/v7action/service_broker_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance.go b/actor/v7action/service_instance.go index f7766e38d5..04b0586484 100644 --- a/actor/v7action/service_instance.go +++ b/actor/v7action/service_instance.go @@ -1,13 +1,13 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type UpdateManagedServiceInstanceParams struct { diff --git a/actor/v7action/service_instance_details.go b/actor/v7action/service_instance_details.go index b73ce83d60..f86ae6f618 100644 --- a/actor/v7action/service_instance_details.go +++ b/actor/v7action/service_instance_details.go @@ -1,12 +1,12 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/extract" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/extract" + "code.cloudfoundry.org/cli/v9/util/railway" ) const featureFlagServiceInstanceSharing string = "service_instance_sharing" diff --git a/actor/v7action/service_instance_details_test.go b/actor/v7action/service_instance_details_test.go index d5f6192055..f20e0d030e 100644 --- a/actor/v7action/service_instance_details_test.go +++ b/actor/v7action/service_instance_details_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance_list.go b/actor/v7action/service_instance_list.go index 3f1a17d5a0..947e6e7673 100644 --- a/actor/v7action/service_instance_list.go +++ b/actor/v7action/service_instance_list.go @@ -3,13 +3,13 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/batcher" - "code.cloudfoundry.org/cli/v8/util/extract" - "code.cloudfoundry.org/cli/v8/util/lookuptable" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/batcher" + "code.cloudfoundry.org/cli/v9/util/extract" + "code.cloudfoundry.org/cli/v9/util/lookuptable" + "code.cloudfoundry.org/cli/v9/util/railway" ) type ServiceInstance struct { diff --git a/actor/v7action/service_instance_list_test.go b/actor/v7action/service_instance_list_test.go index 1503d0d909..345f3ca069 100644 --- a/actor/v7action/service_instance_list_test.go +++ b/actor/v7action/service_instance_list_test.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/batcher" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance_sharing.go b/actor/v7action/service_instance_sharing.go index ade1b0db83..9977ffc006 100644 --- a/actor/v7action/service_instance_sharing.go +++ b/actor/v7action/service_instance_sharing.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type ServiceInstanceSharingParams struct { diff --git a/actor/v7action/service_instance_sharing_test.go b/actor/v7action/service_instance_sharing_test.go index baff552e42..87df0ba734 100644 --- a/actor/v7action/service_instance_sharing_test.go +++ b/actor/v7action/service_instance_sharing_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "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 dbb52e32db..d6db920f8d 100644 --- a/actor/v7action/service_instance_test.go +++ b/actor/v7action/service_instance_test.go @@ -3,14 +3,14 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_key.go b/actor/v7action/service_key.go index 0940cbbd80..1239afbc51 100644 --- a/actor/v7action/service_key.go +++ b/actor/v7action/service_key.go @@ -3,12 +3,12 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/railway" ) type CreateServiceKeyParams struct { diff --git a/actor/v7action/service_key_test.go b/actor/v7action/service_key_test.go index c1b82221a2..9a1175204b 100644 --- a/actor/v7action/service_key_test.go +++ b/actor/v7action/service_key_test.go @@ -1,15 +1,15 @@ package v7action_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_offering.go b/actor/v7action/service_offering.go index 7a04c17f2a..0e051f2acc 100644 --- a/actor/v7action/service_offering.go +++ b/actor/v7action/service_offering.go @@ -1,10 +1,10 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/railway" ) func (actor Actor) PurgeServiceOfferingByNameAndBroker(serviceOfferingName, serviceBrokerName string) (Warnings, error) { diff --git a/actor/v7action/service_offering_test.go b/actor/v7action/service_offering_test.go index 0d9c7ff3c9..ec819d211d 100644 --- a/actor/v7action/service_offering_test.go +++ b/actor/v7action/service_offering_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/service_plan.go b/actor/v7action/service_plan.go index 27ca44562d..633f0bb523 100644 --- a/actor/v7action/service_plan.go +++ b/actor/v7action/service_plan.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) GetServicePlanByNameOfferingAndBroker(servicePlanName, serviceOfferingName, serviceBrokerName string) (resources.ServicePlan, Warnings, error) { diff --git a/actor/v7action/service_plan_test.go b/actor/v7action/service_plan_test.go index 2366797b78..66d36622d3 100644 --- a/actor/v7action/service_plan_test.go +++ b/actor/v7action/service_plan_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/shared_actor.go b/actor/v7action/shared_actor.go index ecc441a4a1..3c4211fead 100644 --- a/actor/v7action/shared_actor.go +++ b/actor/v7action/shared_actor.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/v8/actor/sharedaction" +import "code.cloudfoundry.org/cli/v9/actor/sharedaction" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedActor diff --git a/actor/v7action/space.go b/actor/v7action/space.go index e788fc6abc..5305fbfde3 100644 --- a/actor/v7action/space.go +++ b/actor/v7action/space.go @@ -4,11 +4,11 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) type SpaceSummary struct { diff --git a/actor/v7action/space_feature.go b/actor/v7action/space_feature.go index a67c838c6a..accfb560f0 100644 --- a/actor/v7action/space_feature.go +++ b/actor/v7action/space_feature.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/v8/actor/actionerror" +import "code.cloudfoundry.org/cli/v9/actor/actionerror" func (actor Actor) UpdateSpaceFeature(spaceName string, orgGUID string, enabled bool, feature string) (Warnings, error) { var allWarnings Warnings diff --git a/actor/v7action/space_feature_test.go b/actor/v7action/space_feature_test.go index 1895f40ae0..1f1e8ded2c 100644 --- a/actor/v7action/space_feature_test.go +++ b/actor/v7action/space_feature_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/resources" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_manifest.go b/actor/v7action/space_manifest.go index 9c6c163679..b5827f84af 100644 --- a/actor/v7action/space_manifest.go +++ b/actor/v7action/space_manifest.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) DiffSpaceManifest(spaceGUID string, rawManifest []byte) (resources.ManifestDiff, Warnings, error) { diff --git a/actor/v7action/space_manifest_test.go b/actor/v7action/space_manifest_test.go index 22321120ee..fadbe58186 100644 --- a/actor/v7action/space_manifest_test.go +++ b/actor/v7action/space_manifest_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/space_quota.go b/actor/v7action/space_quota.go index 3590d4a278..e66ca5cb73 100644 --- a/actor/v7action/space_quota.go +++ b/actor/v7action/space_quota.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) ApplySpaceQuotaByName(quotaName, spaceGUID, orgGUID string) (Warnings, error) { diff --git a/actor/v7action/space_quota_test.go b/actor/v7action/space_quota_test.go index 18e249bee6..412966347f 100644 --- a/actor/v7action/space_quota_test.go +++ b/actor/v7action/space_quota_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_test.go b/actor/v7action/space_test.go index 358ecb9308..d0677fe940 100644 --- a/actor/v7action/space_test.go +++ b/actor/v7action/space_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/ssh.go b/actor/v7action/ssh.go index 6516db2a28..c6cf515ef8 100644 --- a/actor/v7action/ssh.go +++ b/actor/v7action/ssh.go @@ -3,8 +3,8 @@ package v7action import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/resources" ) type SSHAuthentication struct { diff --git a/actor/v7action/ssh_actor.go b/actor/v7action/ssh_actor.go index 82db1ae4ff..0e5dfbcf7f 100644 --- a/actor/v7action/ssh_actor.go +++ b/actor/v7action/ssh_actor.go @@ -1,6 +1,6 @@ package v7action -import "code.cloudfoundry.org/cli/v8/actor/sharedaction" +import "code.cloudfoundry.org/cli/v9/actor/sharedaction" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHActor diff --git a/actor/v7action/ssh_test.go b/actor/v7action/ssh_test.go index 14eed7e020..c9b76ebca7 100644 --- a/actor/v7action/ssh_test.go +++ b/actor/v7action/ssh_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/stack.go b/actor/v7action/stack.go index d0b9889ff2..43c891947f 100644 --- a/actor/v7action/stack.go +++ b/actor/v7action/stack.go @@ -1,9 +1,9 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor *Actor) GetStackByName(stackName string) (resources.Stack, Warnings, error) { diff --git a/actor/v7action/stack_test.go b/actor/v7action/stack_test.go index 92e6abdc8b..84efcd9963 100644 --- a/actor/v7action/stack_test.go +++ b/actor/v7action/stack_test.go @@ -3,11 +3,11 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/target.go b/actor/v7action/target.go index 89b8a1f15e..f811c24d9b 100644 --- a/actor/v7action/target.go +++ b/actor/v7action/target.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type TargetSettings ccv3.TargetSettings diff --git a/actor/v7action/target_test.go b/actor/v7action/target_test.go index 4e0e67dd4c..d2a7c88977 100644 --- a/actor/v7action/target_test.go +++ b/actor/v7action/target_test.go @@ -3,10 +3,10 @@ package v7action_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/task.go b/actor/v7action/task.go index 6355c5649a..981543f7a9 100644 --- a/actor/v7action/task.go +++ b/actor/v7action/task.go @@ -5,11 +5,11 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/task_test.go b/actor/v7action/task_test.go index 67d7dda72f..7d6920dba7 100644 --- a/actor/v7action/task_test.go +++ b/actor/v7action/task_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/token_test.go b/actor/v7action/token_test.go index 5e12794a0c..42c8a57d10 100644 --- a/actor/v7action/token_test.go +++ b/actor/v7action/token_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/uaa_client.go b/actor/v7action/uaa_client.go index 8ff711b18e..71a70a674b 100644 --- a/actor/v7action/uaa_client.go +++ b/actor/v7action/uaa_client.go @@ -1,8 +1,8 @@ package v7action import ( - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/actor/v7action/user.go b/actor/v7action/user.go index eb3db0feed..56368987c1 100644 --- a/actor/v7action/user.go +++ b/actor/v7action/user.go @@ -3,10 +3,10 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateUser creates a new user in UAA and registers it with cloud controller. diff --git a/actor/v7action/user_test.go b/actor/v7action/user_test.go index 6b4ac0f38a..4aae286c2e 100644 --- a/actor/v7action/user_test.go +++ b/actor/v7action/user_test.go @@ -3,13 +3,13 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/resources" . "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 0c2b1872a9..2bd6dcc6b8 100644 --- a/actor/v7action/v7action_suite_test.go +++ b/actor/v7action/v7action_suite_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" "code.cloudfoundry.org/clock/fakeclock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go index 73b8debea2..8ee7e5c99b 100644 --- a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go +++ b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go @@ -6,11 +6,11 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type FakeCloudControllerClient struct { diff --git a/actor/v7action/v7actionfakes/fake_config.go b/actor/v7action/v7actionfakes/fake_config.go index d6b03550f0..cd46ebbbfc 100644 --- a/actor/v7action/v7actionfakes/fake_config.go +++ b/actor/v7action/v7actionfakes/fake_config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeConfig struct { @@ -193,15 +193,16 @@ func (fake *FakeConfig) APIVersion() string { ret, specificReturn := fake.aPIVersionReturnsOnCall[len(fake.aPIVersionArgsForCall)] fake.aPIVersionArgsForCall = append(fake.aPIVersionArgsForCall, struct { }{}) + stub := fake.APIVersionStub + fakeReturns := fake.aPIVersionReturns fake.recordInvocation("APIVersion", []interface{}{}) fake.aPIVersionMutex.Unlock() - if fake.APIVersionStub != nil { - return fake.APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIVersionReturns return fakeReturns.result1 } @@ -245,15 +246,16 @@ func (fake *FakeConfig) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -297,15 +299,16 @@ func (fake *FakeConfig) CurrentUser() (configv3.User, error) { ret, specificReturn := fake.currentUserReturnsOnCall[len(fake.currentUserArgsForCall)] fake.currentUserArgsForCall = append(fake.currentUserArgsForCall, struct { }{}) + stub := fake.CurrentUserStub + fakeReturns := fake.currentUserReturns fake.recordInvocation("CurrentUser", []interface{}{}) fake.currentUserMutex.Unlock() - if fake.CurrentUserStub != nil { - return fake.CurrentUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.currentUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -352,15 +355,16 @@ func (fake *FakeConfig) DialTimeout() time.Duration { ret, specificReturn := fake.dialTimeoutReturnsOnCall[len(fake.dialTimeoutArgsForCall)] fake.dialTimeoutArgsForCall = append(fake.dialTimeoutArgsForCall, struct { }{}) + stub := fake.DialTimeoutStub + fakeReturns := fake.dialTimeoutReturns fake.recordInvocation("DialTimeout", []interface{}{}) fake.dialTimeoutMutex.Unlock() - if fake.DialTimeoutStub != nil { - return fake.DialTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dialTimeoutReturns return fakeReturns.result1 } @@ -404,15 +408,16 @@ func (fake *FakeConfig) IsCFOnK8s() bool { ret, specificReturn := fake.isCFOnK8sReturnsOnCall[len(fake.isCFOnK8sArgsForCall)] fake.isCFOnK8sArgsForCall = append(fake.isCFOnK8sArgsForCall, struct { }{}) + stub := fake.IsCFOnK8sStub + fakeReturns := fake.isCFOnK8sReturns fake.recordInvocation("IsCFOnK8s", []interface{}{}) fake.isCFOnK8sMutex.Unlock() - if fake.IsCFOnK8sStub != nil { - return fake.IsCFOnK8sStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isCFOnK8sReturns return fakeReturns.result1 } @@ -456,15 +461,16 @@ func (fake *FakeConfig) PollingInterval() time.Duration { ret, specificReturn := fake.pollingIntervalReturnsOnCall[len(fake.pollingIntervalArgsForCall)] fake.pollingIntervalArgsForCall = append(fake.pollingIntervalArgsForCall, struct { }{}) + stub := fake.PollingIntervalStub + fakeReturns := fake.pollingIntervalReturns fake.recordInvocation("PollingInterval", []interface{}{}) fake.pollingIntervalMutex.Unlock() - if fake.PollingIntervalStub != nil { - return fake.PollingIntervalStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pollingIntervalReturns return fakeReturns.result1 } @@ -508,15 +514,16 @@ func (fake *FakeConfig) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -560,15 +567,16 @@ func (fake *FakeConfig) SSHOAuthClient() string { ret, specificReturn := fake.sSHOAuthClientReturnsOnCall[len(fake.sSHOAuthClientArgsForCall)] fake.sSHOAuthClientArgsForCall = append(fake.sSHOAuthClientArgsForCall, struct { }{}) + stub := fake.SSHOAuthClientStub + fakeReturns := fake.sSHOAuthClientReturns fake.recordInvocation("SSHOAuthClient", []interface{}{}) fake.sSHOAuthClientMutex.Unlock() - if fake.SSHOAuthClientStub != nil { - return fake.SSHOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.sSHOAuthClientReturns return fakeReturns.result1 } @@ -612,9 +620,10 @@ func (fake *FakeConfig) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -643,9 +652,10 @@ func (fake *FakeConfig) SetKubernetesAuthInfo(arg1 string) { fake.setKubernetesAuthInfoArgsForCall = append(fake.setKubernetesAuthInfoArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetKubernetesAuthInfoStub fake.recordInvocation("SetKubernetesAuthInfo", []interface{}{arg1}) fake.setKubernetesAuthInfoMutex.Unlock() - if fake.SetKubernetesAuthInfoStub != nil { + if stub != nil { fake.SetKubernetesAuthInfoStub(arg1) } } @@ -674,9 +684,10 @@ func (fake *FakeConfig) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } @@ -705,9 +716,10 @@ func (fake *FakeConfig) SetTargetInformation(arg1 configv3.TargetInformationArgs fake.setTargetInformationArgsForCall = append(fake.setTargetInformationArgsForCall, struct { arg1 configv3.TargetInformationArgs }{arg1}) + stub := fake.SetTargetInformationStub fake.recordInvocation("SetTargetInformation", []interface{}{arg1}) fake.setTargetInformationMutex.Unlock() - if fake.SetTargetInformationStub != nil { + if stub != nil { fake.SetTargetInformationStub(arg1) } } @@ -738,9 +750,10 @@ func (fake *FakeConfig) SetTokenInformation(arg1 string, arg2 string, arg3 strin arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.SetTokenInformationStub fake.recordInvocation("SetTokenInformation", []interface{}{arg1, arg2, arg3}) fake.setTokenInformationMutex.Unlock() - if fake.SetTokenInformationStub != nil { + if stub != nil { fake.SetTokenInformationStub(arg1, arg2, arg3) } } @@ -770,9 +783,10 @@ func (fake *FakeConfig) SetUAAClientCredentials(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetUAAClientCredentialsStub fake.recordInvocation("SetUAAClientCredentials", []interface{}{arg1, arg2}) fake.setUAAClientCredentialsMutex.Unlock() - if fake.SetUAAClientCredentialsStub != nil { + if stub != nil { fake.SetUAAClientCredentialsStub(arg1, arg2) } } @@ -801,9 +815,10 @@ func (fake *FakeConfig) SetUAAGrantType(arg1 string) { fake.setUAAGrantTypeArgsForCall = append(fake.setUAAGrantTypeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAGrantTypeStub fake.recordInvocation("SetUAAGrantType", []interface{}{arg1}) fake.setUAAGrantTypeMutex.Unlock() - if fake.SetUAAGrantTypeStub != nil { + if stub != nil { fake.SetUAAGrantTypeStub(arg1) } } @@ -832,15 +847,16 @@ func (fake *FakeConfig) SkipSSLValidation() bool { ret, specificReturn := fake.skipSSLValidationReturnsOnCall[len(fake.skipSSLValidationArgsForCall)] fake.skipSSLValidationArgsForCall = append(fake.skipSSLValidationArgsForCall, struct { }{}) + stub := fake.SkipSSLValidationStub + fakeReturns := fake.skipSSLValidationReturns fake.recordInvocation("SkipSSLValidation", []interface{}{}) fake.skipSSLValidationMutex.Unlock() - if fake.SkipSSLValidationStub != nil { - return fake.SkipSSLValidationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.skipSSLValidationReturns return fakeReturns.result1 } @@ -884,15 +900,16 @@ func (fake *FakeConfig) StagingTimeout() time.Duration { ret, specificReturn := fake.stagingTimeoutReturnsOnCall[len(fake.stagingTimeoutArgsForCall)] fake.stagingTimeoutArgsForCall = append(fake.stagingTimeoutArgsForCall, struct { }{}) + stub := fake.StagingTimeoutStub + fakeReturns := fake.stagingTimeoutReturns fake.recordInvocation("StagingTimeout", []interface{}{}) fake.stagingTimeoutMutex.Unlock() - if fake.StagingTimeoutStub != nil { - return fake.StagingTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stagingTimeoutReturns return fakeReturns.result1 } @@ -936,15 +953,16 @@ func (fake *FakeConfig) StartupTimeout() time.Duration { ret, specificReturn := fake.startupTimeoutReturnsOnCall[len(fake.startupTimeoutArgsForCall)] fake.startupTimeoutArgsForCall = append(fake.startupTimeoutArgsForCall, struct { }{}) + stub := fake.StartupTimeoutStub + fakeReturns := fake.startupTimeoutReturns fake.recordInvocation("StartupTimeout", []interface{}{}) fake.startupTimeoutMutex.Unlock() - if fake.StartupTimeoutStub != nil { - return fake.StartupTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startupTimeoutReturns return fakeReturns.result1 } @@ -988,15 +1006,16 @@ func (fake *FakeConfig) Target() string { ret, specificReturn := fake.targetReturnsOnCall[len(fake.targetArgsForCall)] fake.targetArgsForCall = append(fake.targetArgsForCall, struct { }{}) + stub := fake.TargetStub + fakeReturns := fake.targetReturns fake.recordInvocation("Target", []interface{}{}) fake.targetMutex.Unlock() - if fake.TargetStub != nil { - return fake.TargetStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.targetReturns return fakeReturns.result1 } @@ -1040,15 +1059,16 @@ func (fake *FakeConfig) UAAGrantType() string { ret, specificReturn := fake.uAAGrantTypeReturnsOnCall[len(fake.uAAGrantTypeArgsForCall)] fake.uAAGrantTypeArgsForCall = append(fake.uAAGrantTypeArgsForCall, struct { }{}) + stub := fake.UAAGrantTypeStub + fakeReturns := fake.uAAGrantTypeReturns fake.recordInvocation("UAAGrantType", []interface{}{}) fake.uAAGrantTypeMutex.Unlock() - if fake.UAAGrantTypeStub != nil { - return fake.UAAGrantTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAGrantTypeReturns return fakeReturns.result1 } @@ -1091,9 +1111,10 @@ func (fake *FakeConfig) UnsetOrganizationAndSpaceInformation() { fake.unsetOrganizationAndSpaceInformationMutex.Lock() fake.unsetOrganizationAndSpaceInformationArgsForCall = append(fake.unsetOrganizationAndSpaceInformationArgsForCall, struct { }{}) + stub := fake.UnsetOrganizationAndSpaceInformationStub fake.recordInvocation("UnsetOrganizationAndSpaceInformation", []interface{}{}) fake.unsetOrganizationAndSpaceInformationMutex.Unlock() - if fake.UnsetOrganizationAndSpaceInformationStub != nil { + if stub != nil { fake.UnsetOrganizationAndSpaceInformationStub() } } diff --git a/actor/v7action/v7actionfakes/fake_downloader.go b/actor/v7action/v7actionfakes/fake_downloader.go index 862f6b3a5b..4545618272 100644 --- a/actor/v7action/v7actionfakes/fake_downloader.go +++ b/actor/v7action/v7actionfakes/fake_downloader.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeDownloader struct { @@ -33,15 +33,16 @@ func (fake *FakeDownloader) Download(arg1 string, arg2 string) (string, error) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.DownloadStub + fakeReturns := fake.downloadReturns fake.recordInvocation("Download", []interface{}{arg1, arg2}) fake.downloadMutex.Unlock() - if fake.DownloadStub != nil { - return fake.DownloadStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.downloadReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go b/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go index c2cadd17a0..7102e140b6 100644 --- a/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go +++ b/actor/v7action/v7actionfakes/fake_kubernetes_config_getter.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" "k8s.io/client-go/tools/clientcmd/api" ) @@ -30,15 +30,16 @@ func (fake *FakeKubernetesConfigGetter) Get() (*api.Config, error) { ret, specificReturn := fake.getReturnsOnCall[len(fake.getArgsForCall)] fake.getArgsForCall = append(fake.getArgsForCall, struct { }{}) + stub := fake.GetStub + fakeReturns := fake.getReturns fake.recordInvocation("Get", []interface{}{}) fake.getMutex.Unlock() - if fake.GetStub != nil { - return fake.GetStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_manifest_parser.go b/actor/v7action/v7actionfakes/fake_manifest_parser.go index 9fbc49ea50..6d93fd4df3 100644 --- a/actor/v7action/v7actionfakes/fake_manifest_parser.go +++ b/actor/v7action/v7actionfakes/fake_manifest_parser.go @@ -4,7 +4,7 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeManifestParser struct { @@ -40,15 +40,16 @@ func (fake *FakeManifestParser) AppNames() []string { ret, specificReturn := fake.appNamesReturnsOnCall[len(fake.appNamesArgsForCall)] fake.appNamesArgsForCall = append(fake.appNamesArgsForCall, struct { }{}) + stub := fake.AppNamesStub + fakeReturns := fake.appNamesReturns fake.recordInvocation("AppNames", []interface{}{}) fake.appNamesMutex.Unlock() - if fake.AppNamesStub != nil { - return fake.AppNamesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.appNamesReturns return fakeReturns.result1 } @@ -93,15 +94,16 @@ func (fake *FakeManifestParser) RawAppManifest(arg1 string) ([]byte, error) { fake.rawAppManifestArgsForCall = append(fake.rawAppManifestArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RawAppManifestStub + fakeReturns := fake.rawAppManifestReturns fake.recordInvocation("RawAppManifest", []interface{}{arg1}) fake.rawAppManifestMutex.Unlock() - if fake.RawAppManifestStub != nil { - return fake.RawAppManifestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.rawAppManifestReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_routing_client.go b/actor/v7action/v7actionfakes/fake_routing_client.go index 23da578b2f..d7be399759 100644 --- a/actor/v7action/v7actionfakes/fake_routing_client.go +++ b/actor/v7action/v7actionfakes/fake_routing_client.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/router" ) type FakeRoutingClient struct { @@ -44,15 +44,16 @@ func (fake *FakeRoutingClient) GetRouterGroupByName(arg1 string) (router.RouterG fake.getRouterGroupByNameArgsForCall = append(fake.getRouterGroupByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetRouterGroupByNameStub + fakeReturns := fake.getRouterGroupByNameReturns fake.recordInvocation("GetRouterGroupByName", []interface{}{arg1}) fake.getRouterGroupByNameMutex.Unlock() - if fake.GetRouterGroupByNameStub != nil { - return fake.GetRouterGroupByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getRouterGroupByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -106,15 +107,16 @@ func (fake *FakeRoutingClient) GetRouterGroups() ([]router.RouterGroup, error) { ret, specificReturn := fake.getRouterGroupsReturnsOnCall[len(fake.getRouterGroupsArgsForCall)] fake.getRouterGroupsArgsForCall = append(fake.getRouterGroupsArgsForCall, struct { }{}) + stub := fake.GetRouterGroupsStub + fakeReturns := fake.getRouterGroupsReturns fake.recordInvocation("GetRouterGroups", []interface{}{}) fake.getRouterGroupsMutex.Unlock() - if fake.GetRouterGroupsStub != nil { - return fake.GetRouterGroupsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getRouterGroupsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_shared_actor.go b/actor/v7action/v7actionfakes/fake_shared_actor.go index db3cad3249..1601a0e3e9 100644 --- a/actor/v7action/v7actionfakes/fake_shared_actor.go +++ b/actor/v7action/v7actionfakes/fake_shared_actor.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeSharedActor struct { @@ -73,15 +73,16 @@ func (fake *FakeSharedActor) GatherArchiveResources(arg1 string) ([]sharedaction fake.gatherArchiveResourcesArgsForCall = append(fake.gatherArchiveResourcesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GatherArchiveResourcesStub + fakeReturns := fake.gatherArchiveResourcesReturns fake.recordInvocation("GatherArchiveResources", []interface{}{arg1}) fake.gatherArchiveResourcesMutex.Unlock() - if fake.GatherArchiveResourcesStub != nil { - return fake.GatherArchiveResourcesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.gatherArchiveResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -136,15 +137,16 @@ func (fake *FakeSharedActor) GatherDirectoryResources(arg1 string) ([]sharedacti fake.gatherDirectoryResourcesArgsForCall = append(fake.gatherDirectoryResourcesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GatherDirectoryResourcesStub + fakeReturns := fake.gatherDirectoryResourcesReturns fake.recordInvocation("GatherDirectoryResources", []interface{}{arg1}) fake.gatherDirectoryResourcesMutex.Unlock() - if fake.GatherDirectoryResourcesStub != nil { - return fake.GatherDirectoryResourcesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.gatherDirectoryResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -205,15 +207,16 @@ func (fake *FakeSharedActor) ZipArchiveResources(arg1 string, arg2 []sharedactio arg1 string arg2 []sharedaction.Resource }{arg1, arg2Copy}) + stub := fake.ZipArchiveResourcesStub + fakeReturns := fake.zipArchiveResourcesReturns fake.recordInvocation("ZipArchiveResources", []interface{}{arg1, arg2Copy}) fake.zipArchiveResourcesMutex.Unlock() - if fake.ZipArchiveResourcesStub != nil { - return fake.ZipArchiveResourcesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.zipArchiveResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -274,15 +277,16 @@ func (fake *FakeSharedActor) ZipDirectoryResources(arg1 string, arg2 []sharedact arg1 string arg2 []sharedaction.Resource }{arg1, arg2Copy}) + stub := fake.ZipDirectoryResourcesStub + fakeReturns := fake.zipDirectoryResourcesReturns fake.recordInvocation("ZipDirectoryResources", []interface{}{arg1, arg2Copy}) fake.zipDirectoryResourcesMutex.Unlock() - if fake.ZipDirectoryResourcesStub != nil { - return fake.ZipDirectoryResourcesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.zipDirectoryResourcesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7action/v7actionfakes/fake_simple_progress_bar.go b/actor/v7action/v7actionfakes/fake_simple_progress_bar.go index 8de838e234..0e2b05b648 100644 --- a/actor/v7action/v7actionfakes/fake_simple_progress_bar.go +++ b/actor/v7action/v7actionfakes/fake_simple_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeSimpleProgressBar struct { @@ -38,15 +38,16 @@ func (fake *FakeSimpleProgressBar) Initialize(arg1 string) (io.Reader, int64, er fake.initializeArgsForCall = append(fake.initializeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.InitializeStub + fakeReturns := fake.initializeReturns fake.recordInvocation("Initialize", []interface{}{arg1}) fake.initializeMutex.Unlock() - if fake.InitializeStub != nil { - return fake.InitializeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.initializeReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -102,9 +103,10 @@ func (fake *FakeSimpleProgressBar) Terminate() { fake.terminateMutex.Lock() fake.terminateArgsForCall = append(fake.terminateArgsForCall, struct { }{}) + stub := fake.TerminateStub fake.recordInvocation("Terminate", []interface{}{}) fake.terminateMutex.Unlock() - if fake.TerminateStub != nil { + if stub != nil { fake.TerminateStub() } } diff --git a/actor/v7action/v7actionfakes/fake_sshactor.go b/actor/v7action/v7actionfakes/fake_sshactor.go index 35336514d8..f849722dd7 100644 --- a/actor/v7action/v7actionfakes/fake_sshactor.go +++ b/actor/v7action/v7actionfakes/fake_sshactor.go @@ -4,8 +4,8 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" ) type FakeSSHActor struct { @@ -30,15 +30,16 @@ func (fake *FakeSSHActor) ExecuteSecureShell(arg1 sharedaction.SSHOptions) error fake.executeSecureShellArgsForCall = append(fake.executeSecureShellArgsForCall, struct { arg1 sharedaction.SSHOptions }{arg1}) + stub := fake.ExecuteSecureShellStub + fakeReturns := fake.executeSecureShellReturns fake.recordInvocation("ExecuteSecureShell", []interface{}{arg1}) fake.executeSecureShellMutex.Unlock() - if fake.ExecuteSecureShellStub != nil { - return fake.ExecuteSecureShellStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeSecureShellReturns return fakeReturns.result1 } diff --git a/actor/v7action/v7actionfakes/fake_uaaclient.go b/actor/v7action/v7actionfakes/fake_uaaclient.go index 06cea0793f..517b7ec9af 100644 --- a/actor/v7action/v7actionfakes/fake_uaaclient.go +++ b/actor/v7action/v7actionfakes/fake_uaaclient.go @@ -4,9 +4,9 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" ) type FakeUAAClient struct { @@ -167,15 +167,16 @@ func (fake *FakeUAAClient) Authenticate(arg1 map[string]string, arg2 string, arg arg2 string arg3 constant.GrantType }{arg1, arg2, arg3}) + stub := fake.AuthenticateStub + fakeReturns := fake.authenticateReturns fake.recordInvocation("Authenticate", []interface{}{arg1, arg2, arg3}) fake.authenticateMutex.Unlock() - if fake.AuthenticateStub != nil { - return fake.AuthenticateStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.authenticateReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -235,15 +236,16 @@ func (fake *FakeUAAClient) CreateUser(arg1 string, arg2 string, arg3 string) (ua arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.CreateUserStub + fakeReturns := fake.createUserReturns fake.recordInvocation("CreateUser", []interface{}{arg1, arg2, arg3}) fake.createUserMutex.Unlock() - if fake.CreateUserStub != nil { - return fake.CreateUserStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -298,15 +300,16 @@ func (fake *FakeUAAClient) DeleteUser(arg1 string) (uaa.User, error) { fake.deleteUserArgsForCall = append(fake.deleteUserArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteUserStub + fakeReturns := fake.deleteUserReturns fake.recordInvocation("DeleteUser", []interface{}{arg1}) fake.deleteUserMutex.Unlock() - if fake.DeleteUserStub != nil { - return fake.DeleteUserStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -360,15 +363,16 @@ func (fake *FakeUAAClient) GetAPIVersion() (string, error) { ret, specificReturn := fake.getAPIVersionReturnsOnCall[len(fake.getAPIVersionArgsForCall)] fake.getAPIVersionArgsForCall = append(fake.getAPIVersionArgsForCall, struct { }{}) + stub := fake.GetAPIVersionStub + fakeReturns := fake.getAPIVersionReturns fake.recordInvocation("GetAPIVersion", []interface{}{}) fake.getAPIVersionMutex.Unlock() - if fake.GetAPIVersionStub != nil { - return fake.GetAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAPIVersionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -415,15 +419,16 @@ func (fake *FakeUAAClient) GetLoginPrompts() (map[string][]string, error) { ret, specificReturn := fake.getLoginPromptsReturnsOnCall[len(fake.getLoginPromptsArgsForCall)] fake.getLoginPromptsArgsForCall = append(fake.getLoginPromptsArgsForCall, struct { }{}) + stub := fake.GetLoginPromptsStub + fakeReturns := fake.getLoginPromptsReturns fake.recordInvocation("GetLoginPrompts", []interface{}{}) fake.getLoginPromptsMutex.Unlock() - if fake.GetLoginPromptsStub != nil { - return fake.GetLoginPromptsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getLoginPromptsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -472,15 +477,16 @@ func (fake *FakeUAAClient) GetSSHPasscode(arg1 string, arg2 string) (string, err arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSSHPasscodeStub + fakeReturns := fake.getSSHPasscodeReturns fake.recordInvocation("GetSSHPasscode", []interface{}{arg1, arg2}) fake.getSSHPasscodeMutex.Unlock() - if fake.GetSSHPasscodeStub != nil { - return fake.GetSSHPasscodeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSSHPasscodeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -536,15 +542,16 @@ func (fake *FakeUAAClient) ListUsers(arg1 string, arg2 string) ([]uaa.User, erro arg1 string arg2 string }{arg1, arg2}) + stub := fake.ListUsersStub + fakeReturns := fake.listUsersReturns fake.recordInvocation("ListUsers", []interface{}{arg1, arg2}) fake.listUsersMutex.Unlock() - if fake.ListUsersStub != nil { - return fake.ListUsersStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listUsersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -599,15 +606,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } @@ -662,15 +670,16 @@ func (fake *FakeUAAClient) Revoke(arg1 string) error { fake.revokeArgsForCall = append(fake.revokeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RevokeStub + fakeReturns := fake.revokeReturns fake.recordInvocation("Revoke", []interface{}{arg1}) fake.revokeMutex.Unlock() - if fake.RevokeStub != nil { - return fake.RevokeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.revokeReturns return fakeReturns.result1 } @@ -724,15 +733,16 @@ func (fake *FakeUAAClient) UpdatePassword(arg1 string, arg2 string, arg3 string) arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.UpdatePasswordStub + fakeReturns := fake.updatePasswordReturns fake.recordInvocation("UpdatePassword", []interface{}{arg1, arg2, arg3}) fake.updatePasswordMutex.Unlock() - if fake.UpdatePasswordStub != nil { - return fake.UpdatePasswordStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updatePasswordReturns return fakeReturns.result1 } @@ -784,15 +794,16 @@ func (fake *FakeUAAClient) ValidateClientUser(arg1 string) error { fake.validateClientUserArgsForCall = append(fake.validateClientUserArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ValidateClientUserStub + fakeReturns := fake.validateClientUserReturns fake.recordInvocation("ValidateClientUser", []interface{}{arg1}) fake.validateClientUserMutex.Unlock() - if fake.ValidateClientUserStub != nil { - return fake.ValidateClientUserStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.validateClientUserReturns return fakeReturns.result1 } diff --git a/actor/v7action/v7actionfakes/fake_who_am_ier.go b/actor/v7action/v7actionfakes/fake_who_am_ier.go index 2ebcfe961d..78dfee83e9 100644 --- a/actor/v7action/v7actionfakes/fake_who_am_ier.go +++ b/actor/v7action/v7actionfakes/fake_who_am_ier.go @@ -4,9 +4,9 @@ package v7actionfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeWhoAmIer struct { @@ -33,15 +33,16 @@ func (fake *FakeWhoAmIer) WhoAmI() (resources.K8sUser, ccv3.Warnings, error) { ret, specificReturn := fake.whoAmIReturnsOnCall[len(fake.whoAmIArgsForCall)] fake.whoAmIArgsForCall = append(fake.whoAmIArgsForCall, struct { }{}) + stub := fake.WhoAmIStub + fakeReturns := fake.whoAmIReturns fake.recordInvocation("WhoAmI", []interface{}{}) fake.whoAmIMutex.Unlock() - if fake.WhoAmIStub != nil { - return fake.WhoAmIStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.whoAmIReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v7action/version_test.go b/actor/v7action/version_test.go index 2d6f8a5d1d..4cab211fa2 100644 --- a/actor/v7action/version_test.go +++ b/actor/v7action/version_test.go @@ -1,8 +1,8 @@ package v7action_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/actor_test.go b/actor/v7pushaction/actor_test.go index 680147be2a..f9c2cb2b3a 100644 --- a/actor/v7pushaction/actor_test.go +++ b/actor/v7pushaction/actor_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/actualize_test.go b/actor/v7pushaction/actualize_test.go index 434a6d01b6..89f1fbb934 100644 --- a/actor/v7pushaction/actualize_test.go +++ b/actor/v7pushaction/actualize_test.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_bits_package_for_application.go b/actor/v7pushaction/create_bits_package_for_application.go index 811d56888e..b04a0ab919 100644 --- a/actor/v7pushaction/create_bits_package_for_application.go +++ b/actor/v7pushaction/create_bits_package_for_application.go @@ -3,11 +3,11 @@ package v7pushaction import ( "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7pushaction/create_bits_package_for_application_test.go b/actor/v7pushaction/create_bits_package_for_application_test.go index 946636434f..3facaa7dba 100644 --- a/actor/v7pushaction/create_bits_package_for_application_test.go +++ b/actor/v7pushaction/create_bits_package_for_application_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_deployment_for_push_plan.go b/actor/v7pushaction/create_deployment_for_push_plan.go index 029cdc68c3..78a9df5619 100644 --- a/actor/v7pushaction/create_deployment_for_push_plan.go +++ b/actor/v7pushaction/create_deployment_for_push_plan.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" ) func (actor Actor) CreateDeploymentForApplication(pushPlan PushPlan, eventStream chan<- *PushEvent, progressBar ProgressBar) (PushPlan, Warnings, error) { diff --git a/actor/v7pushaction/create_deployment_for_push_plan_test.go b/actor/v7pushaction/create_deployment_for_push_plan_test.go index 1191c433f2..43ff838890 100644 --- a/actor/v7pushaction/create_deployment_for_push_plan_test.go +++ b/actor/v7pushaction/create_deployment_for_push_plan_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "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 9870378cf7..249727424f 100644 --- a/actor/v7pushaction/create_docker_package_for_application_test.go +++ b/actor/v7pushaction/create_docker_package_for_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v7pushaction/create_droplet_for_application.go b/actor/v7pushaction/create_droplet_for_application.go index a2186883d9..e32e79da5d 100644 --- a/actor/v7pushaction/create_droplet_for_application.go +++ b/actor/v7pushaction/create_droplet_for_application.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) const UploadRetries = 3 diff --git a/actor/v7pushaction/create_droplet_for_application_test.go b/actor/v7pushaction/create_droplet_for_application_test.go index af1d259364..e3c22f027a 100644 --- a/actor/v7pushaction/create_droplet_for_application_test.go +++ b/actor/v7pushaction/create_droplet_for_application_test.go @@ -4,12 +4,12 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_push_plans.go b/actor/v7pushaction/create_push_plans.go index 9158dfea7f..718f142217 100644 --- a/actor/v7pushaction/create_push_plans.go +++ b/actor/v7pushaction/create_push_plans.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) // CreatePushPlans returns a set of PushPlan objects based off the inputs diff --git a/actor/v7pushaction/create_push_plans_test.go b/actor/v7pushaction/create_push_plans_test.go index a64668f742..6a93e427ea 100644 --- a/actor/v7pushaction/create_push_plans_test.go +++ b/actor/v7pushaction/create_push_plans_test.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_app_name_override.go b/actor/v7pushaction/handle_app_name_override.go index 2236e35891..9513f39167 100644 --- a/actor/v7pushaction/handle_app_name_override.go +++ b/actor/v7pushaction/handle_app_name_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleAppNameOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_app_name_override_test.go b/actor/v7pushaction/handle_app_name_override_test.go index 0e99ffb59c..86a5775216 100644 --- a/actor/v7pushaction/handle_app_name_override_test.go +++ b/actor/v7pushaction/handle_app_name_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_app_path_override.go b/actor/v7pushaction/handle_app_path_override.go index ff2a2e8e5f..f79119c802 100644 --- a/actor/v7pushaction/handle_app_path_override.go +++ b/actor/v7pushaction/handle_app_path_override.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) // Overrides the path if path is given. Changes empty paths to pwd. Validates paths diff --git a/actor/v7pushaction/handle_app_path_override_test.go b/actor/v7pushaction/handle_app_path_override_test.go index 8baca7cb5f..1fefa74eea 100644 --- a/actor/v7pushaction/handle_app_path_override_test.go +++ b/actor/v7pushaction/handle_app_path_override_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "runtime" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_buildpacks_override.go b/actor/v7pushaction/handle_buildpacks_override.go index 4408a1c887..dbbbce6ee4 100644 --- a/actor/v7pushaction/handle_buildpacks_override.go +++ b/actor/v7pushaction/handle_buildpacks_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleBuildpacksOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_buildpacks_override_test.go b/actor/v7pushaction/handle_buildpacks_override_test.go index 762d40a353..fc0ac9918a 100644 --- a/actor/v7pushaction/handle_buildpacks_override_test.go +++ b/actor/v7pushaction/handle_buildpacks_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_cnb_credentials_override.go b/actor/v7pushaction/handle_cnb_credentials_override.go index 85adf2d3c7..f520372967 100644 --- a/actor/v7pushaction/handle_cnb_credentials_override.go +++ b/actor/v7pushaction/handle_cnb_credentials_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleCNBCredentialsOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_cnb_credentials_override_test.go b/actor/v7pushaction/handle_cnb_credentials_override_test.go index 878fb8e363..3f7d88e450 100644 --- a/actor/v7pushaction/handle_cnb_credentials_override_test.go +++ b/actor/v7pushaction/handle_cnb_credentials_override_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_default_route_override.go b/actor/v7pushaction/handle_default_route_override.go index da907e868e..97f7dee995 100644 --- a/actor/v7pushaction/handle_default_route_override.go +++ b/actor/v7pushaction/handle_default_route_override.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDefaultRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_default_route_override_test.go b/actor/v7pushaction/handle_default_route_override_test.go index b9486f6953..e7b1821501 100644 --- a/actor/v7pushaction/handle_default_route_override_test.go +++ b/actor/v7pushaction/handle_default_route_override_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_disk_override.go b/actor/v7pushaction/handle_disk_override.go index df676cfbd5..715b1e2023 100644 --- a/actor/v7pushaction/handle_disk_override.go +++ b/actor/v7pushaction/handle_disk_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDiskOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_disk_override_test.go b/actor/v7pushaction/handle_disk_override_test.go index ef3f6201ba..b04b4d97ef 100644 --- a/actor/v7pushaction/handle_disk_override_test.go +++ b/actor/v7pushaction/handle_disk_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_docker_image_override.go b/actor/v7pushaction/handle_docker_image_override.go index 715f18c84c..e0a17d13f1 100644 --- a/actor/v7pushaction/handle_docker_image_override.go +++ b/actor/v7pushaction/handle_docker_image_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDockerImageOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_docker_image_override_test.go b/actor/v7pushaction/handle_docker_image_override_test.go index 13e10f7329..ec1e923c44 100644 --- a/actor/v7pushaction/handle_docker_image_override_test.go +++ b/actor/v7pushaction/handle_docker_image_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_docker_username_override.go b/actor/v7pushaction/handle_docker_username_override.go index 5c0eb29d02..dd5376e27c 100644 --- a/actor/v7pushaction/handle_docker_username_override.go +++ b/actor/v7pushaction/handle_docker_username_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDockerUsernameOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_docker_username_override_test.go b/actor/v7pushaction/handle_docker_username_override_test.go index 13a8234101..b974e73649 100644 --- a/actor/v7pushaction/handle_docker_username_override_test.go +++ b/actor/v7pushaction/handle_docker_username_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_droplet_path_override.go b/actor/v7pushaction/handle_droplet_path_override.go index 46971f8e12..12943d29d9 100644 --- a/actor/v7pushaction/handle_droplet_path_override.go +++ b/actor/v7pushaction/handle_droplet_path_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleDropletPathOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_droplet_path_override_test.go b/actor/v7pushaction/handle_droplet_path_override_test.go index 5985960a68..cab56f09ad 100644 --- a/actor/v7pushaction/handle_droplet_path_override_test.go +++ b/actor/v7pushaction/handle_droplet_path_override_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_flag_override_func.go b/actor/v7pushaction/handle_flag_override_func.go index f5507b2f2b..e30dd2e616 100644 --- a/actor/v7pushaction/handle_flag_override_func.go +++ b/actor/v7pushaction/handle_flag_override_func.go @@ -1,5 +1,5 @@ package v7pushaction -import "code.cloudfoundry.org/cli/v8/util/manifestparser" +import "code.cloudfoundry.org/cli/v9/util/manifestparser" type HandleFlagOverrideFunc func(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) diff --git a/actor/v7pushaction/handle_flag_overrides.go b/actor/v7pushaction/handle_flag_overrides.go index 5b23a94325..810df15c48 100644 --- a/actor/v7pushaction/handle_flag_overrides.go +++ b/actor/v7pushaction/handle_flag_overrides.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func (actor Actor) HandleFlagOverrides( diff --git a/actor/v7pushaction/handle_flag_overrides_test.go b/actor/v7pushaction/handle_flag_overrides_test.go index 8e944cba32..d7c1da26c4 100644 --- a/actor/v7pushaction/handle_flag_overrides_test.go +++ b/actor/v7pushaction/handle_flag_overrides_test.go @@ -1,8 +1,8 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_health_check_endpoint_override.go b/actor/v7pushaction/handle_health_check_endpoint_override.go index fe101ae0d4..f5a0381858 100644 --- a/actor/v7pushaction/handle_health_check_endpoint_override.go +++ b/actor/v7pushaction/handle_health_check_endpoint_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleHealthCheckEndpointOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_endpoint_override_test.go b/actor/v7pushaction/handle_health_check_endpoint_override_test.go index f117da6513..08b0bfea5c 100644 --- a/actor/v7pushaction/handle_health_check_endpoint_override_test.go +++ b/actor/v7pushaction/handle_health_check_endpoint_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_health_check_timeout_override.go b/actor/v7pushaction/handle_health_check_timeout_override.go index 77616ec9f5..6f4acd54a7 100644 --- a/actor/v7pushaction/handle_health_check_timeout_override.go +++ b/actor/v7pushaction/handle_health_check_timeout_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleHealthCheckTimeoutOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_timeout_override_test.go b/actor/v7pushaction/handle_health_check_timeout_override_test.go index 6a47c22f74..9d53e7b973 100644 --- a/actor/v7pushaction/handle_health_check_timeout_override_test.go +++ b/actor/v7pushaction/handle_health_check_timeout_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_health_check_type_override.go b/actor/v7pushaction/handle_health_check_type_override.go index 29acc84c4e..b4b9d7a679 100644 --- a/actor/v7pushaction/handle_health_check_type_override.go +++ b/actor/v7pushaction/handle_health_check_type_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleHealthCheckTypeOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_health_check_type_override_test.go b/actor/v7pushaction/handle_health_check_type_override_test.go index cdbfc7ce1f..f86e56b0bb 100644 --- a/actor/v7pushaction/handle_health_check_type_override_test.go +++ b/actor/v7pushaction/handle_health_check_type_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_instances_override.go b/actor/v7pushaction/handle_instances_override.go index 2f1ed64509..144e7fd62f 100644 --- a/actor/v7pushaction/handle_instances_override.go +++ b/actor/v7pushaction/handle_instances_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleInstancesOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_instances_override_test.go b/actor/v7pushaction/handle_instances_override_test.go index 007441da6d..5b445c1fa3 100644 --- a/actor/v7pushaction/handle_instances_override_test.go +++ b/actor/v7pushaction/handle_instances_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_lifecycle_override.go b/actor/v7pushaction/handle_lifecycle_override.go index befa869b01..5906fcf93a 100644 --- a/actor/v7pushaction/handle_lifecycle_override.go +++ b/actor/v7pushaction/handle_lifecycle_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleLifecycleOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_log_rate_limit_override.go b/actor/v7pushaction/handle_log_rate_limit_override.go index 0e6ce5be18..1d329843b2 100644 --- a/actor/v7pushaction/handle_log_rate_limit_override.go +++ b/actor/v7pushaction/handle_log_rate_limit_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleLogRateLimitOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_log_rate_limit_override_test.go b/actor/v7pushaction/handle_log_rate_limit_override_test.go index 3c5e83aae7..34b968b2c1 100644 --- a/actor/v7pushaction/handle_log_rate_limit_override_test.go +++ b/actor/v7pushaction/handle_log_rate_limit_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_memory_override.go b/actor/v7pushaction/handle_memory_override.go index 77ad256f5b..5c9507a60e 100644 --- a/actor/v7pushaction/handle_memory_override.go +++ b/actor/v7pushaction/handle_memory_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleMemoryOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_memory_override_test.go b/actor/v7pushaction/handle_memory_override_test.go index 7b4825dc1b..29a2a7515c 100644 --- a/actor/v7pushaction/handle_memory_override_test.go +++ b/actor/v7pushaction/handle_memory_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_no_route_override.go b/actor/v7pushaction/handle_no_route_override.go index 11ff5744f8..2d823f4bcb 100644 --- a/actor/v7pushaction/handle_no_route_override.go +++ b/actor/v7pushaction/handle_no_route_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleNoRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_no_route_override_test.go b/actor/v7pushaction/handle_no_route_override_test.go index daffcb78d0..e381a126f9 100644 --- a/actor/v7pushaction/handle_no_route_override_test.go +++ b/actor/v7pushaction/handle_no_route_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_random_route_override.go b/actor/v7pushaction/handle_random_route_override.go index a3f069b560..4d0306643c 100644 --- a/actor/v7pushaction/handle_random_route_override.go +++ b/actor/v7pushaction/handle_random_route_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleRandomRouteOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_random_route_override_test.go b/actor/v7pushaction/handle_random_route_override_test.go index d4e7c95e3a..40081a5476 100644 --- a/actor/v7pushaction/handle_random_route_override_test.go +++ b/actor/v7pushaction/handle_random_route_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_stack_override.go b/actor/v7pushaction/handle_stack_override.go index 4741052d4c..095f73ec50 100644 --- a/actor/v7pushaction/handle_stack_override.go +++ b/actor/v7pushaction/handle_stack_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleStackOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_stack_override_test.go b/actor/v7pushaction/handle_stack_override_test.go index af2191a72c..0e76dd387b 100644 --- a/actor/v7pushaction/handle_stack_override_test.go +++ b/actor/v7pushaction/handle_stack_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_start_command_override.go b/actor/v7pushaction/handle_start_command_override.go index be6a1de2b0..a818326b66 100644 --- a/actor/v7pushaction/handle_start_command_override.go +++ b/actor/v7pushaction/handle_start_command_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleStartCommandOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_start_command_override_test.go b/actor/v7pushaction/handle_start_command_override_test.go index b1143bca4d..5295e9d075 100644 --- a/actor/v7pushaction/handle_start_command_override_test.go +++ b/actor/v7pushaction/handle_start_command_override_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/handle_strategy_override.go b/actor/v7pushaction/handle_strategy_override.go index 55ab81bf8a..93be419835 100644 --- a/actor/v7pushaction/handle_strategy_override.go +++ b/actor/v7pushaction/handle_strategy_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleStrategyOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_strategy_override_test.go b/actor/v7pushaction/handle_strategy_override_test.go index f716b65c8b..8c16b97b73 100644 --- a/actor/v7pushaction/handle_strategy_override_test.go +++ b/actor/v7pushaction/handle_strategy_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_task_override.go b/actor/v7pushaction/handle_task_override.go index 6ab978f7ec..d39e064141 100644 --- a/actor/v7pushaction/handle_task_override.go +++ b/actor/v7pushaction/handle_task_override.go @@ -1,8 +1,8 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) func HandleTaskOverride(manifest manifestparser.Manifest, overrides FlagOverrides) (manifestparser.Manifest, error) { diff --git a/actor/v7pushaction/handle_task_override_test.go b/actor/v7pushaction/handle_task_override_test.go index 85e004f385..e7f9eb5cdb 100644 --- a/actor/v7pushaction/handle_task_override_test.go +++ b/actor/v7pushaction/handle_task_override_test.go @@ -1,10 +1,10 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/manifestparser" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/push_plan.go b/actor/v7pushaction/push_plan.go index f66dfe18cf..a1a108dcee 100644 --- a/actor/v7pushaction/push_plan.go +++ b/actor/v7pushaction/push_plan.go @@ -3,11 +3,11 @@ package v7pushaction import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" "github.com/cloudfoundry/bosh-cli/director/template" ) diff --git a/actor/v7pushaction/resource_match.go b/actor/v7pushaction/resource_match.go index af2e4dabee..cf630bfc3b 100644 --- a/actor/v7pushaction/resource_match.go +++ b/actor/v7pushaction/resource_match.go @@ -1,6 +1,6 @@ package v7pushaction -import "code.cloudfoundry.org/cli/v8/actor/sharedaction" +import "code.cloudfoundry.org/cli/v9/actor/sharedaction" // MatchResources returns back a list of matched and unmatched resources for the provided resources. func (actor Actor) MatchResources(resources []sharedaction.V3Resource) ([]sharedaction.V3Resource, []sharedaction.V3Resource, Warnings, error) { diff --git a/actor/v7pushaction/resource_match_test.go b/actor/v7pushaction/resource_match_test.go index e4fb9a5586..6b491e635b 100644 --- a/actor/v7pushaction/resource_match_test.go +++ b/actor/v7pushaction/resource_match_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "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 72ccf245ea..b2c10da093 100644 --- a/actor/v7pushaction/restart_application_test.go +++ b/actor/v7pushaction/restart_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/sequence.go b/actor/v7pushaction/sequence.go index b45290174a..1943fb3fdb 100644 --- a/actor/v7pushaction/sequence.go +++ b/actor/v7pushaction/sequence.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) func ShouldCreateBitsPackage(plan PushPlan) bool { diff --git a/actor/v7pushaction/sequence_test.go b/actor/v7pushaction/sequence_test.go index 756611989f..9fb488f116 100644 --- a/actor/v7pushaction/sequence_test.go +++ b/actor/v7pushaction/sequence_test.go @@ -1,11 +1,11 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/resources" . "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 2f9c3f727c..5d56d97039 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 @@ -1,8 +1,8 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "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 ac2c94901b..f5631cd155 100644 --- a/actor/v7pushaction/set_droplet_for_application_test.go +++ b/actor/v7pushaction/set_droplet_for_application_test.go @@ -3,10 +3,10 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_all_resources_for_push_plan.go b/actor/v7pushaction/setup_all_resources_for_push_plan.go index 9c743b056b..1e955687bc 100644 --- a/actor/v7pushaction/setup_all_resources_for_push_plan.go +++ b/actor/v7pushaction/setup_all_resources_for_push_plan.go @@ -4,8 +4,8 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) func (actor Actor) SetupAllResourcesForPushPlan(pushPlan PushPlan, overrides FlagOverrides) (PushPlan, error) { 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 373a22b90c..014d75bebd 100644 --- a/actor/v7pushaction/setup_all_resources_for_push_plan_test.go +++ b/actor/v7pushaction/setup_all_resources_for_push_plan_test.go @@ -4,11 +4,11 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/setup_deployment_information_for_push_plan.go b/actor/v7pushaction/setup_deployment_information_for_push_plan.go index 474554e609..08642a849b 100644 --- a/actor/v7pushaction/setup_deployment_information_for_push_plan.go +++ b/actor/v7pushaction/setup_deployment_information_for_push_plan.go @@ -1,6 +1,6 @@ package v7pushaction -import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" func SetupDeploymentInformationForPushPlan(pushPlan PushPlan, overrides FlagOverrides) (PushPlan, error) { pushPlan.Strategy = overrides.Strategy diff --git a/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go b/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go index 24f5a5d904..b62694d9f9 100644 --- a/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go +++ b/actor/v7pushaction/setup_deployment_information_for_push_plan_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "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 e714110064..939a72b1eb 100644 --- a/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go +++ b/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "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 ae224fdf80..7dba50c249 100644 --- a/actor/v7pushaction/setup_no_start_for_push_plan_test.go +++ b/actor/v7pushaction/setup_no_start_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "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 be6366f4b7..378fa3784d 100644 --- a/actor/v7pushaction/setup_no_wait_for_push_plan_test.go +++ b/actor/v7pushaction/setup_no_wait_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "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 5f2963274d..b6d3a58778 100644 --- a/actor/v7pushaction/setup_task_app_for_push_plan_test.go +++ b/actor/v7pushaction/setup_task_app_for_push_plan_test.go @@ -1,7 +1,7 @@ package v7pushaction_test import ( - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/shared_actor.go b/actor/v7pushaction/shared_actor.go index dc8f9259be..f48f2d9dcb 100644 --- a/actor/v7pushaction/shared_actor.go +++ b/actor/v7pushaction/shared_actor.go @@ -3,7 +3,7 @@ package v7pushaction import ( "io" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.ReadCloser diff --git a/actor/v7pushaction/stage_package_for_application_test.go b/actor/v7pushaction/stage_package_for_application_test.go index bd09bb9b8a..3e610b95ac 100644 --- a/actor/v7pushaction/stage_package_for_application_test.go +++ b/actor/v7pushaction/stage_package_for_application_test.go @@ -3,10 +3,10 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/stop_application.go b/actor/v7pushaction/stop_application.go index 947dbe7f5f..e4c6eabfc9 100644 --- a/actor/v7pushaction/stop_application.go +++ b/actor/v7pushaction/stop_application.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7pushaction/stop_application_test.go b/actor/v7pushaction/stop_application_test.go index 1fc37ccd12..9d8af0113f 100644 --- a/actor/v7pushaction/stop_application_test.go +++ b/actor/v7pushaction/stop_application_test.go @@ -3,11 +3,11 @@ package v7pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/v7_actor.go b/actor/v7pushaction/v7_actor.go index 5b6e5005a6..0dbe0659f3 100644 --- a/actor/v7pushaction/v7_actor.go +++ b/actor/v7pushaction/v7_actor.go @@ -3,9 +3,9 @@ package v7pushaction import ( "io" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V7Actor diff --git a/actor/v7pushaction/v7pushaction_suite_test.go b/actor/v7pushaction/v7pushaction_suite_test.go index 050a13f6f4..9147fd7209 100644 --- a/actor/v7pushaction/v7pushaction_suite_test.go +++ b/actor/v7pushaction/v7pushaction_suite_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - . "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction/v7pushactionfakes" + . "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction/v7pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go b/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go index 1294227060..2e6a43ae7e 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" ) type FakeProgressBar struct { @@ -32,15 +32,16 @@ func (fake *FakeProgressBar) NewProgressBarWrapper(arg1 io.Reader, arg2 int64) i arg1 io.Reader arg2 int64 }{arg1, arg2}) + stub := fake.NewProgressBarWrapperStub + fakeReturns := fake.newProgressBarWrapperReturns fake.recordInvocation("NewProgressBarWrapper", []interface{}{arg1, arg2}) fake.newProgressBarWrapperMutex.Unlock() - if fake.NewProgressBarWrapperStub != nil { - return fake.NewProgressBarWrapperStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newProgressBarWrapperReturns return fakeReturns.result1 } diff --git a/actor/v7pushaction/v7pushactionfakes/fake_read_closer.go b/actor/v7pushaction/v7pushactionfakes/fake_read_closer.go index 22f42a76ee..2adfd1e23b 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_read_closer.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_read_closer.go @@ -39,15 +39,16 @@ func (fake *FakeReadCloser) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -97,15 +98,16 @@ func (fake *FakeReadCloser) Read(arg1 []byte) (int, error) { fake.readArgsForCall = append(fake.readArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1Copy}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go b/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go index 6244f06f6b..0ab156444a 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" ) type FakeSharedActor struct { @@ -89,15 +89,16 @@ func (fake *FakeSharedActor) GatherArchiveResources(arg1 string) ([]sharedaction fake.gatherArchiveResourcesArgsForCall = append(fake.gatherArchiveResourcesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GatherArchiveResourcesStub + fakeReturns := fake.gatherArchiveResourcesReturns fake.recordInvocation("GatherArchiveResources", []interface{}{arg1}) fake.gatherArchiveResourcesMutex.Unlock() - if fake.GatherArchiveResourcesStub != nil { - return fake.GatherArchiveResourcesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.gatherArchiveResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -152,15 +153,16 @@ func (fake *FakeSharedActor) GatherDirectoryResources(arg1 string) ([]sharedacti fake.gatherDirectoryResourcesArgsForCall = append(fake.gatherDirectoryResourcesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GatherDirectoryResourcesStub + fakeReturns := fake.gatherDirectoryResourcesReturns fake.recordInvocation("GatherDirectoryResources", []interface{}{arg1}) fake.gatherDirectoryResourcesMutex.Unlock() - if fake.GatherDirectoryResourcesStub != nil { - return fake.GatherDirectoryResourcesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.gatherDirectoryResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -215,15 +217,16 @@ func (fake *FakeSharedActor) ReadArchive(arg1 string) (io.ReadCloser, int64, err fake.readArchiveArgsForCall = append(fake.readArchiveArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadArchiveStub + fakeReturns := fake.readArchiveReturns fake.recordInvocation("ReadArchive", []interface{}{arg1}) fake.readArchiveMutex.Unlock() - if fake.ReadArchiveStub != nil { - return fake.ReadArchiveStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.readArchiveReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -287,15 +290,16 @@ func (fake *FakeSharedActor) ZipArchiveResources(arg1 string, arg2 []sharedactio arg1 string arg2 []sharedaction.Resource }{arg1, arg2Copy}) + stub := fake.ZipArchiveResourcesStub + fakeReturns := fake.zipArchiveResourcesReturns fake.recordInvocation("ZipArchiveResources", []interface{}{arg1, arg2Copy}) fake.zipArchiveResourcesMutex.Unlock() - if fake.ZipArchiveResourcesStub != nil { - return fake.ZipArchiveResourcesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.zipArchiveResourcesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -356,15 +360,16 @@ func (fake *FakeSharedActor) ZipDirectoryResources(arg1 string, arg2 []sharedact arg1 string arg2 []sharedaction.Resource }{arg1, arg2Copy}) + stub := fake.ZipDirectoryResourcesStub + fakeReturns := fake.zipDirectoryResourcesReturns fake.recordInvocation("ZipDirectoryResources", []interface{}{arg1, arg2Copy}) fake.zipDirectoryResourcesMutex.Unlock() - if fake.ZipDirectoryResourcesStub != nil { - return fake.ZipDirectoryResourcesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.zipDirectoryResourcesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go index 9de5b3510b..36bf8cf836 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go @@ -5,10 +5,10 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeV7Actor struct { diff --git a/actor/versioncheck/minimum_version_check_test.go b/actor/versioncheck/minimum_version_check_test.go index 3f4743e3fc..3369b1cbd8 100644 --- a/actor/versioncheck/minimum_version_check_test.go +++ b/actor/versioncheck/minimum_version_check_test.go @@ -1,7 +1,7 @@ package versioncheck_test import ( - . "code.cloudfoundry.org/cli/v8/actor/versioncheck" + . "code.cloudfoundry.org/cli/v9/actor/versioncheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccerror/multi_error_test.go b/api/cloudcontroller/ccerror/multi_error_test.go index a1e40f3c18..84ca9f78eb 100644 --- a/api/cloudcontroller/ccerror/multi_error_test.go +++ b/api/cloudcontroller/ccerror/multi_error_test.go @@ -3,7 +3,7 @@ package ccerror_test import ( "net/http" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "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 a654ca2f12..788f3d7ff8 100644 --- a/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go +++ b/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "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 0b122b11d5..1f2d458c1d 100644 --- a/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go +++ b/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/user_not_found.go b/api/cloudcontroller/ccerror/user_not_found.go index 13e3a90207..ec85756f3d 100644 --- a/api/cloudcontroller/ccerror/user_not_found.go +++ b/api/cloudcontroller/ccerror/user_not_found.go @@ -3,7 +3,7 @@ package ccerror import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // UserNotFoundError is returned when a role does not exist. diff --git a/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go b/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go index c40445248a..02922b27ee 100644 --- a/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go +++ b/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccerror/v3_job_failed_error.go b/api/cloudcontroller/ccerror/v3_job_failed_error.go index 732cc89873..9ad08dc93b 100644 --- a/api/cloudcontroller/ccerror/v3_job_failed_error.go +++ b/api/cloudcontroller/ccerror/v3_job_failed_error.go @@ -3,7 +3,7 @@ package ccerror import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // V3JobFailedError represents a failed Cloud Controller Job. It wraps the error diff --git a/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go b/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go index ece7202bfd..1d1e504f63 100644 --- a/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go +++ b/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go @@ -3,7 +3,7 @@ package ccerror_test import ( "net/http" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/application.go b/api/cloudcontroller/ccv3/application.go index 8de1d3b1b1..c56b91c872 100644 --- a/api/cloudcontroller/ccv3/application.go +++ b/api/cloudcontroller/ccv3/application.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateApplication creates an application with the given settings. diff --git a/api/cloudcontroller/ccv3/application_feature.go b/api/cloudcontroller/ccv3/application_feature.go index aa4f2ccc4b..caf9cdb83d 100644 --- a/api/cloudcontroller/ccv3/application_feature.go +++ b/api/cloudcontroller/ccv3/application_feature.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) type SSHEnabled struct { diff --git a/api/cloudcontroller/ccv3/application_feature_test.go b/api/cloudcontroller/ccv3/application_feature_test.go index 0c60b26953..92e2e995e4 100644 --- a/api/cloudcontroller/ccv3/application_feature_test.go +++ b/api/cloudcontroller/ccv3/application_feature_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "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 5352fb02e7..82dd932456 100644 --- a/api/cloudcontroller/ccv3/application_test.go +++ b/api/cloudcontroller/ccv3/application_test.go @@ -4,13 +4,13 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/build.go b/api/cloudcontroller/ccv3/build.go index 67e082ee9f..8ece50c8c4 100644 --- a/api/cloudcontroller/ccv3/build.go +++ b/api/cloudcontroller/ccv3/build.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateBuild creates the given build, requires Package GUID to be set on the diff --git a/api/cloudcontroller/ccv3/build_test.go b/api/cloudcontroller/ccv3/build_test.go index 33c799b8ba..ffb30f8489 100644 --- a/api/cloudcontroller/ccv3/build_test.go +++ b/api/cloudcontroller/ccv3/build_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/buildpack.go b/api/cloudcontroller/ccv3/buildpack.go index f310cbf447..7e1514bdf2 100644 --- a/api/cloudcontroller/ccv3/buildpack.go +++ b/api/cloudcontroller/ccv3/buildpack.go @@ -3,9 +3,9 @@ package ccv3 import ( "io" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/uploads" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateBuildpack creates a buildpack with the given settings, Type and the diff --git a/api/cloudcontroller/ccv3/buildpack_test.go b/api/cloudcontroller/ccv3/buildpack_test.go index 72be1b23d7..3db0d301f2 100644 --- a/api/cloudcontroller/ccv3/buildpack_test.go +++ b/api/cloudcontroller/ccv3/buildpack_test.go @@ -8,16 +8,16 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/resources" . "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 a41a95fd5e..d500b5fd6a 100644 --- a/api/cloudcontroller/ccv3/ccv3_suite_test.go +++ b/api/cloudcontroller/ccv3/ccv3_suite_test.go @@ -5,8 +5,8 @@ import ( "log" "testing" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go index 7d4575eb1c..0324ac5ef0 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" ) type FakeClock struct { @@ -28,15 +28,16 @@ func (fake *FakeClock) Now() time.Time { ret, specificReturn := fake.nowReturnsOnCall[len(fake.nowArgsForCall)] fake.nowArgsForCall = append(fake.nowArgsForCall, struct { }{}) + stub := fake.NowStub + fakeReturns := fake.nowReturns fake.recordInvocation("Now", []interface{}{}) fake.nowMutex.Unlock() - if fake.NowStub != nil { - return fake.NowStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.nowReturns return fakeReturns.result1 } diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go index 7adb3e228e..e8cf670369 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go @@ -4,8 +4,8 @@ package ccv3fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" ) type FakeConnectionWrapper struct { @@ -43,15 +43,16 @@ func (fake *FakeConnectionWrapper) Make(arg1 *cloudcontroller.Request, arg2 *clo arg1 *cloudcontroller.Request arg2 *cloudcontroller.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } @@ -103,15 +104,16 @@ func (fake *FakeConnectionWrapper) Wrap(arg1 cloudcontroller.Connection) cloudco fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 cloudcontroller.Connection }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go index 09e6ccf14c..395fb77fea 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_reader.go @@ -35,15 +35,16 @@ func (fake *FakeReader) Read(arg1 []byte) (int, error) { fake.readArgsForCall = append(fake.readArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1Copy}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go index 8eadd43bc8..1f387b5c54 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go @@ -6,8 +6,8 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) type FakeRequester struct { @@ -140,9 +140,10 @@ func (fake *FakeRequester) InitializeConnection(arg1 ccv3.TargetSettings) { fake.initializeConnectionArgsForCall = append(fake.initializeConnectionArgsForCall, struct { arg1 ccv3.TargetSettings }{arg1}) + stub := fake.InitializeConnectionStub fake.recordInvocation("InitializeConnection", []interface{}{arg1}) fake.initializeConnectionMutex.Unlock() - if fake.InitializeConnectionStub != nil { + if stub != nil { fake.InitializeConnectionStub(arg1) } } @@ -171,9 +172,10 @@ func (fake *FakeRequester) InitializeRouter(arg1 string) { fake.initializeRouterArgsForCall = append(fake.initializeRouterArgsForCall, struct { arg1 string }{arg1}) + stub := fake.InitializeRouterStub fake.recordInvocation("InitializeRouter", []interface{}{arg1}) fake.initializeRouterMutex.Unlock() - if fake.InitializeRouterStub != nil { + if stub != nil { fake.InitializeRouterStub(arg1) } } @@ -203,15 +205,16 @@ func (fake *FakeRequester) MakeListRequest(arg1 ccv3.RequestParams) (ccv3.Includ fake.makeListRequestArgsForCall = append(fake.makeListRequestArgsForCall, struct { arg1 ccv3.RequestParams }{arg1}) + stub := fake.MakeListRequestStub + fakeReturns := fake.makeListRequestReturns fake.recordInvocation("MakeListRequest", []interface{}{arg1}) fake.makeListRequestMutex.Unlock() - if fake.MakeListRequestStub != nil { - return fake.MakeListRequestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeListRequestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -269,15 +272,16 @@ func (fake *FakeRequester) MakeRequest(arg1 ccv3.RequestParams) (ccv3.JobURL, cc fake.makeRequestArgsForCall = append(fake.makeRequestArgsForCall, struct { arg1 ccv3.RequestParams }{arg1}) + stub := fake.MakeRequestStub + fakeReturns := fake.makeRequestReturns fake.recordInvocation("MakeRequest", []interface{}{arg1}) fake.makeRequestMutex.Unlock() - if fake.MakeRequestStub != nil { - return fake.MakeRequestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -337,15 +341,16 @@ func (fake *FakeRequester) MakeRequestReceiveRaw(arg1 string, arg2 internal.Para arg2 internal.Params arg3 string }{arg1, arg2, arg3}) + stub := fake.MakeRequestReceiveRawStub + fakeReturns := fake.makeRequestReceiveRawReturns fake.recordInvocation("MakeRequestReceiveRaw", []interface{}{arg1, arg2, arg3}) fake.makeRequestReceiveRawMutex.Unlock() - if fake.MakeRequestReceiveRawStub != nil { - return fake.MakeRequestReceiveRawStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestReceiveRawReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -412,15 +417,16 @@ func (fake *FakeRequester) MakeRequestSendRaw(arg1 string, arg2 internal.Params, arg4 string arg5 interface{} }{arg1, arg2, arg3Copy, arg4, arg5}) + stub := fake.MakeRequestSendRawStub + fakeReturns := fake.makeRequestSendRawReturns fake.recordInvocation("MakeRequestSendRaw", []interface{}{arg1, arg2, arg3Copy, arg4, arg5}) fake.makeRequestSendRawMutex.Unlock() - if fake.MakeRequestSendRawStub != nil { - return fake.MakeRequestSendRawStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestSendRawReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -486,15 +492,16 @@ func (fake *FakeRequester) MakeRequestSendReceiveRaw(arg1 string, arg2 string, a arg3 http.Header arg4 []byte }{arg1, arg2, arg3, arg4Copy}) + stub := fake.MakeRequestSendReceiveRawStub + fakeReturns := fake.makeRequestSendReceiveRawReturns fake.recordInvocation("MakeRequestSendReceiveRaw", []interface{}{arg1, arg2, arg3, arg4Copy}) fake.makeRequestSendReceiveRawMutex.Unlock() - if fake.MakeRequestSendReceiveRawStub != nil { - return fake.MakeRequestSendReceiveRawStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestSendReceiveRawReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -558,15 +565,16 @@ func (fake *FakeRequester) MakeRequestUploadAsync(arg1 string, arg2 internal.Par arg6 interface{} arg7 <-chan error }{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) + stub := fake.MakeRequestUploadAsyncStub + fakeReturns := fake.makeRequestUploadAsyncReturns fake.recordInvocation("MakeRequestUploadAsync", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) fake.makeRequestUploadAsyncMutex.Unlock() - if fake.MakeRequestUploadAsyncStub != nil { - return fake.MakeRequestUploadAsyncStub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.makeRequestUploadAsyncReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -623,9 +631,10 @@ func (fake *FakeRequester) WrapConnection(arg1 ccv3.ConnectionWrapper) { fake.wrapConnectionArgsForCall = append(fake.wrapConnectionArgsForCall, struct { arg1 ccv3.ConnectionWrapper }{arg1}) + stub := fake.WrapConnectionStub fake.recordInvocation("WrapConnection", []interface{}{arg1}) fake.wrapConnectionMutex.Unlock() - if fake.WrapConnectionStub != nil { + if stub != nil { fake.WrapConnectionStub(arg1) } } diff --git a/api/cloudcontroller/ccv3/client.go b/api/cloudcontroller/ccv3/client.go index fefdc642a8..bbccb6c171 100644 --- a/api/cloudcontroller/ccv3/client.go +++ b/api/cloudcontroller/ccv3/client.go @@ -77,7 +77,7 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) // Warnings are a collection of warnings that the Cloud Controller can return diff --git a/api/cloudcontroller/ccv3/client_test.go b/api/cloudcontroller/ccv3/client_test.go index 7dfb2af68d..9669cf6884 100644 --- a/api/cloudcontroller/ccv3/client_test.go +++ b/api/cloudcontroller/ccv3/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/connection_wrapper.go b/api/cloudcontroller/ccv3/connection_wrapper.go index d3c2d27e43..4af2406970 100644 --- a/api/cloudcontroller/ccv3/connection_wrapper.go +++ b/api/cloudcontroller/ccv3/connection_wrapper.go @@ -1,6 +1,6 @@ package ccv3 -import "code.cloudfoundry.org/cli/v8/api/cloudcontroller" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ConnectionWrapper diff --git a/api/cloudcontroller/ccv3/deployment.go b/api/cloudcontroller/ccv3/deployment.go index 9aa469bbb9..d08a7a4404 100644 --- a/api/cloudcontroller/ccv3/deployment.go +++ b/api/cloudcontroller/ccv3/deployment.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) ContinueDeployment(deploymentGUID string) (Warnings, error) { diff --git a/api/cloudcontroller/ccv3/deployment_test.go b/api/cloudcontroller/ccv3/deployment_test.go index f49b05ae3d..68372938ac 100644 --- a/api/cloudcontroller/ccv3/deployment_test.go +++ b/api/cloudcontroller/ccv3/deployment_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/domain.go b/api/cloudcontroller/ccv3/domain.go index c933d17e70..f39c589a89 100644 --- a/api/cloudcontroller/ccv3/domain.go +++ b/api/cloudcontroller/ccv3/domain.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) type SharedOrgs struct { diff --git a/api/cloudcontroller/ccv3/domain_test.go b/api/cloudcontroller/ccv3/domain_test.go index ecd529e62c..cce17cf403 100644 --- a/api/cloudcontroller/ccv3/domain_test.go +++ b/api/cloudcontroller/ccv3/domain_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/droplet.go b/api/cloudcontroller/ccv3/droplet.go index e846864caf..fc2a1009ef 100644 --- a/api/cloudcontroller/ccv3/droplet.go +++ b/api/cloudcontroller/ccv3/droplet.go @@ -3,10 +3,10 @@ package ccv3 import ( "io" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/uploads" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v9/resources" ) type DropletCreateRequest struct { diff --git a/api/cloudcontroller/ccv3/droplet_test.go b/api/cloudcontroller/ccv3/droplet_test.go index 1d0696d61a..f5c127a080 100644 --- a/api/cloudcontroller/ccv3/droplet_test.go +++ b/api/cloudcontroller/ccv3/droplet_test.go @@ -7,15 +7,15 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/environment.go b/api/cloudcontroller/ccv3/environment.go index 28b3c1be2e..b705b3ef24 100644 --- a/api/cloudcontroller/ccv3/environment.go +++ b/api/cloudcontroller/ccv3/environment.go @@ -1,7 +1,7 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) // Environment variables that will be provided to an app at runtime. It will diff --git a/api/cloudcontroller/ccv3/environment_test.go b/api/cloudcontroller/ccv3/environment_test.go index 1b95f7af8f..bb915cdd3f 100644 --- a/api/cloudcontroller/ccv3/environment_test.go +++ b/api/cloudcontroller/ccv3/environment_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/environment_variables.go b/api/cloudcontroller/ccv3/environment_variables.go index e8384790c7..ebf5b3455d 100644 --- a/api/cloudcontroller/ccv3/environment_variables.go +++ b/api/cloudcontroller/ccv3/environment_variables.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // EnvironmentVariables represents the environment variables that can be set on diff --git a/api/cloudcontroller/ccv3/environment_variables_test.go b/api/cloudcontroller/ccv3/environment_variables_test.go index 2f4e227dc9..b923d6d7e8 100644 --- a/api/cloudcontroller/ccv3/environment_variables_test.go +++ b/api/cloudcontroller/ccv3/environment_variables_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/errors.go b/api/cloudcontroller/ccv3/errors.go index a153545dd2..f018e89b68 100644 --- a/api/cloudcontroller/ccv3/errors.go +++ b/api/cloudcontroller/ccv3/errors.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) const ( diff --git a/api/cloudcontroller/ccv3/errors_test.go b/api/cloudcontroller/ccv3/errors_test.go index 7e633d0555..21538706b4 100644 --- a/api/cloudcontroller/ccv3/errors_test.go +++ b/api/cloudcontroller/ccv3/errors_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/event.go b/api/cloudcontroller/ccv3/event.go index 685736c742..cf0a13a9b7 100644 --- a/api/cloudcontroller/ccv3/event.go +++ b/api/cloudcontroller/ccv3/event.go @@ -3,8 +3,8 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) type Event struct { diff --git a/api/cloudcontroller/ccv3/event_test.go b/api/cloudcontroller/ccv3/event_test.go index 643fd555a3..86a4cbd7b4 100644 --- a/api/cloudcontroller/ccv3/event_test.go +++ b/api/cloudcontroller/ccv3/event_test.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/feature_flag.go b/api/cloudcontroller/ccv3/feature_flag.go index 98da5cb50c..790e3206c3 100644 --- a/api/cloudcontroller/ccv3/feature_flag.go +++ b/api/cloudcontroller/ccv3/feature_flag.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetFeatureFlag(flagName string) (resources.FeatureFlag, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/feature_flag_test.go b/api/cloudcontroller/ccv3/feature_flag_test.go index 121f62e1fa..6227cf5876 100644 --- a/api/cloudcontroller/ccv3/feature_flag_test.go +++ b/api/cloudcontroller/ccv3/feature_flag_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/included_resources.go b/api/cloudcontroller/ccv3/included_resources.go index 5a192ffae3..411d391a0b 100644 --- a/api/cloudcontroller/ccv3/included_resources.go +++ b/api/cloudcontroller/ccv3/included_resources.go @@ -1,6 +1,6 @@ package ccv3 -import "code.cloudfoundry.org/cli/v8/resources" +import "code.cloudfoundry.org/cli/v9/resources" type IncludedResources struct { Users []resources.User `json:"users,omitempty"` diff --git a/api/cloudcontroller/ccv3/info.go b/api/cloudcontroller/ccv3/info.go index 12afec65b7..07acc168ee 100644 --- a/api/cloudcontroller/ccv3/info.go +++ b/api/cloudcontroller/ccv3/info.go @@ -3,9 +3,9 @@ package ccv3 import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/resources" ) type InfoLinks struct { diff --git a/api/cloudcontroller/ccv3/info_test.go b/api/cloudcontroller/ccv3/info_test.go index 5ac21ff43a..b3e0ef9b9f 100644 --- a/api/cloudcontroller/ccv3/info_test.go +++ b/api/cloudcontroller/ccv3/info_test.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/internal/routing_test.go b/api/cloudcontroller/ccv3/internal/routing_test.go index 60666e5980..ff3f68f5f1 100644 --- a/api/cloudcontroller/ccv3/internal/routing_test.go +++ b/api/cloudcontroller/ccv3/internal/routing_test.go @@ -3,7 +3,7 @@ package internal_test import ( "net/http" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/isolation_segment.go b/api/cloudcontroller/ccv3/isolation_segment.go index c712391d5a..b7f56aa97a 100644 --- a/api/cloudcontroller/ccv3/isolation_segment.go +++ b/api/cloudcontroller/ccv3/isolation_segment.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateIsolationSegment will create an Isolation Segment on the Cloud diff --git a/api/cloudcontroller/ccv3/isolation_segment_test.go b/api/cloudcontroller/ccv3/isolation_segment_test.go index af8719d7c0..f7dd7117e0 100644 --- a/api/cloudcontroller/ccv3/isolation_segment_test.go +++ b/api/cloudcontroller/ccv3/isolation_segment_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/job.go b/api/cloudcontroller/ccv3/job.go index 63189a47f6..7f0cc31cf2 100644 --- a/api/cloudcontroller/ccv3/job.go +++ b/api/cloudcontroller/ccv3/job.go @@ -3,8 +3,8 @@ package ccv3 import ( "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Job represents a Cloud Controller Job. diff --git a/api/cloudcontroller/ccv3/job_test.go b/api/cloudcontroller/ccv3/job_test.go index e538a08839..71424bc5a1 100644 --- a/api/cloudcontroller/ccv3/job_test.go +++ b/api/cloudcontroller/ccv3/job_test.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/job_url.go b/api/cloudcontroller/ccv3/job_url.go index 49ae539030..8d65440769 100644 --- a/api/cloudcontroller/ccv3/job_url.go +++ b/api/cloudcontroller/ccv3/job_url.go @@ -1,7 +1,7 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) // JobURL is the URL to a given Job. diff --git a/api/cloudcontroller/ccv3/job_url_test.go b/api/cloudcontroller/ccv3/job_url_test.go index 4d077daa6b..9be3cd80be 100644 --- a/api/cloudcontroller/ccv3/job_url_test.go +++ b/api/cloudcontroller/ccv3/job_url_test.go @@ -3,8 +3,8 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/manifest.go b/api/cloudcontroller/ccv3/manifest.go index 6461efbe2f..5dc7689404 100644 --- a/api/cloudcontroller/ccv3/manifest.go +++ b/api/cloudcontroller/ccv3/manifest.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // GetApplicationManifest returns a (YAML) manifest for an application and its diff --git a/api/cloudcontroller/ccv3/manifest_test.go b/api/cloudcontroller/ccv3/manifest_test.go index e5944afcf9..1f4a353588 100644 --- a/api/cloudcontroller/ccv3/manifest_test.go +++ b/api/cloudcontroller/ccv3/manifest_test.go @@ -4,13 +4,13 @@ import ( "errors" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/metadata.go b/api/cloudcontroller/ccv3/metadata.go index f8c277f64e..7d0306df25 100644 --- a/api/cloudcontroller/ccv3/metadata.go +++ b/api/cloudcontroller/ccv3/metadata.go @@ -3,8 +3,8 @@ package ccv3 import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) UpdateResourceMetadata(resource string, resourceGUID string, metadata resources.Metadata) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/metadata_test.go b/api/cloudcontroller/ccv3/metadata_test.go index 24ca2f57ed..5232f73d92 100644 --- a/api/cloudcontroller/ccv3/metadata_test.go +++ b/api/cloudcontroller/ccv3/metadata_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/organization.go b/api/cloudcontroller/ccv3/organization.go index 5e21a0e7d8..e9cf539ccc 100644 --- a/api/cloudcontroller/ccv3/organization.go +++ b/api/cloudcontroller/ccv3/organization.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateOrganization(orgName string) (resources.Organization, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/organization_quota.go b/api/cloudcontroller/ccv3/organization_quota.go index 95a3a81e89..e5de9f942e 100644 --- a/api/cloudcontroller/ccv3/organization_quota.go +++ b/api/cloudcontroller/ccv3/organization_quota.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) ApplyOrganizationQuota(quotaGuid, orgGuid string) (resources.RelationshipList, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/organization_quota_test.go b/api/cloudcontroller/ccv3/organization_quota_test.go index b1aaaa41da..36d2d88578 100644 --- a/api/cloudcontroller/ccv3/organization_quota_test.go +++ b/api/cloudcontroller/ccv3/organization_quota_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "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 77dafec7ca..d379c27592 100644 --- a/api/cloudcontroller/ccv3/organization_test.go +++ b/api/cloudcontroller/ccv3/organization_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - . "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/package.go b/api/cloudcontroller/ccv3/package.go index c220d63035..3deb0fbbe7 100644 --- a/api/cloudcontroller/ccv3/package.go +++ b/api/cloudcontroller/ccv3/package.go @@ -8,11 +8,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.Reader diff --git a/api/cloudcontroller/ccv3/package_test.go b/api/cloudcontroller/ccv3/package_test.go index 54bcd15b38..633dc20624 100644 --- a/api/cloudcontroller/ccv3/package_test.go +++ b/api/cloudcontroller/ccv3/package_test.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/api/cloudcontroller/ccv3/paginate.go b/api/cloudcontroller/ccv3/paginate.go index c38cfd32a0..d885c71c7d 100644 --- a/api/cloudcontroller/ccv3/paginate.go +++ b/api/cloudcontroller/ccv3/paginate.go @@ -3,7 +3,7 @@ package ccv3 import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) func (requester RealRequester) paginate(request *cloudcontroller.Request, obj interface{}, appendToExternalList func(interface{}) error, specificPage bool) (IncludedResources, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/paginated_resources_test.go b/api/cloudcontroller/ccv3/paginated_resources_test.go index 44d03a6b53..b5f95377af 100644 --- a/api/cloudcontroller/ccv3/paginated_resources_test.go +++ b/api/cloudcontroller/ccv3/paginated_resources_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - . "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/process.go b/api/cloudcontroller/ccv3/process.go index a386431491..caa6ac6495 100644 --- a/api/cloudcontroller/ccv3/process.go +++ b/api/cloudcontroller/ccv3/process.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateApplicationProcessScale updates process instances count, memory or disk diff --git a/api/cloudcontroller/ccv3/process_instance.go b/api/cloudcontroller/ccv3/process_instance.go index 6491705873..11fa1b56b1 100644 --- a/api/cloudcontroller/ccv3/process_instance.go +++ b/api/cloudcontroller/ccv3/process_instance.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/types" ) // ProcessInstance represents a single process instance for a particular diff --git a/api/cloudcontroller/ccv3/process_instance_test.go b/api/cloudcontroller/ccv3/process_instance_test.go index c4fdd1c0bd..7834a25772 100644 --- a/api/cloudcontroller/ccv3/process_instance_test.go +++ b/api/cloudcontroller/ccv3/process_instance_test.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/types" . "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 0c22b80851..b41d9fea80 100644 --- a/api/cloudcontroller/ccv3/process_test.go +++ b/api/cloudcontroller/ccv3/process_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/query_test.go b/api/cloudcontroller/ccv3/query_test.go index 205895c4ab..761aa4c918 100644 --- a/api/cloudcontroller/ccv3/query_test.go +++ b/api/cloudcontroller/ccv3/query_test.go @@ -3,7 +3,7 @@ package ccv3_test import ( "net/url" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/relationship.go b/api/cloudcontroller/ccv3/relationship.go index 86b035a339..129b33103f 100644 --- a/api/cloudcontroller/ccv3/relationship.go +++ b/api/cloudcontroller/ccv3/relationship.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // DeleteIsolationSegmentOrganization will delete the relationship between diff --git a/api/cloudcontroller/ccv3/relationship_list.go b/api/cloudcontroller/ccv3/relationship_list.go index e437cc3fc8..28d185e371 100644 --- a/api/cloudcontroller/ccv3/relationship_list.go +++ b/api/cloudcontroller/ccv3/relationship_list.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // EntitleIsolationSegmentToOrganizations will create a link between the diff --git a/api/cloudcontroller/ccv3/relationship_list_test.go b/api/cloudcontroller/ccv3/relationship_list_test.go index f9e4d0a8db..91401af3e7 100644 --- a/api/cloudcontroller/ccv3/relationship_list_test.go +++ b/api/cloudcontroller/ccv3/relationship_list_test.go @@ -3,9 +3,9 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "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 22f1c440e7..34323f4ba3 100644 --- a/api/cloudcontroller/ccv3/relationship_test.go +++ b/api/cloudcontroller/ccv3/relationship_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/request.go b/api/cloudcontroller/ccv3/request.go index 13cf361b97..1624a1950e 100644 --- a/api/cloudcontroller/ccv3/request.go +++ b/api/cloudcontroller/ccv3/request.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) // requestOptions contains all the options to create an HTTP request. diff --git a/api/cloudcontroller/ccv3/requester.go b/api/cloudcontroller/ccv3/requester.go index 309f8e9b30..4b14853d2d 100644 --- a/api/cloudcontroller/ccv3/requester.go +++ b/api/cloudcontroller/ccv3/requester.go @@ -8,8 +8,8 @@ import ( "net/http" "runtime" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Requester diff --git a/api/cloudcontroller/ccv3/requester_test.go b/api/cloudcontroller/ccv3/requester_test.go index 9330d9934b..221b2c17ed 100644 --- a/api/cloudcontroller/ccv3/requester_test.go +++ b/api/cloudcontroller/ccv3/requester_test.go @@ -8,13 +8,13 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" - . "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/resource.go b/api/cloudcontroller/ccv3/resource.go index aaf944a371..a2122458f6 100644 --- a/api/cloudcontroller/ccv3/resource.go +++ b/api/cloudcontroller/ccv3/resource.go @@ -5,8 +5,8 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" ) type Checksum struct { diff --git a/api/cloudcontroller/ccv3/resource_test.go b/api/cloudcontroller/ccv3/resource_test.go index 397a6b3e70..f94b9e0e3a 100644 --- a/api/cloudcontroller/ccv3/resource_test.go +++ b/api/cloudcontroller/ccv3/resource_test.go @@ -5,8 +5,8 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/revisions.go b/api/cloudcontroller/ccv3/revisions.go index 3451fb2fbe..0a3d57a471 100644 --- a/api/cloudcontroller/ccv3/revisions.go +++ b/api/cloudcontroller/ccv3/revisions.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetApplicationRevisions(appGUID string, query ...Query) ([]resources.Revision, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/revisions_test.go b/api/cloudcontroller/ccv3/revisions_test.go index d1a9f4ac95..5d1a5a4d41 100644 --- a/api/cloudcontroller/ccv3/revisions_test.go +++ b/api/cloudcontroller/ccv3/revisions_test.go @@ -3,11 +3,11 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/role.go b/api/cloudcontroller/ccv3/role.go index 5c7bb5f14a..5f3b1559c5 100644 --- a/api/cloudcontroller/ccv3/role.go +++ b/api/cloudcontroller/ccv3/role.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateRole(roleSpec resources.Role) (resources.Role, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/role_test.go b/api/cloudcontroller/ccv3/role_test.go index 9b1c1d3dd4..7d0d689458 100644 --- a/api/cloudcontroller/ccv3/role_test.go +++ b/api/cloudcontroller/ccv3/role_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/route.go b/api/cloudcontroller/ccv3/route.go index 355045fd7c..651ce0bd2c 100644 --- a/api/cloudcontroller/ccv3/route.go +++ b/api/cloudcontroller/ccv3/route.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client Client) CreateRoute(route resources.Route) (resources.Route, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/route_binding.go b/api/cloudcontroller/ccv3/route_binding.go index b2701cfc8b..cda9819759 100644 --- a/api/cloudcontroller/ccv3/route_binding.go +++ b/api/cloudcontroller/ccv3/route_binding.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateRouteBinding(binding resources.RouteBinding) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/route_binding_test.go b/api/cloudcontroller/ccv3/route_binding_test.go index 43c3e49520..c0dbee113b 100644 --- a/api/cloudcontroller/ccv3/route_binding_test.go +++ b/api/cloudcontroller/ccv3/route_binding_test.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/route_test.go b/api/cloudcontroller/ccv3/route_test.go index 985e493e35..0bdff6563b 100644 --- a/api/cloudcontroller/ccv3/route_test.go +++ b/api/cloudcontroller/ccv3/route_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/security_group.go b/api/cloudcontroller/ccv3/security_group.go index 8a72533e45..656234a1b6 100644 --- a/api/cloudcontroller/ccv3/security_group.go +++ b/api/cloudcontroller/ccv3/security_group.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateSecurityGroup(securityGroup resources.SecurityGroup) (resources.SecurityGroup, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/security_group_test.go b/api/cloudcontroller/ccv3/security_group_test.go index 3683740bbc..5849af528c 100644 --- a/api/cloudcontroller/ccv3/security_group_test.go +++ b/api/cloudcontroller/ccv3/security_group_test.go @@ -3,11 +3,11 @@ package ccv3_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/service_broker.go b/api/cloudcontroller/ccv3/service_broker.go index 07addf4081..c6b35eb9b7 100644 --- a/api/cloudcontroller/ccv3/service_broker.go +++ b/api/cloudcontroller/ccv3/service_broker.go @@ -3,8 +3,8 @@ package ccv3 import ( "errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateServiceBroker registers a new service broker. diff --git a/api/cloudcontroller/ccv3/service_broker_test.go b/api/cloudcontroller/ccv3/service_broker_test.go index 8c46520fd2..276784cf91 100644 --- a/api/cloudcontroller/ccv3/service_broker_test.go +++ b/api/cloudcontroller/ccv3/service_broker_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_credential_binding.go b/api/cloudcontroller/ccv3/service_credential_binding.go index 5fb7e25d31..bd621b79c5 100644 --- a/api/cloudcontroller/ccv3/service_credential_binding.go +++ b/api/cloudcontroller/ccv3/service_credential_binding.go @@ -1,9 +1,9 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) func (client *Client) CreateServiceCredentialBinding(binding resources.ServiceCredentialBinding) (JobURL, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_credential_binding_test.go b/api/cloudcontroller/ccv3/service_credential_binding_test.go index 6de802b382..919903e4d3 100644 --- a/api/cloudcontroller/ccv3/service_credential_binding_test.go +++ b/api/cloudcontroller/ccv3/service_credential_binding_test.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/service_instance.go b/api/cloudcontroller/ccv3/service_instance.go index 5f7a9257b5..d988543d09 100644 --- a/api/cloudcontroller/ccv3/service_instance.go +++ b/api/cloudcontroller/ccv3/service_instance.go @@ -1,12 +1,12 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) type SpaceWithOrganization struct { diff --git a/api/cloudcontroller/ccv3/service_instance_test.go b/api/cloudcontroller/ccv3/service_instance_test.go index bd39e3a95c..fcd8dc6dd8 100644 --- a/api/cloudcontroller/ccv3/service_instance_test.go +++ b/api/cloudcontroller/ccv3/service_instance_test.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/service_offering.go b/api/cloudcontroller/ccv3/service_offering.go index e48ec922c2..91fc64a898 100644 --- a/api/cloudcontroller/ccv3/service_offering.go +++ b/api/cloudcontroller/ccv3/service_offering.go @@ -1,10 +1,10 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) // GetServiceOffering lists service offering with optional filters. diff --git a/api/cloudcontroller/ccv3/service_offering_test.go b/api/cloudcontroller/ccv3/service_offering_test.go index 8968b554bf..4f7bc137ce 100644 --- a/api/cloudcontroller/ccv3/service_offering_test.go +++ b/api/cloudcontroller/ccv3/service_offering_test.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_plan.go b/api/cloudcontroller/ccv3/service_plan.go index e3a2c43086..23e3aef0c4 100644 --- a/api/cloudcontroller/ccv3/service_plan.go +++ b/api/cloudcontroller/ccv3/service_plan.go @@ -1,11 +1,11 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/lookuptable" ) func (client *Client) GetServicePlanByGUID(guid string) (resources.ServicePlan, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_plan_test.go b/api/cloudcontroller/ccv3/service_plan_test.go index 3dc7701d31..87f7b86c87 100644 --- a/api/cloudcontroller/ccv3/service_plan_test.go +++ b/api/cloudcontroller/ccv3/service_plan_test.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_plan_visibility.go b/api/cloudcontroller/ccv3/service_plan_visibility.go index 7b647ea784..5e37c2ac2d 100644 --- a/api/cloudcontroller/ccv3/service_plan_visibility.go +++ b/api/cloudcontroller/ccv3/service_plan_visibility.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetServicePlanVisibility(servicePlanGUID string) (resources.ServicePlanVisibility, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/service_plan_visibility_test.go b/api/cloudcontroller/ccv3/service_plan_visibility_test.go index 70e135c04f..94215662f9 100644 --- a/api/cloudcontroller/ccv3/service_plan_visibility_test.go +++ b/api/cloudcontroller/ccv3/service_plan_visibility_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/sidecar.go b/api/cloudcontroller/ccv3/sidecar.go index d3b33c0805..d988c93980 100644 --- a/api/cloudcontroller/ccv3/sidecar.go +++ b/api/cloudcontroller/ccv3/sidecar.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetProcessSidecars(processGuid string) ([]resources.Sidecar, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/sidecar_test.go b/api/cloudcontroller/ccv3/sidecar_test.go index 933cf33ba5..07d0721073 100644 --- a/api/cloudcontroller/ccv3/sidecar_test.go +++ b/api/cloudcontroller/ccv3/sidecar_test.go @@ -3,10 +3,10 @@ package ccv3_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/space.go b/api/cloudcontroller/ccv3/space.go index 7a68b9a9c1..8d808e88bb 100644 --- a/api/cloudcontroller/ccv3/space.go +++ b/api/cloudcontroller/ccv3/space.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) CreateSpace(space resources.Space) (resources.Space, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_feature.go b/api/cloudcontroller/ccv3/space_feature.go index 3600eb6857..15ec156656 100644 --- a/api/cloudcontroller/ccv3/space_feature.go +++ b/api/cloudcontroller/ccv3/space_feature.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client *Client) GetSpaceFeature(spaceGUID string, featureName string) (bool, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_feature_test.go b/api/cloudcontroller/ccv3/space_feature_test.go index 8dddc891c3..72723c69d3 100644 --- a/api/cloudcontroller/ccv3/space_feature_test.go +++ b/api/cloudcontroller/ccv3/space_feature_test.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/space_quota.go b/api/cloudcontroller/ccv3/space_quota.go index f555020b7f..2b74988f08 100644 --- a/api/cloudcontroller/ccv3/space_quota.go +++ b/api/cloudcontroller/ccv3/space_quota.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) func (client Client) ApplySpaceQuota(quotaGUID string, spaceGUID string) (resources.RelationshipList, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/space_quota_test.go b/api/cloudcontroller/ccv3/space_quota_test.go index 6b41fb1d5d..e9c4cc1a8d 100644 --- a/api/cloudcontroller/ccv3/space_quota_test.go +++ b/api/cloudcontroller/ccv3/space_quota_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "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 40a3b9eaa2..b3bfde4b31 100644 --- a/api/cloudcontroller/ccv3/space_test.go +++ b/api/cloudcontroller/ccv3/space_test.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - . "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/stack.go b/api/cloudcontroller/ccv3/stack.go index ece8e6e491..d403f44030 100644 --- a/api/cloudcontroller/ccv3/stack.go +++ b/api/cloudcontroller/ccv3/stack.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // GetStacks lists stacks with optional filters. diff --git a/api/cloudcontroller/ccv3/stack_test.go b/api/cloudcontroller/ccv3/stack_test.go index f6a3fa2e05..0485525646 100644 --- a/api/cloudcontroller/ccv3/stack_test.go +++ b/api/cloudcontroller/ccv3/stack_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "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 d5f0e5fa9a..8869ee754d 100644 --- a/api/cloudcontroller/ccv3/target_test.go +++ b/api/cloudcontroller/ccv3/target_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv3/task.go b/api/cloudcontroller/ccv3/task.go index 23104e73d0..85ca85c1c8 100644 --- a/api/cloudcontroller/ccv3/task.go +++ b/api/cloudcontroller/ccv3/task.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateApplication resources.Task runs a command in the Application environment diff --git a/api/cloudcontroller/ccv3/task_test.go b/api/cloudcontroller/ccv3/task_test.go index 4ecbe09058..f678f87e09 100644 --- a/api/cloudcontroller/ccv3/task_test.go +++ b/api/cloudcontroller/ccv3/task_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/user.go b/api/cloudcontroller/ccv3/user.go index 247d3a77d6..43fb166b6f 100644 --- a/api/cloudcontroller/ccv3/user.go +++ b/api/cloudcontroller/ccv3/user.go @@ -1,8 +1,8 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/internal" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v9/resources" ) // CreateUser creates a new Cloud Controller User from the provided UAA user diff --git a/api/cloudcontroller/ccv3/user_test.go b/api/cloudcontroller/ccv3/user_test.go index 75ef1c8fec..2ede31ad3c 100644 --- a/api/cloudcontroller/ccv3/user_test.go +++ b/api/cloudcontroller/ccv3/user_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/v2_formatted_resource.go b/api/cloudcontroller/ccv3/v2_formatted_resource.go index ca981f2ed0..3dfd55c5d1 100644 --- a/api/cloudcontroller/ccv3/v2_formatted_resource.go +++ b/api/cloudcontroller/ccv3/v2_formatted_resource.go @@ -5,7 +5,7 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) // V2FormattedResource represents a Cloud Controller Resource that still has the same shape as the V2 Resource. diff --git a/api/cloudcontroller/ccv3/v2_formatted_resource_test.go b/api/cloudcontroller/ccv3/v2_formatted_resource_test.go index d8937bdd1c..7500f97cf6 100644 --- a/api/cloudcontroller/ccv3/v2_formatted_resource_test.go +++ b/api/cloudcontroller/ccv3/v2_formatted_resource_test.go @@ -3,7 +3,7 @@ package ccv3_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/cloud_controller_connection.go b/api/cloudcontroller/cloud_controller_connection.go index 74141674f0..8bea7e1182 100644 --- a/api/cloudcontroller/cloud_controller_connection.go +++ b/api/cloudcontroller/cloud_controller_connection.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/util" ) // Config is for configuring a CloudControllerConnection. diff --git a/api/cloudcontroller/cloud_controller_connection_test.go b/api/cloudcontroller/cloud_controller_connection_test.go index d19f76719e..e54c011f9c 100644 --- a/api/cloudcontroller/cloud_controller_connection_test.go +++ b/api/cloudcontroller/cloud_controller_connection_test.go @@ -6,8 +6,8 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go b/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go index d9fb642894..58d44d9b11 100644 --- a/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go +++ b/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go @@ -4,7 +4,7 @@ package cloudcontrollerfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) type FakeConnection struct { @@ -31,15 +31,16 @@ func (fake *FakeConnection) Make(arg1 *cloudcontroller.Request, arg2 *cloudcontr arg1 *cloudcontroller.Request arg2 *cloudcontroller.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } diff --git a/api/cloudcontroller/pipebomb.go b/api/cloudcontroller/pipebomb.go index c3ba3c69b4..20c15bbc99 100644 --- a/api/cloudcontroller/pipebomb.go +++ b/api/cloudcontroller/pipebomb.go @@ -3,7 +3,7 @@ package cloudcontroller import ( "io" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) // Pipebomb is a wrapper around an io.Pipe's io.ReadCloser that turns it into a diff --git a/api/cloudcontroller/uploads/upload.go b/api/cloudcontroller/uploads/upload.go index 9e81296257..e622c554f2 100644 --- a/api/cloudcontroller/uploads/upload.go +++ b/api/cloudcontroller/uploads/upload.go @@ -6,7 +6,7 @@ import ( "mime/multipart" "path/filepath" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) func CalculateRequestSize(fileSize int64, path string, fieldName string) (int64, error) { diff --git a/api/cloudcontroller/wrapper/custom_wrapper.go b/api/cloudcontroller/wrapper/custom_wrapper.go index 09cc493f1d..d54743fd73 100644 --- a/api/cloudcontroller/wrapper/custom_wrapper.go +++ b/api/cloudcontroller/wrapper/custom_wrapper.go @@ -1,6 +1,6 @@ package wrapper -import "code.cloudfoundry.org/cli/v8/api/cloudcontroller" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller" // CustomWrapper is a wrapper that can execute arbitrary code via the // CustomMake function on every request that passes through Make. diff --git a/api/cloudcontroller/wrapper/kubernetes_authentication.go b/api/cloudcontroller/wrapper/kubernetes_authentication.go index cc2fe0561a..1043c3be59 100644 --- a/api/cloudcontroller/wrapper/kubernetes_authentication.go +++ b/api/cloudcontroller/wrapper/kubernetes_authentication.go @@ -3,10 +3,10 @@ package wrapper import ( "net/http" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/shared" - "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/shared" + "code.cloudfoundry.org/cli/v9/command" ) type KubernetesAuthentication struct { diff --git a/api/cloudcontroller/wrapper/kubernetes_authentication_test.go b/api/cloudcontroller/wrapper/kubernetes_authentication_test.go index 8601ddad93..790c585436 100644 --- a/api/cloudcontroller/wrapper/kubernetes_authentication_test.go +++ b/api/cloudcontroller/wrapper/kubernetes_authentication_test.go @@ -11,12 +11,12 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/ccv3fakes" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/integration/helpers" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" diff --git a/api/cloudcontroller/wrapper/request_logger.go b/api/cloudcontroller/wrapper/request_logger.go index a3db0437f6..18c6f19d27 100644 --- a/api/cloudcontroller/wrapper/request_logger.go +++ b/api/cloudcontroller/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/cloudcontroller/wrapper/request_logger_test.go b/api/cloudcontroller/wrapper/request_logger_test.go index 66fef9f37b..30a69f711d 100644 --- a/api/cloudcontroller/wrapper/request_logger_test.go +++ b/api/cloudcontroller/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/retry_request.go b/api/cloudcontroller/wrapper/retry_request.go index dbca1b9f9e..4f9359af88 100644 --- a/api/cloudcontroller/wrapper/retry_request.go +++ b/api/cloudcontroller/wrapper/retry_request.go @@ -3,8 +3,8 @@ package wrapper import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/cloudcontroller/wrapper/retry_request_test.go b/api/cloudcontroller/wrapper/retry_request_test.go index 747a3cf6e8..0f0b2a2dad 100644 --- a/api/cloudcontroller/wrapper/retry_request_test.go +++ b/api/cloudcontroller/wrapper/retry_request_test.go @@ -6,10 +6,10 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/uaa_authentication.go b/api/cloudcontroller/wrapper/uaa_authentication.go index 375bf3fd24..e6a7aaf72b 100644 --- a/api/cloudcontroller/wrapper/uaa_authentication.go +++ b/api/cloudcontroller/wrapper/uaa_authentication.go @@ -6,8 +6,8 @@ import ( "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/cloudcontroller/wrapper/uaa_authentication_test.go b/api/cloudcontroller/wrapper/uaa_authentication_test.go index adcca89b22..025fddb600 100644 --- a/api/cloudcontroller/wrapper/uaa_authentication_test.go +++ b/api/cloudcontroller/wrapper/uaa_authentication_test.go @@ -7,18 +7,18 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/cloudcontrollerfakes" - . "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper/wrapperfakes" - "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go index 0478ea48e3..9b508745ce 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" ) type FakeRequestLoggerOutput struct { @@ -127,15 +127,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) err arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHeaderReturns return fakeReturns.result1 } @@ -187,15 +188,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHostReturns return fakeReturns.result1 } @@ -252,15 +254,16 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONBodyReturns return fakeReturns.result1 } @@ -312,15 +315,16 @@ func (fake *FakeRequestLoggerOutput) DisplayMessage(arg1 string) error { fake.displayMessageArgsForCall = append(fake.displayMessageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayMessageStub + fakeReturns := fake.displayMessageReturns fake.recordInvocation("DisplayMessage", []interface{}{arg1}) fake.displayMessageMutex.Unlock() - if fake.DisplayMessageStub != nil { - return fake.DisplayMessageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayMessageReturns return fakeReturns.result1 } @@ -374,15 +378,16 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayRequestHeaderReturns return fakeReturns.result1 } @@ -435,15 +440,16 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayResponseHeaderReturns return fakeReturns.result1 } @@ -496,15 +502,16 @@ func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) er arg1 string arg2 time.Time }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayTypeReturns return fakeReturns.result1 } @@ -555,9 +562,10 @@ func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.HandleInternalErrorStub fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { + if stub != nil { fake.HandleInternalErrorStub(arg1) } } @@ -586,15 +594,16 @@ func (fake *FakeRequestLoggerOutput) Start() error { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -638,15 +647,16 @@ func (fake *FakeRequestLoggerOutput) Stop() error { ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] fake.stopArgsForCall = append(fake.stopArgsForCall, struct { }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stopReturns return fakeReturns.result1 } diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go index 6b26b2911c..6d0de701fc 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" ) type FakeTokenCache struct { @@ -47,15 +47,16 @@ func (fake *FakeTokenCache) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeTokenCache) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -151,9 +153,10 @@ func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -182,9 +185,10 @@ func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } diff --git a/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go index 3670dc7838..4e7bf73d99 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeUAAClient struct { @@ -32,15 +32,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/logcache/log_cache_client.go b/api/logcache/log_cache_client.go index 93fe0b83e9..2f737393e8 100644 --- a/api/logcache/log_cache_client.go +++ b/api/logcache/log_cache_client.go @@ -10,10 +10,10 @@ import ( logcache "code.cloudfoundry.org/go-log-cache/v2" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/shared" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/shared" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/util" ) type RequestLoggerOutput interface { diff --git a/api/plugin/client_test.go b/api/plugin/client_test.go index d4b87714aa..0e7fc8ab03 100644 --- a/api/plugin/client_test.go +++ b/api/plugin/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" . "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 0c2f6a90d0..bb981753f2 100644 --- a/api/plugin/download_plugin_test.go +++ b/api/plugin/download_plugin_test.go @@ -6,9 +6,9 @@ import ( "net/url" "os" - . "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/plugin_connection.go b/api/plugin/plugin_connection.go index 7fcd3fdabe..522d2afc85 100644 --- a/api/plugin/plugin_connection.go +++ b/api/plugin/plugin_connection.go @@ -11,8 +11,8 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/util" ) // PluginConnection represents a connection to a plugin repo. diff --git a/api/plugin/plugin_connection_test.go b/api/plugin/plugin_connection_test.go index 381ec6f835..1a344ef00a 100644 --- a/api/plugin/plugin_connection_test.go +++ b/api/plugin/plugin_connection_test.go @@ -7,9 +7,9 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" . "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 7fd9b57262..d44cbd5210 100644 --- a/api/plugin/plugin_repository_test.go +++ b/api/plugin/plugin_repository_test.go @@ -5,8 +5,8 @@ import ( "net/http" "net/url" - . "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" + . "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" . "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 6b8e479c5e..48e4973c9c 100644 --- a/api/plugin/plugin_suite_test.go +++ b/api/plugin/plugin_suite_test.go @@ -5,7 +5,7 @@ import ( "log" "testing" - . "code.cloudfoundry.org/cli/v8/api/plugin" + . "code.cloudfoundry.org/cli/v9/api/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/pluginfakes/fake_connection.go b/api/plugin/pluginfakes/fake_connection.go index 31ab99fdca..57cd463069 100644 --- a/api/plugin/pluginfakes/fake_connection.go +++ b/api/plugin/pluginfakes/fake_connection.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) type FakeConnection struct { @@ -34,15 +34,16 @@ func (fake *FakeConnection) Make(arg1 *http.Request, arg2 *plugin.Response, arg3 arg2 *plugin.Response arg3 plugin.ProxyReader }{arg1, arg2, arg3}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2, arg3}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } diff --git a/api/plugin/pluginfakes/fake_connection_wrapper.go b/api/plugin/pluginfakes/fake_connection_wrapper.go index e116eda2f1..f2838fcadf 100644 --- a/api/plugin/pluginfakes/fake_connection_wrapper.go +++ b/api/plugin/pluginfakes/fake_connection_wrapper.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) type FakeConnectionWrapper struct { @@ -45,15 +45,16 @@ func (fake *FakeConnectionWrapper) Make(arg1 *http.Request, arg2 *plugin.Respons arg2 *plugin.Response arg3 plugin.ProxyReader }{arg1, arg2, arg3}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2, arg3}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } @@ -105,15 +106,16 @@ func (fake *FakeConnectionWrapper) Wrap(arg1 plugin.Connection) plugin.Connectio fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 plugin.Connection }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/plugin/pluginfakes/fake_proxy_reader.go b/api/plugin/pluginfakes/fake_proxy_reader.go index 0c987a47d5..b6027c8dfc 100644 --- a/api/plugin/pluginfakes/fake_proxy_reader.go +++ b/api/plugin/pluginfakes/fake_proxy_reader.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) type FakeProxyReader struct { @@ -37,9 +37,10 @@ func (fake *FakeProxyReader) Finish() { fake.finishMutex.Lock() fake.finishArgsForCall = append(fake.finishArgsForCall, struct { }{}) + stub := fake.FinishStub fake.recordInvocation("Finish", []interface{}{}) fake.finishMutex.Unlock() - if fake.FinishStub != nil { + if stub != nil { fake.FinishStub() } } @@ -61,9 +62,10 @@ func (fake *FakeProxyReader) Start(arg1 int64) { fake.startArgsForCall = append(fake.startArgsForCall, struct { arg1 int64 }{arg1}) + stub := fake.StartStub fake.recordInvocation("Start", []interface{}{arg1}) fake.startMutex.Unlock() - if fake.StartStub != nil { + if stub != nil { fake.StartStub(arg1) } } @@ -93,15 +95,16 @@ func (fake *FakeProxyReader) Wrap(arg1 io.Reader) io.ReadCloser { fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 io.Reader }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/plugin/wrapper/request_logger.go b/api/plugin/wrapper/request_logger.go index 6b193410e7..d10ee4b825 100644 --- a/api/plugin/wrapper/request_logger.go +++ b/api/plugin/wrapper/request_logger.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/plugin/wrapper/request_logger_test.go b/api/plugin/wrapper/request_logger_test.go index ec06eda9f3..22af66bd80 100644 --- a/api/plugin/wrapper/request_logger_test.go +++ b/api/plugin/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" - . "code.cloudfoundry.org/cli/v8/api/plugin/wrapper" - "code.cloudfoundry.org/cli/v8/api/plugin/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v9/api/plugin/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/plugin/wrapper/retry_request.go b/api/plugin/wrapper/retry_request.go index b0535b2f11..6d3adb388e 100644 --- a/api/plugin/wrapper/retry_request.go +++ b/api/plugin/wrapper/retry_request.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/v8/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/plugin/wrapper/retry_request_test.go b/api/plugin/wrapper/retry_request_test.go index c3ecfe1294..a4816a9447 100644 --- a/api/plugin/wrapper/retry_request_test.go +++ b/api/plugin/wrapper/retry_request_test.go @@ -6,10 +6,10 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" - . "code.cloudfoundry.org/cli/v8/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v9/api/plugin/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go b/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go index 0252deb85f..b5e812a9db 100644 --- a/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v9/api/plugin/wrapper" ) type FakeRequestLoggerOutput struct { @@ -126,15 +126,16 @@ func (fake *FakeRequestLoggerOutput) DisplayDump(arg1 string) error { fake.displayDumpArgsForCall = append(fake.displayDumpArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayDumpStub + fakeReturns := fake.displayDumpReturns fake.recordInvocation("DisplayDump", []interface{}{arg1}) fake.displayDumpMutex.Unlock() - if fake.DisplayDumpStub != nil { - return fake.DisplayDumpStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayDumpReturns return fakeReturns.result1 } @@ -187,15 +188,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) err arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHeaderReturns return fakeReturns.result1 } @@ -247,15 +249,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHostReturns return fakeReturns.result1 } @@ -312,15 +315,16 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONBodyReturns return fakeReturns.result1 } @@ -374,15 +378,16 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayRequestHeaderReturns return fakeReturns.result1 } @@ -435,15 +440,16 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayResponseHeaderReturns return fakeReturns.result1 } @@ -496,15 +502,16 @@ func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) er arg1 string arg2 time.Time }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayTypeReturns return fakeReturns.result1 } @@ -555,9 +562,10 @@ func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.HandleInternalErrorStub fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { + if stub != nil { fake.HandleInternalErrorStub(arg1) } } @@ -586,15 +594,16 @@ func (fake *FakeRequestLoggerOutput) Start() error { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -638,15 +647,16 @@ func (fake *FakeRequestLoggerOutput) Stop() error { ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] fake.stopArgsForCall = append(fake.stopArgsForCall, struct { }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stopReturns return fakeReturns.result1 } diff --git a/api/router/client.go b/api/router/client.go index 531a8539ef..5bd642e4e4 100644 --- a/api/router/client.go +++ b/api/router/client.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime" - "code.cloudfoundry.org/cli/v8/api/router/internal" + "code.cloudfoundry.org/cli/v9/api/router/internal" "github.com/tedsuo/rata" ) diff --git a/api/router/router_connection.go b/api/router/router_connection.go index 43562a340b..2157d6d621 100644 --- a/api/router/router_connection.go +++ b/api/router/router_connection.go @@ -10,9 +10,9 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/router/routererror" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/util" ) // ConnectionConfig is for configuring the RouterConnection diff --git a/api/router/router_group.go b/api/router/router_group.go index fae6675b2b..3e3137951c 100644 --- a/api/router/router_group.go +++ b/api/router/router_group.go @@ -3,8 +3,8 @@ package router import ( "net/url" - "code.cloudfoundry.org/cli/v8/api/router/internal" - "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router/internal" + "code.cloudfoundry.org/cli/v9/api/router/routererror" ) // RouterGroup represents a router group. diff --git a/api/router/router_group_test.go b/api/router/router_group_test.go index 26f9cfcc38..7121d02057 100644 --- a/api/router/router_group_test.go +++ b/api/router/router_group_test.go @@ -3,9 +3,9 @@ package router_test import ( "net/http" - . "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/api/router/routererror" - "code.cloudfoundry.org/cli/v8/api/router/wrapper" + . "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router/wrapper" . "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 56fb9c41af..8a4908b313 100644 --- a/api/router/router_suite_test.go +++ b/api/router/router_suite_test.go @@ -6,7 +6,7 @@ import ( "net/url" "testing" - "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v9/api/router" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/router/routerfakes/fake_connection.go b/api/router/routerfakes/fake_connection.go index 02d025df16..e4eb68757e 100644 --- a/api/router/routerfakes/fake_connection.go +++ b/api/router/routerfakes/fake_connection.go @@ -4,7 +4,7 @@ package routerfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v9/api/router" ) type FakeConnection struct { @@ -31,15 +31,16 @@ func (fake *FakeConnection) Make(arg1 *router.Request, arg2 *router.Response) er arg1 *router.Request arg2 *router.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } diff --git a/api/router/routerfakes/fake_connection_wrapper.go b/api/router/routerfakes/fake_connection_wrapper.go index e9d31bc9b9..8d6eccb398 100644 --- a/api/router/routerfakes/fake_connection_wrapper.go +++ b/api/router/routerfakes/fake_connection_wrapper.go @@ -4,7 +4,7 @@ package routerfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v9/api/router" ) type FakeConnectionWrapper struct { @@ -42,15 +42,16 @@ func (fake *FakeConnectionWrapper) Make(arg1 *router.Request, arg2 *router.Respo arg1 *router.Request arg2 *router.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } @@ -102,15 +103,16 @@ func (fake *FakeConnectionWrapper) Wrap(arg1 router.Connection) router.Connectio fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 router.Connection }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/router/wrapper/error_wrapper.go b/api/router/wrapper/error_wrapper.go index 8a33fdee6d..c3f4b6f13c 100644 --- a/api/router/wrapper/error_wrapper.go +++ b/api/router/wrapper/error_wrapper.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" ) const expiredTokenMessage = "Token is expired" diff --git a/api/router/wrapper/error_wrapper_test.go b/api/router/wrapper/error_wrapper_test.go index b4b99d6c53..e09a7eaec2 100644 --- a/api/router/wrapper/error_wrapper_test.go +++ b/api/router/wrapper/error_wrapper_test.go @@ -3,10 +3,10 @@ package wrapper_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/api/router/routererror" - "code.cloudfoundry.org/cli/v8/api/router/routerfakes" - . "code.cloudfoundry.org/cli/v8/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v9/api/router/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/router/wrapper/request_logger.go b/api/router/wrapper/request_logger.go index be8bdd57a9..e711168355 100644 --- a/api/router/wrapper/request_logger.go +++ b/api/router/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/api/router" + "code.cloudfoundry.org/cli/v9/api/router" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/router/wrapper/request_logger_test.go b/api/router/wrapper/request_logger_test.go index 36397b58fb..e666e0ccc2 100644 --- a/api/router/wrapper/request_logger_test.go +++ b/api/router/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/api/router/routerfakes" - . "code.cloudfoundry.org/cli/v8/api/router/wrapper" - "code.cloudfoundry.org/cli/v8/api/router/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v9/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/router/wrapper/uaa_authentication.go b/api/router/wrapper/uaa_authentication.go index cf2766c3ef..14d52b2beb 100644 --- a/api/router/wrapper/uaa_authentication.go +++ b/api/router/wrapper/uaa_authentication.go @@ -1,9 +1,9 @@ package wrapper import ( - "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/api/router/routererror" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/router/wrapper/uaa_authentication_test.go b/api/router/wrapper/uaa_authentication_test.go index 5f288ade4a..86a73d46b7 100644 --- a/api/router/wrapper/uaa_authentication_test.go +++ b/api/router/wrapper/uaa_authentication_test.go @@ -6,13 +6,13 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/router" - "code.cloudfoundry.org/cli/v8/api/router/routererror" - "code.cloudfoundry.org/cli/v8/api/router/routerfakes" - . "code.cloudfoundry.org/cli/v8/api/router/wrapper" - "code.cloudfoundry.org/cli/v8/api/router/wrapper/wrapperfakes" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/router" + "code.cloudfoundry.org/cli/v9/api/router/routererror" + "code.cloudfoundry.org/cli/v9/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v9/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/router/wrapper/wrapperfakes/fake_request_logger_output.go b/api/router/wrapper/wrapperfakes/fake_request_logger_output.go index 9ce2e5c7d3..e8fe80457b 100644 --- a/api/router/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/router/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router/wrapper" ) type FakeRequestLoggerOutput struct { @@ -127,15 +127,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) err arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHeaderReturns return fakeReturns.result1 } @@ -187,15 +188,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHostReturns return fakeReturns.result1 } @@ -252,15 +254,16 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONBodyReturns return fakeReturns.result1 } @@ -312,15 +315,16 @@ func (fake *FakeRequestLoggerOutput) DisplayMessage(arg1 string) error { fake.displayMessageArgsForCall = append(fake.displayMessageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayMessageStub + fakeReturns := fake.displayMessageReturns fake.recordInvocation("DisplayMessage", []interface{}{arg1}) fake.displayMessageMutex.Unlock() - if fake.DisplayMessageStub != nil { - return fake.DisplayMessageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayMessageReturns return fakeReturns.result1 } @@ -374,15 +378,16 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayRequestHeaderReturns return fakeReturns.result1 } @@ -435,15 +440,16 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayResponseHeaderReturns return fakeReturns.result1 } @@ -496,15 +502,16 @@ func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) er arg1 string arg2 time.Time }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayTypeReturns return fakeReturns.result1 } @@ -555,9 +562,10 @@ func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.HandleInternalErrorStub fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { + if stub != nil { fake.HandleInternalErrorStub(arg1) } } @@ -586,15 +594,16 @@ func (fake *FakeRequestLoggerOutput) Start() error { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -638,15 +647,16 @@ func (fake *FakeRequestLoggerOutput) Stop() error { ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] fake.stopArgsForCall = append(fake.stopArgsForCall, struct { }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stopReturns return fakeReturns.result1 } diff --git a/api/router/wrapper/wrapperfakes/fake_token_cache.go b/api/router/wrapper/wrapperfakes/fake_token_cache.go index 85a630477f..5f97569a25 100644 --- a/api/router/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/router/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/router/wrapper" ) type FakeTokenCache struct { @@ -47,15 +47,16 @@ func (fake *FakeTokenCache) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeTokenCache) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -151,9 +153,10 @@ func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -182,9 +185,10 @@ func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } diff --git a/api/router/wrapper/wrapperfakes/fake_uaaclient.go b/api/router/wrapper/wrapperfakes/fake_uaaclient.go index 5b0806abb6..d5761ef043 100644 --- a/api/router/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/router/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/router/wrapper" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeUAAClient struct { @@ -32,15 +32,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/shared/sharedfakes/fake_round_tripper.go b/api/shared/sharedfakes/fake_round_tripper.go index 02f1ff1792..e8c0e9dd4f 100644 --- a/api/shared/sharedfakes/fake_round_tripper.go +++ b/api/shared/sharedfakes/fake_round_tripper.go @@ -30,15 +30,16 @@ func (fake *FakeRoundTripper) RoundTrip(arg1 *http.Request) (*http.Response, err fake.roundTripArgsForCall = append(fake.roundTripArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.RoundTripStub + fakeReturns := fake.roundTripReturns fake.recordInvocation("RoundTrip", []interface{}{arg1}) fake.roundTripMutex.Unlock() - if fake.RoundTripStub != nil { - return fake.RoundTripStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.roundTripReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/shared/wrap_for_cf_on_k8s.go b/api/shared/wrap_for_cf_on_k8s.go index 383452510b..74dbb3d51f 100644 --- a/api/shared/wrap_for_cf_on_k8s.go +++ b/api/shared/wrap_for_cf_on_k8s.go @@ -15,8 +15,8 @@ import ( "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/transport" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" // imported for the side effects _ "k8s.io/client-go/plugin/pkg/client/auth/azure" diff --git a/api/shared/wrap_for_cf_on_k8s_test.go b/api/shared/wrap_for_cf_on_k8s_test.go index 05a52fdad1..3e18922d87 100644 --- a/api/shared/wrap_for_cf_on_k8s_test.go +++ b/api/shared/wrap_for_cf_on_k8s_test.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/v8/api/shared" - "code.cloudfoundry.org/cli/v8/api/shared/sharedfakes" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/shared" + "code.cloudfoundry.org/cli/v9/api/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/integration/helpers" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" diff --git a/api/uaa/auth.go b/api/uaa/auth.go index 4045a2b98a..c571773c97 100644 --- a/api/uaa/auth.go +++ b/api/uaa/auth.go @@ -8,8 +8,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // AuthResponse contains the access token and refresh token which are granted diff --git a/api/uaa/auth_test.go b/api/uaa/auth_test.go index 9bb4537511..275ade094d 100644 --- a/api/uaa/auth_test.go +++ b/api/uaa/auth_test.go @@ -6,9 +6,9 @@ import ( "net/http" "net/url" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/client.go b/api/uaa/client.go index e616f8a01d..0826f97b9a 100644 --- a/api/uaa/client.go +++ b/api/uaa/client.go @@ -10,7 +10,7 @@ import ( "runtime" legacy "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // Client is the UAA client diff --git a/api/uaa/client_test.go b/api/uaa/client_test.go index b6cabeb70e..a77f626024 100644 --- a/api/uaa/client_test.go +++ b/api/uaa/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/error_converter_test.go b/api/uaa/error_converter_test.go index a23509fa4b..0e5ad2a21b 100644 --- a/api/uaa/error_converter_test.go +++ b/api/uaa/error_converter_test.go @@ -3,8 +3,8 @@ package uaa_test import ( "net/http" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/info_test.go b/api/uaa/info_test.go index 3f58a6f0cf..0aedb853e7 100644 --- a/api/uaa/info_test.go +++ b/api/uaa/info_test.go @@ -1,7 +1,7 @@ package uaa_test import ( - . "code.cloudfoundry.org/cli/v8/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/internal/routing_test.go b/api/uaa/internal/routing_test.go index 0a804607b5..f4bd968bd6 100644 --- a/api/uaa/internal/routing_test.go +++ b/api/uaa/internal/routing_test.go @@ -3,7 +3,7 @@ package internal_test import ( "net/http" - . "code.cloudfoundry.org/cli/v8/api/uaa/internal" + . "code.cloudfoundry.org/cli/v9/api/uaa/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go b/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go index 28909d7636..b447e8e75a 100644 --- a/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go +++ b/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go @@ -4,7 +4,7 @@ package noaabridgefakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v9/api/uaa/noaabridge" ) type FakeTokenCache struct { @@ -37,15 +37,16 @@ func (fake *FakeTokenCache) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -89,9 +90,10 @@ func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -120,9 +122,10 @@ func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } diff --git a/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go b/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go index 4e546562c7..33f852090a 100644 --- a/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go +++ b/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package noaabridgefakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/noaabridge" ) type FakeUAAClient struct { @@ -32,15 +32,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/uaa/noaabridge/token_refresher.go b/api/uaa/noaabridge/token_refresher.go index 3e588b6cb4..68e558458b 100644 --- a/api/uaa/noaabridge/token_refresher.go +++ b/api/uaa/noaabridge/token_refresher.go @@ -2,7 +2,7 @@ // TokenRefresher interface for noaa/consumer. package noaabridge -import "code.cloudfoundry.org/cli/v8/api/uaa" +import "code.cloudfoundry.org/cli/v9/api/uaa" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/uaa/noaabridge/token_refresher_test.go b/api/uaa/noaabridge/token_refresher_test.go index 59294d0f86..31008cf9d6 100644 --- a/api/uaa/noaabridge/token_refresher_test.go +++ b/api/uaa/noaabridge/token_refresher_test.go @@ -3,9 +3,9 @@ package noaabridge_test import ( "errors" - "code.cloudfoundry.org/cli/v8/api/uaa" - . "code.cloudfoundry.org/cli/v8/api/uaa/noaabridge" - "code.cloudfoundry.org/cli/v8/api/uaa/noaabridge/noaabridgefakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v9/api/uaa/noaabridge/noaabridgefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/prompts_test.go b/api/uaa/prompts_test.go index f2c273df49..ff5795da32 100644 --- a/api/uaa/prompts_test.go +++ b/api/uaa/prompts_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/uaa" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/refresh_token.go b/api/uaa/refresh_token.go index f68e9a663b..8da8d7cfb1 100644 --- a/api/uaa/refresh_token.go +++ b/api/uaa/refresh_token.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // RefreshedTokens represents the UAA refresh token response. diff --git a/api/uaa/refresh_token_test.go b/api/uaa/refresh_token_test.go index 03a2bec62b..228f5e5841 100644 --- a/api/uaa/refresh_token_test.go +++ b/api/uaa/refresh_token_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/request.go b/api/uaa/request.go index db3d93af98..69604b380e 100644 --- a/api/uaa/request.go +++ b/api/uaa/request.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "code.cloudfoundry.org/cli/v8/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // RequestOptions contains all the options to create an HTTP Request. diff --git a/api/uaa/resources.go b/api/uaa/resources.go index 1184e5ef77..1f91e875ec 100644 --- a/api/uaa/resources.go +++ b/api/uaa/resources.go @@ -1,7 +1,7 @@ package uaa import ( - "code.cloudfoundry.org/cli/v8/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // SetupResources configures the client to use the specified settings and diescopers the UAA and Authentication resources diff --git a/api/uaa/resources_test.go b/api/uaa/resources_test.go index 355f4263ca..9c70704523 100644 --- a/api/uaa/resources_test.go +++ b/api/uaa/resources_test.go @@ -1,8 +1,8 @@ package uaa_test import ( - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/ssh.go b/api/uaa/ssh.go index d8091cd74d..28b38a0d20 100644 --- a/api/uaa/ssh.go +++ b/api/uaa/ssh.go @@ -3,7 +3,7 @@ package uaa import ( "net/url" - "code.cloudfoundry.org/cli/v8/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) func (client *Client) GetSSHPasscode(accessToken string, sshOAuthClient string) (string, error) { diff --git a/api/uaa/ssh_test.go b/api/uaa/ssh_test.go index a8628090c7..44d862ce27 100644 --- a/api/uaa/ssh_test.go +++ b/api/uaa/ssh_test.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/uaa_connection.go b/api/uaa/uaa_connection.go index fd90a004ef..9b6ea9f918 100644 --- a/api/uaa/uaa_connection.go +++ b/api/uaa/uaa_connection.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/util" ) // UAAConnection represents the connection to UAA diff --git a/api/uaa/uaa_connection_test.go b/api/uaa/uaa_connection_test.go index 8f05b8eee4..7fa729eb26 100644 --- a/api/uaa/uaa_connection_test.go +++ b/api/uaa/uaa_connection_test.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/v8/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa" . "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 66269e34a3..2421117b30 100644 --- a/api/uaa/uaa_suite_test.go +++ b/api/uaa/uaa_suite_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/uaafakes/fake_config.go b/api/uaa/uaafakes/fake_config.go index 7161dbf87d..806b303368 100644 --- a/api/uaa/uaafakes/fake_config.go +++ b/api/uaa/uaafakes/fake_config.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeConfig struct { @@ -103,15 +103,16 @@ func (fake *FakeConfig) BinaryName() string { ret, specificReturn := fake.binaryNameReturnsOnCall[len(fake.binaryNameArgsForCall)] fake.binaryNameArgsForCall = append(fake.binaryNameArgsForCall, struct { }{}) + stub := fake.BinaryNameStub + fakeReturns := fake.binaryNameReturns fake.recordInvocation("BinaryName", []interface{}{}) fake.binaryNameMutex.Unlock() - if fake.BinaryNameStub != nil { - return fake.BinaryNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.binaryNameReturns return fakeReturns.result1 } @@ -155,15 +156,16 @@ func (fake *FakeConfig) BinaryVersion() string { ret, specificReturn := fake.binaryVersionReturnsOnCall[len(fake.binaryVersionArgsForCall)] fake.binaryVersionArgsForCall = append(fake.binaryVersionArgsForCall, struct { }{}) + stub := fake.BinaryVersionStub + fakeReturns := fake.binaryVersionReturns fake.recordInvocation("BinaryVersion", []interface{}{}) fake.binaryVersionMutex.Unlock() - if fake.BinaryVersionStub != nil { - return fake.BinaryVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.binaryVersionReturns return fakeReturns.result1 } @@ -207,15 +209,16 @@ func (fake *FakeConfig) DialTimeout() time.Duration { ret, specificReturn := fake.dialTimeoutReturnsOnCall[len(fake.dialTimeoutArgsForCall)] fake.dialTimeoutArgsForCall = append(fake.dialTimeoutArgsForCall, struct { }{}) + stub := fake.DialTimeoutStub + fakeReturns := fake.dialTimeoutReturns fake.recordInvocation("DialTimeout", []interface{}{}) fake.dialTimeoutMutex.Unlock() - if fake.DialTimeoutStub != nil { - return fake.DialTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dialTimeoutReturns return fakeReturns.result1 } @@ -259,9 +262,10 @@ func (fake *FakeConfig) SetUAAEndpoint(arg1 string) { fake.setUAAEndpointArgsForCall = append(fake.setUAAEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAEndpointStub fake.recordInvocation("SetUAAEndpoint", []interface{}{arg1}) fake.setUAAEndpointMutex.Unlock() - if fake.SetUAAEndpointStub != nil { + if stub != nil { fake.SetUAAEndpointStub(arg1) } } @@ -290,15 +294,16 @@ func (fake *FakeConfig) SkipSSLValidation() bool { ret, specificReturn := fake.skipSSLValidationReturnsOnCall[len(fake.skipSSLValidationArgsForCall)] fake.skipSSLValidationArgsForCall = append(fake.skipSSLValidationArgsForCall, struct { }{}) + stub := fake.SkipSSLValidationStub + fakeReturns := fake.skipSSLValidationReturns fake.recordInvocation("SkipSSLValidation", []interface{}{}) fake.skipSSLValidationMutex.Unlock() - if fake.SkipSSLValidationStub != nil { - return fake.SkipSSLValidationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.skipSSLValidationReturns return fakeReturns.result1 } @@ -342,15 +347,16 @@ func (fake *FakeConfig) UAADisableKeepAlives() bool { ret, specificReturn := fake.uAADisableKeepAlivesReturnsOnCall[len(fake.uAADisableKeepAlivesArgsForCall)] fake.uAADisableKeepAlivesArgsForCall = append(fake.uAADisableKeepAlivesArgsForCall, struct { }{}) + stub := fake.UAADisableKeepAlivesStub + fakeReturns := fake.uAADisableKeepAlivesReturns fake.recordInvocation("UAADisableKeepAlives", []interface{}{}) fake.uAADisableKeepAlivesMutex.Unlock() - if fake.UAADisableKeepAlivesStub != nil { - return fake.UAADisableKeepAlivesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAADisableKeepAlivesReturns return fakeReturns.result1 } @@ -394,15 +400,16 @@ func (fake *FakeConfig) UAAGrantType() string { ret, specificReturn := fake.uAAGrantTypeReturnsOnCall[len(fake.uAAGrantTypeArgsForCall)] fake.uAAGrantTypeArgsForCall = append(fake.uAAGrantTypeArgsForCall, struct { }{}) + stub := fake.UAAGrantTypeStub + fakeReturns := fake.uAAGrantTypeReturns fake.recordInvocation("UAAGrantType", []interface{}{}) fake.uAAGrantTypeMutex.Unlock() - if fake.UAAGrantTypeStub != nil { - return fake.UAAGrantTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAGrantTypeReturns return fakeReturns.result1 } @@ -446,15 +453,16 @@ func (fake *FakeConfig) UAAOAuthClient() string { ret, specificReturn := fake.uAAOAuthClientReturnsOnCall[len(fake.uAAOAuthClientArgsForCall)] fake.uAAOAuthClientArgsForCall = append(fake.uAAOAuthClientArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientStub + fakeReturns := fake.uAAOAuthClientReturns fake.recordInvocation("UAAOAuthClient", []interface{}{}) fake.uAAOAuthClientMutex.Unlock() - if fake.UAAOAuthClientStub != nil { - return fake.UAAOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientReturns return fakeReturns.result1 } @@ -498,15 +506,16 @@ func (fake *FakeConfig) UAAOAuthClientSecret() string { ret, specificReturn := fake.uAAOAuthClientSecretReturnsOnCall[len(fake.uAAOAuthClientSecretArgsForCall)] fake.uAAOAuthClientSecretArgsForCall = append(fake.uAAOAuthClientSecretArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientSecretStub + fakeReturns := fake.uAAOAuthClientSecretReturns fake.recordInvocation("UAAOAuthClientSecret", []interface{}{}) fake.uAAOAuthClientSecretMutex.Unlock() - if fake.UAAOAuthClientSecretStub != nil { - return fake.UAAOAuthClientSecretStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientSecretReturns return fakeReturns.result1 } diff --git a/api/uaa/uaafakes/fake_connection.go b/api/uaa/uaafakes/fake_connection.go index 03986a5dba..a6b251de88 100644 --- a/api/uaa/uaafakes/fake_connection.go +++ b/api/uaa/uaafakes/fake_connection.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeConnection struct { @@ -32,15 +32,16 @@ func (fake *FakeConnection) Make(arg1 *http.Request, arg2 *uaa.Response) error { arg1 *http.Request arg2 *uaa.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } diff --git a/api/uaa/uaafakes/fake_connection_wrapper.go b/api/uaa/uaafakes/fake_connection_wrapper.go index 7c12cc8d3e..b909fb8967 100644 --- a/api/uaa/uaafakes/fake_connection_wrapper.go +++ b/api/uaa/uaafakes/fake_connection_wrapper.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) type FakeConnectionWrapper struct { @@ -43,15 +43,16 @@ func (fake *FakeConnectionWrapper) Make(arg1 *http.Request, arg2 *uaa.Response) arg1 *http.Request arg2 *uaa.Response }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.makeReturns return fakeReturns.result1 } @@ -103,15 +104,16 @@ func (fake *FakeConnectionWrapper) Wrap(arg1 uaa.Connection) uaa.Connection { fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { arg1 uaa.Connection }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.wrapReturns return fakeReturns.result1 } diff --git a/api/uaa/user.go b/api/uaa/user.go index 50df8e4276..452be20c2f 100644 --- a/api/uaa/user.go +++ b/api/uaa/user.go @@ -7,8 +7,8 @@ import ( "net/http" "net/url" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/uaa/internal" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) // User represents an UAA user account. diff --git a/api/uaa/user_test.go b/api/uaa/user_test.go index a92a4713ce..e6e296ecb0 100644 --- a/api/uaa/user_test.go +++ b/api/uaa/user_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/version_test.go b/api/uaa/version_test.go index 245b85742d..f9e2530df0 100644 --- a/api/uaa/version_test.go +++ b/api/uaa/version_test.go @@ -3,9 +3,9 @@ package uaa_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/uaa" - . "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + . "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/request_logger.go b/api/uaa/wrapper/request_logger.go index 1f08e23257..6eb0983f9c 100644 --- a/api/uaa/wrapper/request_logger.go +++ b/api/uaa/wrapper/request_logger.go @@ -8,7 +8,7 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput diff --git a/api/uaa/wrapper/request_logger_test.go b/api/uaa/wrapper/request_logger_test.go index 2919d42eb0..de97d93ce3 100644 --- a/api/uaa/wrapper/request_logger_test.go +++ b/api/uaa/wrapper/request_logger_test.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" - "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/retry_request.go b/api/uaa/wrapper/retry_request.go index c02278d5bf..da02966757 100644 --- a/api/uaa/wrapper/retry_request.go +++ b/api/uaa/wrapper/retry_request.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) // RetryRequest is a wrapper that retries failed requests if they contain a 5XX diff --git a/api/uaa/wrapper/retry_request_test.go b/api/uaa/wrapper/retry_request_test.go index 9ee42eca79..1a2b603ffa 100644 --- a/api/uaa/wrapper/retry_request_test.go +++ b/api/uaa/wrapper/retry_request_test.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/uaa/wrapper/uaa_authentication.go b/api/uaa/wrapper/uaa_authentication.go index 91afe62e28..505bc6a192 100644 --- a/api/uaa/wrapper/uaa_authentication.go +++ b/api/uaa/wrapper/uaa_authentication.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/api/uaa/wrapper/uaa_authentication_test.go b/api/uaa/wrapper/uaa_authentication_test.go index 516f7a21e9..d07621c952 100644 --- a/api/uaa/wrapper/uaa_authentication_test.go +++ b/api/uaa/wrapper/uaa_authentication_test.go @@ -8,11 +8,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/uaafakes" - . "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" - "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/util" - "code.cloudfoundry.org/cli/v8/api/uaa/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper/wrapperfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go b/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go index 00eea2a61d..11498a4ecf 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" ) type FakeRequestLoggerOutput struct { @@ -131,15 +131,16 @@ func (fake *FakeRequestLoggerOutput) DisplayBody(arg1 []byte) error { fake.displayBodyArgsForCall = append(fake.displayBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayBodyStub + fakeReturns := fake.displayBodyReturns fake.recordInvocation("DisplayBody", []interface{}{arg1Copy}) fake.displayBodyMutex.Unlock() - if fake.DisplayBodyStub != nil { - return fake.DisplayBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayBodyReturns return fakeReturns.result1 } @@ -192,15 +193,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) err arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHeaderReturns return fakeReturns.result1 } @@ -252,15 +254,16 @@ func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayHostReturns return fakeReturns.result1 } @@ -317,15 +320,16 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONBodyReturns return fakeReturns.result1 } @@ -379,15 +383,16 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayRequestHeaderReturns return fakeReturns.result1 } @@ -440,15 +445,16 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayResponseHeaderReturns return fakeReturns.result1 } @@ -501,15 +507,16 @@ func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) er arg1 string arg2 time.Time }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayTypeReturns return fakeReturns.result1 } @@ -560,9 +567,10 @@ func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.HandleInternalErrorStub fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { + if stub != nil { fake.HandleInternalErrorStub(arg1) } } @@ -591,15 +599,16 @@ func (fake *FakeRequestLoggerOutput) Start() error { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -643,15 +652,16 @@ func (fake *FakeRequestLoggerOutput) Stop() error { ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] fake.stopArgsForCall = append(fake.stopArgsForCall, struct { }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.stopReturns return fakeReturns.result1 } diff --git a/api/uaa/wrapper/wrapperfakes/fake_token_cache.go b/api/uaa/wrapper/wrapperfakes/fake_token_cache.go index 62fca90656..e7120ceaa9 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/uaa/wrapper/wrapperfakes/fake_token_cache.go @@ -4,7 +4,7 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" ) type FakeTokenCache struct { @@ -47,15 +47,16 @@ func (fake *FakeTokenCache) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeTokenCache) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -151,9 +153,10 @@ func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -182,9 +185,10 @@ func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } diff --git a/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go b/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go index 7156fe7d73..47a9d7184b 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package wrapperfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" ) type FakeUAAClient struct { @@ -32,15 +32,16 @@ func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/actors_suite_test.go b/cf/actors/actors_suite_test.go index 5480df72c5..a3faab044e 100644 --- a/cf/actors/actors_suite_test.go +++ b/cf/actors/actors_suite_test.go @@ -1,8 +1,8 @@ package actors_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/actorsfakes/fake_push_actor.go b/cf/actors/actorsfakes/fake_push_actor.go index 571c0c8265..d3bd0655e7 100644 --- a/cf/actors/actorsfakes/fake_push_actor.go +++ b/cf/actors/actorsfakes/fake_push_actor.go @@ -5,9 +5,9 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakePushActor struct { @@ -96,15 +96,16 @@ func (fake *FakePushActor) GatherFiles(arg1 []models.AppFileFields, arg2 string, arg3 string arg4 bool }{arg1Copy, arg2, arg3, arg4}) + stub := fake.GatherFilesStub + fakeReturns := fake.gatherFilesReturns fake.recordInvocation("GatherFiles", []interface{}{arg1Copy, arg2, arg3, arg4}) fake.gatherFilesMutex.Unlock() - if fake.GatherFilesStub != nil { - return fake.GatherFilesStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.gatherFilesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -164,15 +165,16 @@ func (fake *FakePushActor) MapManifestRoute(arg1 string, arg2 models.Application arg2 models.Application arg3 models.AppParams }{arg1, arg2, arg3}) + stub := fake.MapManifestRouteStub + fakeReturns := fake.mapManifestRouteReturns fake.recordInvocation("MapManifestRoute", []interface{}{arg1, arg2, arg3}) fake.mapManifestRouteMutex.Unlock() - if fake.MapManifestRouteStub != nil { - return fake.MapManifestRouteStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.mapManifestRouteReturns return fakeReturns.result1 } @@ -225,15 +227,16 @@ func (fake *FakePushActor) ProcessPath(arg1 string, arg2 func(string) error) err arg1 string arg2 func(string) error }{arg1, arg2}) + stub := fake.ProcessPathStub + fakeReturns := fake.processPathReturns fake.recordInvocation("ProcessPath", []interface{}{arg1, arg2}) fake.processPathMutex.Unlock() - if fake.ProcessPathStub != nil { - return fake.ProcessPathStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.processPathReturns return fakeReturns.result1 } @@ -292,15 +295,16 @@ func (fake *FakePushActor) UploadApp(arg1 string, arg2 *os.File, arg3 []resource arg2 *os.File arg3 []resources.AppFileResource }{arg1, arg2, arg3Copy}) + stub := fake.UploadAppStub + fakeReturns := fake.uploadAppReturns fake.recordInvocation("UploadApp", []interface{}{arg1, arg2, arg3Copy}) fake.uploadAppMutex.Unlock() - if fake.UploadAppStub != nil { - return fake.UploadAppStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.uploadAppReturns return fakeReturns.result1 } @@ -357,15 +361,16 @@ func (fake *FakePushActor) ValidateAppParams(arg1 []models.AppParams) []error { fake.validateAppParamsArgsForCall = append(fake.validateAppParamsArgsForCall, struct { arg1 []models.AppParams }{arg1Copy}) + stub := fake.ValidateAppParamsStub + fakeReturns := fake.validateAppParamsReturns fake.recordInvocation("ValidateAppParams", []interface{}{arg1Copy}) fake.validateAppParamsMutex.Unlock() - if fake.ValidateAppParamsStub != nil { - return fake.ValidateAppParamsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.validateAppParamsReturns return fakeReturns.result1 } diff --git a/cf/actors/actorsfakes/fake_route_actor.go b/cf/actors/actorsfakes/fake_route_actor.go index 4f7f40933b..942d898d07 100644 --- a/cf/actors/actorsfakes/fake_route_actor.go +++ b/cf/actors/actorsfakes/fake_route_actor.go @@ -4,8 +4,8 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRouteActor struct { @@ -129,15 +129,16 @@ func (fake *FakeRouteActor) BindRoute(arg1 models.Application, arg2 models.Route arg1 models.Application arg2 models.Route }{arg1, arg2}) + stub := fake.BindRouteStub + fakeReturns := fake.bindRouteReturns fake.recordInvocation("BindRoute", []interface{}{arg1, arg2}) fake.bindRouteMutex.Unlock() - if fake.BindRouteStub != nil { - return fake.BindRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindRouteReturns return fakeReturns.result1 } @@ -189,15 +190,16 @@ func (fake *FakeRouteActor) CreateRandomTCPRoute(arg1 models.DomainFields) (mode fake.createRandomTCPRouteArgsForCall = append(fake.createRandomTCPRouteArgsForCall, struct { arg1 models.DomainFields }{arg1}) + stub := fake.CreateRandomTCPRouteStub + fakeReturns := fake.createRandomTCPRouteReturns fake.recordInvocation("CreateRandomTCPRoute", []interface{}{arg1}) fake.createRandomTCPRouteMutex.Unlock() - if fake.CreateRandomTCPRouteStub != nil { - return fake.CreateRandomTCPRouteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createRandomTCPRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -254,15 +256,16 @@ func (fake *FakeRouteActor) FindAndBindRoute(arg1 string, arg2 models.Applicatio arg2 models.Application arg3 models.AppParams }{arg1, arg2, arg3}) + stub := fake.FindAndBindRouteStub + fakeReturns := fake.findAndBindRouteReturns fake.recordInvocation("FindAndBindRoute", []interface{}{arg1, arg2, arg3}) fake.findAndBindRouteMutex.Unlock() - if fake.FindAndBindRouteStub != nil { - return fake.FindAndBindRouteStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.findAndBindRouteReturns return fakeReturns.result1 } @@ -314,15 +317,16 @@ func (fake *FakeRouteActor) FindDomain(arg1 string) (string, models.DomainFields fake.findDomainArgsForCall = append(fake.findDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindDomainStub + fakeReturns := fake.findDomainReturns fake.recordInvocation("FindDomain", []interface{}{arg1}) fake.findDomainMutex.Unlock() - if fake.FindDomainStub != nil { - return fake.FindDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.findDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -384,15 +388,16 @@ func (fake *FakeRouteActor) FindOrCreateRoute(arg1 string, arg2 models.DomainFie arg4 int arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.FindOrCreateRouteStub + fakeReturns := fake.findOrCreateRouteReturns fake.recordInvocation("FindOrCreateRoute", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.findOrCreateRouteMutex.Unlock() - if fake.FindOrCreateRouteStub != nil { - return fake.FindOrCreateRouteStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findOrCreateRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -447,15 +452,16 @@ func (fake *FakeRouteActor) FindPath(arg1 string) (string, string) { fake.findPathArgsForCall = append(fake.findPathArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindPathStub + fakeReturns := fake.findPathReturns fake.recordInvocation("FindPath", []interface{}{arg1}) fake.findPathMutex.Unlock() - if fake.FindPathStub != nil { - return fake.FindPathStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findPathReturns return fakeReturns.result1, fakeReturns.result2 } @@ -510,15 +516,16 @@ func (fake *FakeRouteActor) FindPort(arg1 string) (string, int, error) { fake.findPortArgsForCall = append(fake.findPortArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindPortStub + fakeReturns := fake.findPortReturns fake.recordInvocation("FindPort", []interface{}{arg1}) fake.findPortMutex.Unlock() - if fake.FindPortStub != nil { - return fake.FindPortStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.findPortReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -576,15 +583,16 @@ func (fake *FakeRouteActor) UnbindAll(arg1 models.Application) error { fake.unbindAllArgsForCall = append(fake.unbindAllArgsForCall, struct { arg1 models.Application }{arg1}) + stub := fake.UnbindAllStub + fakeReturns := fake.unbindAllReturns fake.recordInvocation("UnbindAll", []interface{}{arg1}) fake.unbindAllMutex.Unlock() - if fake.UnbindAllStub != nil { - return fake.UnbindAllStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindAllReturns return fakeReturns.result1 } diff --git a/cf/actors/actorsfakes/fake_service_actor.go b/cf/actors/actorsfakes/fake_service_actor.go index 5f55496069..c65986a2ab 100644 --- a/cf/actors/actorsfakes/fake_service_actor.go +++ b/cf/actors/actorsfakes/fake_service_actor.go @@ -4,8 +4,8 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceActor struct { @@ -36,15 +36,16 @@ func (fake *FakeServiceActor) FilterBrokers(arg1 string, arg2 string, arg3 strin arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.FilterBrokersStub + fakeReturns := fake.filterBrokersReturns fake.recordInvocation("FilterBrokers", []interface{}{arg1, arg2, arg3}) fake.filterBrokersMutex.Unlock() - if fake.FilterBrokersStub != nil { - return fake.FilterBrokersStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.filterBrokersReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/actorsfakes/fake_service_plan_actor.go b/cf/actors/actorsfakes/fake_service_plan_actor.go index 9adbb8985e..97983167bb 100644 --- a/cf/actors/actorsfakes/fake_service_plan_actor.go +++ b/cf/actors/actorsfakes/fake_service_plan_actor.go @@ -4,7 +4,7 @@ package actorsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors" ) type FakeServicePlanActor struct { @@ -85,15 +85,16 @@ func (fake *FakeServicePlanActor) FindServiceAccess(arg1 string, arg2 string) (a arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindServiceAccessStub + fakeReturns := fake.findServiceAccessReturns fake.recordInvocation("FindServiceAccess", []interface{}{arg1, arg2}) fake.findServiceAccessMutex.Unlock() - if fake.FindServiceAccessStub != nil { - return fake.FindServiceAccessStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServiceAccessReturns return fakeReturns.result1, fakeReturns.result2 } @@ -149,15 +150,16 @@ func (fake *FakeServicePlanActor) UpdateAllPlansForService(arg1 string, arg2 boo arg1 string arg2 bool }{arg1, arg2}) + stub := fake.UpdateAllPlansForServiceStub + fakeReturns := fake.updateAllPlansForServiceReturns fake.recordInvocation("UpdateAllPlansForService", []interface{}{arg1, arg2}) fake.updateAllPlansForServiceMutex.Unlock() - if fake.UpdateAllPlansForServiceStub != nil { - return fake.UpdateAllPlansForServiceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateAllPlansForServiceReturns return fakeReturns.result1 } @@ -211,15 +213,16 @@ func (fake *FakeServicePlanActor) UpdateOrgForService(arg1 string, arg2 string, arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.UpdateOrgForServiceStub + fakeReturns := fake.updateOrgForServiceReturns fake.recordInvocation("UpdateOrgForService", []interface{}{arg1, arg2, arg3}) fake.updateOrgForServiceMutex.Unlock() - if fake.UpdateOrgForServiceStub != nil { - return fake.UpdateOrgForServiceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateOrgForServiceReturns return fakeReturns.result1 } @@ -274,15 +277,16 @@ func (fake *FakeServicePlanActor) UpdatePlanAndOrgForService(arg1 string, arg2 s arg3 string arg4 bool }{arg1, arg2, arg3, arg4}) + stub := fake.UpdatePlanAndOrgForServiceStub + fakeReturns := fake.updatePlanAndOrgForServiceReturns fake.recordInvocation("UpdatePlanAndOrgForService", []interface{}{arg1, arg2, arg3, arg4}) fake.updatePlanAndOrgForServiceMutex.Unlock() - if fake.UpdatePlanAndOrgForServiceStub != nil { - return fake.UpdatePlanAndOrgForServiceStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.updatePlanAndOrgForServiceReturns return fakeReturns.result1 } @@ -336,15 +340,16 @@ func (fake *FakeServicePlanActor) UpdateSinglePlanForService(arg1 string, arg2 s arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.UpdateSinglePlanForServiceStub + fakeReturns := fake.updateSinglePlanForServiceReturns fake.recordInvocation("UpdateSinglePlanForService", []interface{}{arg1, arg2, arg3}) fake.updateSinglePlanForServiceMutex.Unlock() - if fake.UpdateSinglePlanForServiceStub != nil { - return fake.UpdateSinglePlanForServiceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateSinglePlanForServiceReturns return fakeReturns.result1 } diff --git a/cf/actors/brokerbuilder/broker_builder.go b/cf/actors/brokerbuilder/broker_builder.go index 97c0e0076b..811677d2f4 100644 --- a/cf/actors/brokerbuilder/broker_builder.go +++ b/cf/actors/brokerbuilder/broker_builder.go @@ -1,9 +1,9 @@ package brokerbuilder import ( - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BrokerBuilder diff --git a/cf/actors/brokerbuilder/broker_builder_test.go b/cf/actors/brokerbuilder/broker_builder_test.go index ec3a17b6e7..1275912409 100644 --- a/cf/actors/brokerbuilder/broker_builder_test.go +++ b/cf/actors/brokerbuilder/broker_builder_test.go @@ -3,11 +3,11 @@ package brokerbuilder_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go b/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go index a94e808087..5206b7fb99 100644 --- a/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go +++ b/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go @@ -4,8 +4,8 @@ package brokerbuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeBrokerBuilder struct { @@ -89,15 +89,16 @@ func (fake *FakeBrokerBuilder) AttachBrokersToServices(arg1 []models.ServiceOffe fake.attachBrokersToServicesArgsForCall = append(fake.attachBrokersToServicesArgsForCall, struct { arg1 []models.ServiceOffering }{arg1Copy}) + stub := fake.AttachBrokersToServicesStub + fakeReturns := fake.attachBrokersToServicesReturns fake.recordInvocation("AttachBrokersToServices", []interface{}{arg1Copy}) fake.attachBrokersToServicesMutex.Unlock() - if fake.AttachBrokersToServicesStub != nil { - return fake.AttachBrokersToServicesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.attachBrokersToServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -158,15 +159,16 @@ func (fake *FakeBrokerBuilder) AttachSpecificBrokerToServices(arg1 string, arg2 arg1 string arg2 []models.ServiceOffering }{arg1, arg2Copy}) + stub := fake.AttachSpecificBrokerToServicesStub + fakeReturns := fake.attachSpecificBrokerToServicesReturns fake.recordInvocation("AttachSpecificBrokerToServices", []interface{}{arg1, arg2Copy}) fake.attachSpecificBrokerToServicesMutex.Unlock() - if fake.AttachSpecificBrokerToServicesStub != nil { - return fake.AttachSpecificBrokerToServicesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.attachSpecificBrokerToServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -220,15 +222,16 @@ func (fake *FakeBrokerBuilder) GetAllServiceBrokers() ([]models.ServiceBroker, e ret, specificReturn := fake.getAllServiceBrokersReturnsOnCall[len(fake.getAllServiceBrokersArgsForCall)] fake.getAllServiceBrokersArgsForCall = append(fake.getAllServiceBrokersArgsForCall, struct { }{}) + stub := fake.GetAllServiceBrokersStub + fakeReturns := fake.getAllServiceBrokersReturns fake.recordInvocation("GetAllServiceBrokers", []interface{}{}) fake.getAllServiceBrokersMutex.Unlock() - if fake.GetAllServiceBrokersStub != nil { - return fake.GetAllServiceBrokersStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAllServiceBrokersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -276,15 +279,16 @@ func (fake *FakeBrokerBuilder) GetBrokerWithAllServices(arg1 string) (models.Ser fake.getBrokerWithAllServicesArgsForCall = append(fake.getBrokerWithAllServicesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetBrokerWithAllServicesStub + fakeReturns := fake.getBrokerWithAllServicesReturns fake.recordInvocation("GetBrokerWithAllServices", []interface{}{arg1}) fake.getBrokerWithAllServicesMutex.Unlock() - if fake.GetBrokerWithAllServicesStub != nil { - return fake.GetBrokerWithAllServicesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getBrokerWithAllServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -339,15 +343,16 @@ func (fake *FakeBrokerBuilder) GetBrokerWithSpecifiedService(arg1 string) (model fake.getBrokerWithSpecifiedServiceArgsForCall = append(fake.getBrokerWithSpecifiedServiceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetBrokerWithSpecifiedServiceStub + fakeReturns := fake.getBrokerWithSpecifiedServiceReturns fake.recordInvocation("GetBrokerWithSpecifiedService", []interface{}{arg1}) fake.getBrokerWithSpecifiedServiceMutex.Unlock() - if fake.GetBrokerWithSpecifiedServiceStub != nil { - return fake.GetBrokerWithSpecifiedServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getBrokerWithSpecifiedServiceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/planbuilder/plan_builder.go b/cf/actors/planbuilder/plan_builder.go index 4d735ba577..5c1a74a815 100644 --- a/cf/actors/planbuilder/plan_builder.go +++ b/cf/actors/planbuilder/plan_builder.go @@ -1,9 +1,9 @@ package planbuilder import ( - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PlanBuilder diff --git a/cf/actors/planbuilder/plan_builder_test.go b/cf/actors/planbuilder/plan_builder_test.go index 8f842bb11c..5edf5d12e5 100644 --- a/cf/actors/planbuilder/plan_builder_test.go +++ b/cf/actors/planbuilder/plan_builder_test.go @@ -3,10 +3,10 @@ package planbuilder_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go b/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go index ec8080b956..a04732f185 100644 --- a/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go +++ b/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go @@ -4,8 +4,8 @@ package planbuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakePlanBuilder struct { @@ -118,15 +118,16 @@ func (fake *FakePlanBuilder) AttachOrgToPlans(arg1 []models.ServicePlanFields, a arg1 []models.ServicePlanFields arg2 string }{arg1Copy, arg2}) + stub := fake.AttachOrgToPlansStub + fakeReturns := fake.attachOrgToPlansReturns fake.recordInvocation("AttachOrgToPlans", []interface{}{arg1Copy, arg2}) fake.attachOrgToPlansMutex.Unlock() - if fake.AttachOrgToPlansStub != nil { - return fake.AttachOrgToPlansStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.attachOrgToPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -186,15 +187,16 @@ func (fake *FakePlanBuilder) AttachOrgsToPlans(arg1 []models.ServicePlanFields) fake.attachOrgsToPlansArgsForCall = append(fake.attachOrgsToPlansArgsForCall, struct { arg1 []models.ServicePlanFields }{arg1Copy}) + stub := fake.AttachOrgsToPlansStub + fakeReturns := fake.attachOrgsToPlansReturns fake.recordInvocation("AttachOrgsToPlans", []interface{}{arg1Copy}) fake.attachOrgsToPlansMutex.Unlock() - if fake.AttachOrgsToPlansStub != nil { - return fake.AttachOrgsToPlansStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.attachOrgsToPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -254,15 +256,16 @@ func (fake *FakePlanBuilder) GetPlansForManyServicesWithOrgs(arg1 []string) ([]m fake.getPlansForManyServicesWithOrgsArgsForCall = append(fake.getPlansForManyServicesWithOrgsArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.GetPlansForManyServicesWithOrgsStub + fakeReturns := fake.getPlansForManyServicesWithOrgsReturns fake.recordInvocation("GetPlansForManyServicesWithOrgs", []interface{}{arg1Copy}) fake.getPlansForManyServicesWithOrgsMutex.Unlock() - if fake.GetPlansForManyServicesWithOrgsStub != nil { - return fake.GetPlansForManyServicesWithOrgsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansForManyServicesWithOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -317,15 +320,16 @@ func (fake *FakePlanBuilder) GetPlansForService(arg1 string) ([]models.ServicePl fake.getPlansForServiceArgsForCall = append(fake.getPlansForServiceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPlansForServiceStub + fakeReturns := fake.getPlansForServiceReturns fake.recordInvocation("GetPlansForService", []interface{}{arg1}) fake.getPlansForServiceMutex.Unlock() - if fake.GetPlansForServiceStub != nil { - return fake.GetPlansForServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansForServiceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -381,15 +385,16 @@ func (fake *FakePlanBuilder) GetPlansForServiceForOrg(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetPlansForServiceForOrgStub + fakeReturns := fake.getPlansForServiceForOrgReturns fake.recordInvocation("GetPlansForServiceForOrg", []interface{}{arg1, arg2}) fake.getPlansForServiceForOrgMutex.Unlock() - if fake.GetPlansForServiceForOrgStub != nil { - return fake.GetPlansForServiceForOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansForServiceForOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -444,15 +449,16 @@ func (fake *FakePlanBuilder) GetPlansForServiceWithOrgs(arg1 string) ([]models.S fake.getPlansForServiceWithOrgsArgsForCall = append(fake.getPlansForServiceWithOrgsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPlansForServiceWithOrgsStub + fakeReturns := fake.getPlansForServiceWithOrgsReturns fake.recordInvocation("GetPlansForServiceWithOrgs", []interface{}{arg1}) fake.getPlansForServiceWithOrgsMutex.Unlock() - if fake.GetPlansForServiceWithOrgsStub != nil { - return fake.GetPlansForServiceWithOrgsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansForServiceWithOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -507,15 +513,16 @@ func (fake *FakePlanBuilder) GetPlansVisibleToOrg(arg1 string) ([]models.Service fake.getPlansVisibleToOrgArgsForCall = append(fake.getPlansVisibleToOrgArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPlansVisibleToOrgStub + fakeReturns := fake.getPlansVisibleToOrgReturns fake.recordInvocation("GetPlansVisibleToOrg", []interface{}{arg1}) fake.getPlansVisibleToOrgMutex.Unlock() - if fake.GetPlansVisibleToOrgStub != nil { - return fake.GetPlansVisibleToOrgStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPlansVisibleToOrgReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/plugininstaller/plugin_downloader.go b/cf/actors/plugininstaller/plugin_downloader.go index d6be89fcc2..a3574deafe 100644 --- a/cf/actors/plugininstaller/plugin_downloader.go +++ b/cf/actors/plugininstaller/plugin_downloader.go @@ -7,9 +7,9 @@ import ( "runtime" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/downloader" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/downloader" ) type PluginDownloader struct { diff --git a/cf/actors/plugininstaller/plugin_installer.go b/cf/actors/plugininstaller/plugin_installer.go index cc173e17b6..f895240cb9 100644 --- a/cf/actors/plugininstaller/plugin_installer.go +++ b/cf/actors/plugininstaller/plugin_installer.go @@ -1,11 +1,11 @@ package plugininstaller import ( - "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/downloader" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/downloader" + "code.cloudfoundry.org/cli/v9/util" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginInstaller diff --git a/cf/actors/plugininstaller/plugin_installer_with_repo.go b/cf/actors/plugininstaller/plugin_installer_with_repo.go index d861446326..2b7c56caba 100644 --- a/cf/actors/plugininstaller/plugin_installer_with_repo.go +++ b/cf/actors/plugininstaller/plugin_installer_with_repo.go @@ -5,11 +5,11 @@ import ( "strings" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/util" ) type pluginInstallerWithRepo struct { diff --git a/cf/actors/plugininstaller/plugin_installer_without_repo.go b/cf/actors/plugininstaller/plugin_installer_without_repo.go index 10b2787dae..76c82dfb15 100644 --- a/cf/actors/plugininstaller/plugin_installer_without_repo.go +++ b/cf/actors/plugininstaller/plugin_installer_without_repo.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type pluginInstallerWithoutRepo struct { diff --git a/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go b/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go index 45c132a499..4b9f14b593 100644 --- a/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go +++ b/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go @@ -4,7 +4,7 @@ package plugininstallerfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/actors/plugininstaller" + "code.cloudfoundry.org/cli/v9/cf/actors/plugininstaller" ) type FakePluginInstaller struct { @@ -29,15 +29,16 @@ func (fake *FakePluginInstaller) Install(arg1 string) string { fake.installArgsForCall = append(fake.installArgsForCall, struct { arg1 string }{arg1}) + stub := fake.InstallStub + fakeReturns := fake.installReturns fake.recordInvocation("Install", []interface{}{arg1}) fake.installMutex.Unlock() - if fake.InstallStub != nil { - return fake.InstallStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.installReturns return fakeReturns.result1 } diff --git a/cf/actors/pluginrepo/plugin_repo.go b/cf/actors/pluginrepo/plugin_repo.go index 2196e5575b..ef5bbb5a63 100644 --- a/cf/actors/pluginrepo/plugin_repo.go +++ b/cf/actors/pluginrepo/plugin_repo.go @@ -8,9 +8,9 @@ import ( "strings" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginRepo diff --git a/cf/actors/pluginrepo/plugin_repo_suite_test.go b/cf/actors/pluginrepo/plugin_repo_suite_test.go index 638c7d68db..817e4f82a7 100644 --- a/cf/actors/pluginrepo/plugin_repo_suite_test.go +++ b/cf/actors/pluginrepo/plugin_repo_suite_test.go @@ -1,8 +1,8 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/pluginrepo/plugin_repo_test.go b/cf/actors/pluginrepo/plugin_repo_test.go index 6bd5415ba8..b57933c25b 100644 --- a/cf/actors/pluginrepo/plugin_repo_test.go +++ b/cf/actors/pluginrepo/plugin_repo_test.go @@ -5,9 +5,9 @@ import ( "net/http" "net/http/httptest" - . "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go b/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go index 776d1b4e74..00ca386624 100644 --- a/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go +++ b/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go @@ -4,9 +4,9 @@ package pluginrepofakes import ( "sync" - "code.cloudfoundry.org/cli/v8-plugin-repo/web" - "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli-plugin-repo/web" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakePluginRepo struct { diff --git a/cf/actors/push.go b/cf/actors/push.go index 24942ec5bc..0f1613ae63 100644 --- a/cf/actors/push.go +++ b/cf/actors/push.go @@ -7,11 +7,11 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/appfiles" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/actors/push_test.go b/cf/actors/push_test.go index 46145cedf6..cc80cf293c 100644 --- a/cf/actors/push_test.go +++ b/cf/actors/push_test.go @@ -8,13 +8,13 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/applicationbits/applicationbitsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/appfiles" - "code.cloudfoundry.org/cli/v8/cf/appfiles/appfilesfakes" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits/applicationbitsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/appfiles/appfilesfakes" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/routes.go b/cf/actors/routes.go index 361bdfb780..bd9d93561c 100644 --- a/cf/actors/routes.go +++ b/cf/actors/routes.go @@ -5,12 +5,12 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/util/randomword" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/util/randomword" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteActor diff --git a/cf/actors/routes_test.go b/cf/actors/routes_test.go index c8be541120..b0d9e98a26 100644 --- a/cf/actors/routes_test.go +++ b/cf/actors/routes_test.go @@ -3,12 +3,12 @@ package actors_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - cferrors "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/errors/errorsfakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + . "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + cferrors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/errors/errorsfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/servicebuilder/service_builder.go b/cf/actors/servicebuilder/service_builder.go index d719ba0034..6e19d49702 100644 --- a/cf/actors/servicebuilder/service_builder.go +++ b/cf/actors/servicebuilder/service_builder.go @@ -3,9 +3,9 @@ package servicebuilder import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBuilder diff --git a/cf/actors/servicebuilder/service_builder_test.go b/cf/actors/servicebuilder/service_builder_test.go index 83a0290ce9..b696c8236e 100644 --- a/cf/actors/servicebuilder/service_builder_test.go +++ b/cf/actors/servicebuilder/service_builder_test.go @@ -3,11 +3,11 @@ package servicebuilder_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go b/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go index f3ef94d04c..86af057323 100644 --- a/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go +++ b/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go @@ -4,8 +4,8 @@ package servicebuilderfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceBuilder struct { @@ -203,15 +203,16 @@ func (fake *FakeServiceBuilder) GetAllServices() ([]models.ServiceOffering, erro ret, specificReturn := fake.getAllServicesReturnsOnCall[len(fake.getAllServicesArgsForCall)] fake.getAllServicesArgsForCall = append(fake.getAllServicesArgsForCall, struct { }{}) + stub := fake.GetAllServicesStub + fakeReturns := fake.getAllServicesReturns fake.recordInvocation("GetAllServices", []interface{}{}) fake.getAllServicesMutex.Unlock() - if fake.GetAllServicesStub != nil { - return fake.GetAllServicesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAllServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -258,15 +259,16 @@ func (fake *FakeServiceBuilder) GetAllServicesWithPlans() ([]models.ServiceOffer ret, specificReturn := fake.getAllServicesWithPlansReturnsOnCall[len(fake.getAllServicesWithPlansArgsForCall)] fake.getAllServicesWithPlansArgsForCall = append(fake.getAllServicesWithPlansArgsForCall, struct { }{}) + stub := fake.GetAllServicesWithPlansStub + fakeReturns := fake.getAllServicesWithPlansReturns fake.recordInvocation("GetAllServicesWithPlans", []interface{}{}) fake.getAllServicesWithPlansMutex.Unlock() - if fake.GetAllServicesWithPlansStub != nil { - return fake.GetAllServicesWithPlansStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAllServicesWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -315,15 +317,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameForOrg(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceByNameForOrgStub + fakeReturns := fake.getServiceByNameForOrgReturns fake.recordInvocation("GetServiceByNameForOrg", []interface{}{arg1, arg2}) fake.getServiceByNameForOrgMutex.Unlock() - if fake.GetServiceByNameForOrgStub != nil { - return fake.GetServiceByNameForOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameForOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -379,15 +382,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameForSpace(arg1 string, arg2 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceByNameForSpaceStub + fakeReturns := fake.getServiceByNameForSpaceReturns fake.recordInvocation("GetServiceByNameForSpace", []interface{}{arg1, arg2}) fake.getServiceByNameForSpaceMutex.Unlock() - if fake.GetServiceByNameForSpaceStub != nil { - return fake.GetServiceByNameForSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameForSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -443,15 +447,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameForSpaceWithPlans(arg1 string, a arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceByNameForSpaceWithPlansStub + fakeReturns := fake.getServiceByNameForSpaceWithPlansReturns fake.recordInvocation("GetServiceByNameForSpaceWithPlans", []interface{}{arg1, arg2}) fake.getServiceByNameForSpaceWithPlansMutex.Unlock() - if fake.GetServiceByNameForSpaceWithPlansStub != nil { - return fake.GetServiceByNameForSpaceWithPlansStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameForSpaceWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -506,15 +511,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameWithPlans(arg1 string) (models.S fake.getServiceByNameWithPlansArgsForCall = append(fake.getServiceByNameWithPlansArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceByNameWithPlansStub + fakeReturns := fake.getServiceByNameWithPlansReturns fake.recordInvocation("GetServiceByNameWithPlans", []interface{}{arg1}) fake.getServiceByNameWithPlansMutex.Unlock() - if fake.GetServiceByNameWithPlansStub != nil { - return fake.GetServiceByNameWithPlansStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -569,15 +575,16 @@ func (fake *FakeServiceBuilder) GetServiceByNameWithPlansWithOrgNames(arg1 strin fake.getServiceByNameWithPlansWithOrgNamesArgsForCall = append(fake.getServiceByNameWithPlansWithOrgNamesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceByNameWithPlansWithOrgNamesStub + fakeReturns := fake.getServiceByNameWithPlansWithOrgNamesReturns fake.recordInvocation("GetServiceByNameWithPlansWithOrgNames", []interface{}{arg1}) fake.getServiceByNameWithPlansWithOrgNamesMutex.Unlock() - if fake.GetServiceByNameWithPlansWithOrgNamesStub != nil { - return fake.GetServiceByNameWithPlansWithOrgNamesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceByNameWithPlansWithOrgNamesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -633,15 +640,16 @@ func (fake *FakeServiceBuilder) GetServiceVisibleToOrg(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceVisibleToOrgStub + fakeReturns := fake.getServiceVisibleToOrgReturns fake.recordInvocation("GetServiceVisibleToOrg", []interface{}{arg1, arg2}) fake.getServiceVisibleToOrgMutex.Unlock() - if fake.GetServiceVisibleToOrgStub != nil { - return fake.GetServiceVisibleToOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceVisibleToOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -697,15 +705,16 @@ func (fake *FakeServiceBuilder) GetServicesByNameForSpaceWithPlans(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServicesByNameForSpaceWithPlansStub + fakeReturns := fake.getServicesByNameForSpaceWithPlansReturns fake.recordInvocation("GetServicesByNameForSpaceWithPlans", []interface{}{arg1, arg2}) fake.getServicesByNameForSpaceWithPlansMutex.Unlock() - if fake.GetServicesByNameForSpaceWithPlansStub != nil { - return fake.GetServicesByNameForSpaceWithPlansStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesByNameForSpaceWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -760,15 +769,16 @@ func (fake *FakeServiceBuilder) GetServicesForBroker(arg1 string) ([]models.Serv fake.getServicesForBrokerArgsForCall = append(fake.getServicesForBrokerArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicesForBrokerStub + fakeReturns := fake.getServicesForBrokerReturns fake.recordInvocation("GetServicesForBroker", []interface{}{arg1}) fake.getServicesForBrokerMutex.Unlock() - if fake.GetServicesForBrokerStub != nil { - return fake.GetServicesForBrokerStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesForBrokerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -828,15 +838,16 @@ func (fake *FakeServiceBuilder) GetServicesForManyBrokers(arg1 []string) ([]mode fake.getServicesForManyBrokersArgsForCall = append(fake.getServicesForManyBrokersArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.GetServicesForManyBrokersStub + fakeReturns := fake.getServicesForManyBrokersReturns fake.recordInvocation("GetServicesForManyBrokers", []interface{}{arg1Copy}) fake.getServicesForManyBrokersMutex.Unlock() - if fake.GetServicesForManyBrokersStub != nil { - return fake.GetServicesForManyBrokersStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesForManyBrokersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -891,15 +902,16 @@ func (fake *FakeServiceBuilder) GetServicesForSpace(arg1 string) ([]models.Servi fake.getServicesForSpaceArgsForCall = append(fake.getServicesForSpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicesForSpaceStub + fakeReturns := fake.getServicesForSpaceReturns fake.recordInvocation("GetServicesForSpace", []interface{}{arg1}) fake.getServicesForSpaceMutex.Unlock() - if fake.GetServicesForSpaceStub != nil { - return fake.GetServicesForSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesForSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -954,15 +966,16 @@ func (fake *FakeServiceBuilder) GetServicesForSpaceWithPlans(arg1 string) ([]mod fake.getServicesForSpaceWithPlansArgsForCall = append(fake.getServicesForSpaceWithPlansArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicesForSpaceWithPlansStub + fakeReturns := fake.getServicesForSpaceWithPlansReturns fake.recordInvocation("GetServicesForSpaceWithPlans", []interface{}{arg1}) fake.getServicesForSpaceWithPlansMutex.Unlock() - if fake.GetServicesForSpaceWithPlansStub != nil { - return fake.GetServicesForSpaceWithPlansStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesForSpaceWithPlansReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1017,15 +1030,16 @@ func (fake *FakeServiceBuilder) GetServicesVisibleToOrg(arg1 string) ([]models.S fake.getServicesVisibleToOrgArgsForCall = append(fake.getServicesVisibleToOrgArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicesVisibleToOrgStub + fakeReturns := fake.getServicesVisibleToOrgReturns fake.recordInvocation("GetServicesVisibleToOrg", []interface{}{arg1}) fake.getServicesVisibleToOrgMutex.Unlock() - if fake.GetServicesVisibleToOrgStub != nil { - return fake.GetServicesVisibleToOrgStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesVisibleToOrgReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/actors/services.go b/cf/actors/services.go index bc081e0e71..ebb42fa00e 100644 --- a/cf/actors/services.go +++ b/cf/actors/services.go @@ -1,10 +1,10 @@ package actors import ( - "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceActor diff --git a/cf/actors/services_plans.go b/cf/actors/services_plans.go index c40dd98e03..4d644042a2 100644 --- a/cf/actors/services_plans.go +++ b/cf/actors/services_plans.go @@ -3,12 +3,12 @@ package actors import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanActor diff --git a/cf/actors/services_plans_test.go b/cf/actors/services_plans_test.go index 7720bc2c1a..9579320d1e 100644 --- a/cf/actors/services_plans_test.go +++ b/cf/actors/services_plans_test.go @@ -1,14 +1,14 @@ package actors_test import ( - "code.cloudfoundry.org/cli/v8/cf/errors" - - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/errors" + + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/services_test.go b/cf/actors/services_test.go index f71ae92716..b075d0266d 100644 --- a/cf/actors/services_test.go +++ b/cf/actors/services_test.go @@ -1,12 +1,12 @@ package actors_test import ( - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder/brokerbuilderfakes" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder/brokerbuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/actors/userprint/plugin.go b/cf/actors/userprint/plugin.go index 2474aa11a4..46443b2a1b 100644 --- a/cf/actors/userprint/plugin.go +++ b/cf/actors/userprint/plugin.go @@ -1,8 +1,8 @@ package userprint import ( - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type pluginPrinter struct { diff --git a/cf/actors/userprint/ui.go b/cf/actors/userprint/ui.go index ad2ecb5039..168cd0adf8 100644 --- a/cf/actors/userprint/ui.go +++ b/cf/actors/userprint/ui.go @@ -1,9 +1,9 @@ package userprint import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SpaceUsersUIPrinter struct { diff --git a/cf/actors/userprint/userprintfakes/fake_user_printer.go b/cf/actors/userprint/userprintfakes/fake_user_printer.go index 443ce542dc..9f039fb864 100644 --- a/cf/actors/userprint/userprintfakes/fake_user_printer.go +++ b/cf/actors/userprint/userprintfakes/fake_user_printer.go @@ -4,7 +4,7 @@ package userprintfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/actors/userprint" + "code.cloudfoundry.org/cli/v9/cf/actors/userprint" ) type FakeUserPrinter struct { @@ -24,9 +24,10 @@ func (fake *FakeUserPrinter) PrintUsers(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.PrintUsersStub fake.recordInvocation("PrintUsers", []interface{}{arg1, arg2}) fake.printUsersMutex.Unlock() - if fake.PrintUsersStub != nil { + if stub != nil { fake.PrintUsersStub(arg1, arg2) } } diff --git a/cf/api/api_suite_test.go b/cf/api/api_suite_test.go index 44c036cb86..9e333fbb6f 100644 --- a/cf/api/api_suite_test.go +++ b/cf/api/api_suite_test.go @@ -1,8 +1,8 @@ package api_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/apifakes/fake_app_summary_repository.go b/cf/api/apifakes/fake_app_summary_repository.go index f42bf309f6..20e96c8201 100644 --- a/cf/api/apifakes/fake_app_summary_repository.go +++ b/cf/api/apifakes/fake_app_summary_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeAppSummaryRepository struct { @@ -43,15 +43,16 @@ func (fake *FakeAppSummaryRepository) GetSummariesInCurrentSpace() ([]models.App ret, specificReturn := fake.getSummariesInCurrentSpaceReturnsOnCall[len(fake.getSummariesInCurrentSpaceArgsForCall)] fake.getSummariesInCurrentSpaceArgsForCall = append(fake.getSummariesInCurrentSpaceArgsForCall, struct { }{}) + stub := fake.GetSummariesInCurrentSpaceStub + fakeReturns := fake.getSummariesInCurrentSpaceReturns fake.recordInvocation("GetSummariesInCurrentSpace", []interface{}{}) fake.getSummariesInCurrentSpaceMutex.Unlock() - if fake.GetSummariesInCurrentSpaceStub != nil { - return fake.GetSummariesInCurrentSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSummariesInCurrentSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -99,15 +100,16 @@ func (fake *FakeAppSummaryRepository) GetSummary(arg1 string) (models.Applicatio fake.getSummaryArgsForCall = append(fake.getSummaryArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSummaryStub + fakeReturns := fake.getSummaryReturns fake.recordInvocation("GetSummary", []interface{}{arg1}) fake.getSummaryMutex.Unlock() - if fake.GetSummaryStub != nil { - return fake.GetSummaryStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSummaryReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_buildpack_bits_repository.go b/cf/api/apifakes/fake_buildpack_bits_repository.go index 58a208c376..0af7815bbf 100644 --- a/cf/api/apifakes/fake_buildpack_bits_repository.go +++ b/cf/api/apifakes/fake_buildpack_bits_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeBuildpackBitsRepository struct { @@ -48,15 +48,16 @@ func (fake *FakeBuildpackBitsRepository) CreateBuildpackZipFile(arg1 string) (*o fake.createBuildpackZipFileArgsForCall = append(fake.createBuildpackZipFileArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateBuildpackZipFileStub + fakeReturns := fake.createBuildpackZipFileReturns fake.recordInvocation("CreateBuildpackZipFile", []interface{}{arg1}) fake.createBuildpackZipFileMutex.Unlock() - if fake.CreateBuildpackZipFileStub != nil { - return fake.CreateBuildpackZipFileStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBuildpackZipFileReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -116,15 +117,16 @@ func (fake *FakeBuildpackBitsRepository) UploadBuildpack(arg1 models.Buildpack, arg2 *os.File arg3 string }{arg1, arg2, arg3}) + stub := fake.UploadBuildpackStub + fakeReturns := fake.uploadBuildpackReturns fake.recordInvocation("UploadBuildpack", []interface{}{arg1, arg2, arg3}) fake.uploadBuildpackMutex.Unlock() - if fake.UploadBuildpackStub != nil { - return fake.UploadBuildpackStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.uploadBuildpackReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_buildpack_repository.go b/cf/api/apifakes/fake_buildpack_repository.go index 382706a3e4..44e15ddd74 100644 --- a/cf/api/apifakes/fake_buildpack_repository.go +++ b/cf/api/apifakes/fake_buildpack_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeBuildpackRepository struct { @@ -113,15 +113,16 @@ func (fake *FakeBuildpackRepository) Create(arg1 string, arg2 *int, arg3 *bool, arg3 *bool arg4 *bool }{arg1, arg2, arg3, arg4}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3, arg4}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -176,15 +177,16 @@ func (fake *FakeBuildpackRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -236,15 +238,16 @@ func (fake *FakeBuildpackRepository) FindByName(arg1 string) (models.Buildpack, fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -300,15 +303,16 @@ func (fake *FakeBuildpackRepository) FindByNameAndStack(arg1 string, arg2 string arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByNameAndStackStub + fakeReturns := fake.findByNameAndStackReturns fake.recordInvocation("FindByNameAndStack", []interface{}{arg1, arg2}) fake.findByNameAndStackMutex.Unlock() - if fake.FindByNameAndStackStub != nil { - return fake.FindByNameAndStackStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameAndStackReturns return fakeReturns.result1, fakeReturns.result2 } @@ -363,15 +367,16 @@ func (fake *FakeBuildpackRepository) FindByNameWithNilStack(arg1 string) (models fake.findByNameWithNilStackArgsForCall = append(fake.findByNameWithNilStackArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameWithNilStackStub + fakeReturns := fake.findByNameWithNilStackReturns fake.recordInvocation("FindByNameWithNilStack", []interface{}{arg1}) fake.findByNameWithNilStackMutex.Unlock() - if fake.FindByNameWithNilStackStub != nil { - return fake.FindByNameWithNilStackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameWithNilStackReturns return fakeReturns.result1, fakeReturns.result2 } @@ -426,15 +431,16 @@ func (fake *FakeBuildpackRepository) ListBuildpacks(arg1 func(models.Buildpack) fake.listBuildpacksArgsForCall = append(fake.listBuildpacksArgsForCall, struct { arg1 func(models.Buildpack) bool }{arg1}) + stub := fake.ListBuildpacksStub + fakeReturns := fake.listBuildpacksReturns fake.recordInvocation("ListBuildpacks", []interface{}{arg1}) fake.listBuildpacksMutex.Unlock() - if fake.ListBuildpacksStub != nil { - return fake.ListBuildpacksStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listBuildpacksReturns return fakeReturns.result1 } @@ -486,15 +492,16 @@ func (fake *FakeBuildpackRepository) Update(arg1 models.Buildpack) (models.Build fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.Buildpack }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_client_repository.go b/cf/api/apifakes/fake_client_repository.go index f59e450419..8939e3c167 100644 --- a/cf/api/apifakes/fake_client_repository.go +++ b/cf/api/apifakes/fake_client_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api" ) type FakeClientRepository struct { @@ -31,15 +31,16 @@ func (fake *FakeClientRepository) ClientExists(arg1 string) (bool, error) { fake.clientExistsArgsForCall = append(fake.clientExistsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ClientExistsStub + fakeReturns := fake.clientExistsReturns fake.recordInvocation("ClientExists", []interface{}{arg1}) fake.clientExistsMutex.Unlock() - if fake.ClientExistsStub != nil { - return fake.ClientExistsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.clientExistsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_curl_repository.go b/cf/api/apifakes/fake_curl_repository.go index b6aeb4af56..51aa040acb 100644 --- a/cf/api/apifakes/fake_curl_repository.go +++ b/cf/api/apifakes/fake_curl_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api" ) type FakeCurlRepository struct { @@ -41,15 +41,16 @@ func (fake *FakeCurlRepository) Request(arg1 string, arg2 string, arg3 string, a arg4 string arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.RequestStub + fakeReturns := fake.requestReturns fake.recordInvocation("Request", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.requestMutex.Unlock() - if fake.RequestStub != nil { - return fake.RequestStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.requestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/cf/api/apifakes/fake_domain_repository.go b/cf/api/apifakes/fake_domain_repository.go index 4eb7da2f3a..13dd9efbf7 100644 --- a/cf/api/apifakes/fake_domain_repository.go +++ b/cf/api/apifakes/fake_domain_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeDomainRepository struct { @@ -134,15 +134,16 @@ func (fake *FakeDomainRepository) Create(arg1 string, arg2 string) (models.Domai arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -198,15 +199,16 @@ func (fake *FakeDomainRepository) CreateSharedDomain(arg1 string, arg2 string) e arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateSharedDomainStub + fakeReturns := fake.createSharedDomainReturns fake.recordInvocation("CreateSharedDomain", []interface{}{arg1, arg2}) fake.createSharedDomainMutex.Unlock() - if fake.CreateSharedDomainStub != nil { - return fake.CreateSharedDomainStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.createSharedDomainReturns return fakeReturns.result1 } @@ -258,15 +260,16 @@ func (fake *FakeDomainRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -318,15 +321,16 @@ func (fake *FakeDomainRepository) DeleteSharedDomain(arg1 string) error { fake.deleteSharedDomainArgsForCall = append(fake.deleteSharedDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteSharedDomainStub + fakeReturns := fake.deleteSharedDomainReturns fake.recordInvocation("DeleteSharedDomain", []interface{}{arg1}) fake.deleteSharedDomainMutex.Unlock() - if fake.DeleteSharedDomainStub != nil { - return fake.DeleteSharedDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteSharedDomainReturns return fakeReturns.result1 } @@ -379,15 +383,16 @@ func (fake *FakeDomainRepository) FindByNameInOrg(arg1 string, arg2 string) (mod arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByNameInOrgStub + fakeReturns := fake.findByNameInOrgReturns fake.recordInvocation("FindByNameInOrg", []interface{}{arg1, arg2}) fake.findByNameInOrgMutex.Unlock() - if fake.FindByNameInOrgStub != nil { - return fake.FindByNameInOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameInOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -442,15 +447,16 @@ func (fake *FakeDomainRepository) FindPrivateByName(arg1 string) (models.DomainF fake.findPrivateByNameArgsForCall = append(fake.findPrivateByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindPrivateByNameStub + fakeReturns := fake.findPrivateByNameReturns fake.recordInvocation("FindPrivateByName", []interface{}{arg1}) fake.findPrivateByNameMutex.Unlock() - if fake.FindPrivateByNameStub != nil { - return fake.FindPrivateByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findPrivateByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -505,15 +511,16 @@ func (fake *FakeDomainRepository) FindSharedByName(arg1 string) (models.DomainFi fake.findSharedByNameArgsForCall = append(fake.findSharedByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindSharedByNameStub + fakeReturns := fake.findSharedByNameReturns fake.recordInvocation("FindSharedByName", []interface{}{arg1}) fake.findSharedByNameMutex.Unlock() - if fake.FindSharedByNameStub != nil { - return fake.FindSharedByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findSharedByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -569,15 +576,16 @@ func (fake *FakeDomainRepository) FirstOrDefault(arg1 string, arg2 *string) (mod arg1 string arg2 *string }{arg1, arg2}) + stub := fake.FirstOrDefaultStub + fakeReturns := fake.firstOrDefaultReturns fake.recordInvocation("FirstOrDefault", []interface{}{arg1, arg2}) fake.firstOrDefaultMutex.Unlock() - if fake.FirstOrDefaultStub != nil { - return fake.FirstOrDefaultStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.firstOrDefaultReturns return fakeReturns.result1, fakeReturns.result2 } @@ -633,15 +641,16 @@ func (fake *FakeDomainRepository) ListDomainsForOrg(arg1 string, arg2 func(model arg1 string arg2 func(models.DomainFields) bool }{arg1, arg2}) + stub := fake.ListDomainsForOrgStub + fakeReturns := fake.listDomainsForOrgReturns fake.recordInvocation("ListDomainsForOrg", []interface{}{arg1, arg2}) fake.listDomainsForOrgMutex.Unlock() - if fake.ListDomainsForOrgStub != nil { - return fake.ListDomainsForOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.listDomainsForOrgReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_route_repository.go b/cf/api/apifakes/fake_route_repository.go index 92d1469891..db9a1a07f0 100644 --- a/cf/api/apifakes/fake_route_repository.go +++ b/cf/api/apifakes/fake_route_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRouteRepository struct { @@ -143,15 +143,16 @@ func (fake *FakeRouteRepository) Bind(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.BindStub + fakeReturns := fake.bindReturns fake.recordInvocation("Bind", []interface{}{arg1, arg2}) fake.bindMutex.Unlock() - if fake.BindStub != nil { - return fake.BindStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindReturns return fakeReturns.result1 } @@ -205,15 +206,16 @@ func (fake *FakeRouteRepository) CheckIfExists(arg1 string, arg2 models.DomainFi arg2 models.DomainFields arg3 string }{arg1, arg2, arg3}) + stub := fake.CheckIfExistsStub + fakeReturns := fake.checkIfExistsReturns fake.recordInvocation("CheckIfExists", []interface{}{arg1, arg2, arg3}) fake.checkIfExistsMutex.Unlock() - if fake.CheckIfExistsStub != nil { - return fake.CheckIfExistsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.checkIfExistsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -272,15 +274,16 @@ func (fake *FakeRouteRepository) Create(arg1 string, arg2 models.DomainFields, a arg4 int arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -340,15 +343,16 @@ func (fake *FakeRouteRepository) CreateInSpace(arg1 string, arg2 string, arg3 st arg5 int arg6 bool }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.CreateInSpaceStub + fakeReturns := fake.createInSpaceReturns fake.recordInvocation("CreateInSpace", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) fake.createInSpaceMutex.Unlock() - if fake.CreateInSpaceStub != nil { - return fake.CreateInSpaceStub(arg1, arg2, arg3, arg4, arg5, arg6) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createInSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -403,15 +407,16 @@ func (fake *FakeRouteRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -466,15 +471,16 @@ func (fake *FakeRouteRepository) Find(arg1 string, arg2 models.DomainFields, arg arg3 string arg4 int }{arg1, arg2, arg3, arg4}) + stub := fake.FindStub + fakeReturns := fake.findReturns fake.recordInvocation("Find", []interface{}{arg1, arg2, arg3, arg4}) fake.findMutex.Unlock() - if fake.FindStub != nil { - return fake.FindStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findReturns return fakeReturns.result1, fakeReturns.result2 } @@ -529,15 +535,16 @@ func (fake *FakeRouteRepository) ListAllRoutes(arg1 func(models.Route) bool) err fake.listAllRoutesArgsForCall = append(fake.listAllRoutesArgsForCall, struct { arg1 func(models.Route) bool }{arg1}) + stub := fake.ListAllRoutesStub + fakeReturns := fake.listAllRoutesReturns fake.recordInvocation("ListAllRoutes", []interface{}{arg1}) fake.listAllRoutesMutex.Unlock() - if fake.ListAllRoutesStub != nil { - return fake.ListAllRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listAllRoutesReturns return fakeReturns.result1 } @@ -589,15 +596,16 @@ func (fake *FakeRouteRepository) ListRoutes(arg1 func(models.Route) bool) error fake.listRoutesArgsForCall = append(fake.listRoutesArgsForCall, struct { arg1 func(models.Route) bool }{arg1}) + stub := fake.ListRoutesStub + fakeReturns := fake.listRoutesReturns fake.recordInvocation("ListRoutes", []interface{}{arg1}) fake.listRoutesMutex.Unlock() - if fake.ListRoutesStub != nil { - return fake.ListRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listRoutesReturns return fakeReturns.result1 } @@ -650,15 +658,16 @@ func (fake *FakeRouteRepository) Unbind(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnbindStub + fakeReturns := fake.unbindReturns fake.recordInvocation("Unbind", []interface{}{arg1, arg2}) fake.unbindMutex.Unlock() - if fake.UnbindStub != nil { - return fake.UnbindStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_route_service_binding_repository.go b/cf/api/apifakes/fake_route_service_binding_repository.go index 10940a81b5..e928d90ce6 100644 --- a/cf/api/apifakes/fake_route_service_binding_repository.go +++ b/cf/api/apifakes/fake_route_service_binding_repository.go @@ -4,7 +4,7 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api" ) type FakeRouteServiceBindingRepository struct { @@ -48,15 +48,16 @@ func (fake *FakeRouteServiceBindingRepository) Bind(arg1 string, arg2 string, ar arg3 bool arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.BindStub + fakeReturns := fake.bindReturns fake.recordInvocation("Bind", []interface{}{arg1, arg2, arg3, arg4}) fake.bindMutex.Unlock() - if fake.BindStub != nil { - return fake.BindStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindReturns return fakeReturns.result1 } @@ -110,15 +111,16 @@ func (fake *FakeRouteServiceBindingRepository) Unbind(arg1 string, arg2 string, arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.UnbindStub + fakeReturns := fake.unbindReturns fake.recordInvocation("Unbind", []interface{}{arg1, arg2, arg3}) fake.unbindMutex.Unlock() - if fake.UnbindStub != nil { - return fake.UnbindStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_routing_apirepository.go b/cf/api/apifakes/fake_routing_apirepository.go index 6c24894069..91436a2e63 100644 --- a/cf/api/apifakes/fake_routing_apirepository.go +++ b/cf/api/apifakes/fake_routing_apirepository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRoutingAPIRepository struct { @@ -30,15 +30,16 @@ func (fake *FakeRoutingAPIRepository) ListRouterGroups(arg1 func(models.RouterGr fake.listRouterGroupsArgsForCall = append(fake.listRouterGroupsArgsForCall, struct { arg1 func(models.RouterGroup) bool }{arg1}) + stub := fake.ListRouterGroupsStub + fakeReturns := fake.listRouterGroupsReturns fake.recordInvocation("ListRouterGroups", []interface{}{arg1}) fake.listRouterGroupsMutex.Unlock() - if fake.ListRouterGroupsStub != nil { - return fake.ListRouterGroupsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listRouterGroupsReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_auth_token_repository.go b/cf/api/apifakes/fake_service_auth_token_repository.go index 8c5fea1a85..2ef40db396 100644 --- a/cf/api/apifakes/fake_service_auth_token_repository.go +++ b/cf/api/apifakes/fake_service_auth_token_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceAuthTokenRepository struct { @@ -78,15 +78,16 @@ func (fake *FakeServiceAuthTokenRepository) Create(arg1 models.ServiceAuthTokenF fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.ServiceAuthTokenFields }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -138,15 +139,16 @@ func (fake *FakeServiceAuthTokenRepository) Delete(arg1 models.ServiceAuthTokenF fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 models.ServiceAuthTokenFields }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -197,15 +199,16 @@ func (fake *FakeServiceAuthTokenRepository) FindAll() ([]models.ServiceAuthToken ret, specificReturn := fake.findAllReturnsOnCall[len(fake.findAllArgsForCall)] fake.findAllArgsForCall = append(fake.findAllArgsForCall, struct { }{}) + stub := fake.FindAllStub + fakeReturns := fake.findAllReturns fake.recordInvocation("FindAll", []interface{}{}) fake.findAllMutex.Unlock() - if fake.FindAllStub != nil { - return fake.FindAllStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllReturns return fakeReturns.result1, fakeReturns.result2 } @@ -254,15 +257,16 @@ func (fake *FakeServiceAuthTokenRepository) FindByLabelAndProvider(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByLabelAndProviderStub + fakeReturns := fake.findByLabelAndProviderReturns fake.recordInvocation("FindByLabelAndProvider", []interface{}{arg1, arg2}) fake.findByLabelAndProviderMutex.Unlock() - if fake.FindByLabelAndProviderStub != nil { - return fake.FindByLabelAndProviderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByLabelAndProviderReturns return fakeReturns.result1, fakeReturns.result2 } @@ -317,15 +321,16 @@ func (fake *FakeServiceAuthTokenRepository) Update(arg1 models.ServiceAuthTokenF fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.ServiceAuthTokenFields }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_binding_repository.go b/cf/api/apifakes/fake_service_binding_repository.go index 1c14637710..ec97c3b0fa 100644 --- a/cf/api/apifakes/fake_service_binding_repository.go +++ b/cf/api/apifakes/fake_service_binding_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceBindingRepository struct { @@ -61,15 +61,16 @@ func (fake *FakeServiceBindingRepository) Create(arg1 string, arg2 string, arg3 arg2 string arg3 map[string]interface{} }{arg1, arg2, arg3}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -122,15 +123,16 @@ func (fake *FakeServiceBindingRepository) Delete(arg1 models.ServiceInstance, ar arg1 models.ServiceInstance arg2 string }{arg1, arg2}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1, arg2}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -185,15 +187,16 @@ func (fake *FakeServiceBindingRepository) ListAllForService(arg1 string) ([]mode fake.listAllForServiceArgsForCall = append(fake.listAllForServiceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ListAllForServiceStub + fakeReturns := fake.listAllForServiceReturns fake.recordInvocation("ListAllForService", []interface{}{arg1}) fake.listAllForServiceMutex.Unlock() - if fake.ListAllForServiceStub != nil { - return fake.ListAllForServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listAllForServiceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_service_broker_repository.go b/cf/api/apifakes/fake_service_broker_repository.go index 18f2cac194..a0c0a37c19 100644 --- a/cf/api/apifakes/fake_service_broker_repository.go +++ b/cf/api/apifakes/fake_service_broker_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceBrokerRepository struct { @@ -109,15 +109,16 @@ func (fake *FakeServiceBrokerRepository) Create(arg1 string, arg2 string, arg3 s arg4 string arg5 string }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -169,15 +170,16 @@ func (fake *FakeServiceBrokerRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -229,15 +231,16 @@ func (fake *FakeServiceBrokerRepository) FindByGUID(arg1 string) (models.Service fake.findByGUIDArgsForCall = append(fake.findByGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByGUIDStub + fakeReturns := fake.findByGUIDReturns fake.recordInvocation("FindByGUID", []interface{}{arg1}) fake.findByGUIDMutex.Unlock() - if fake.FindByGUIDStub != nil { - return fake.FindByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -292,15 +295,16 @@ func (fake *FakeServiceBrokerRepository) FindByName(arg1 string) (models.Service fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -355,15 +359,16 @@ func (fake *FakeServiceBrokerRepository) ListServiceBrokers(arg1 func(models.Ser fake.listServiceBrokersArgsForCall = append(fake.listServiceBrokersArgsForCall, struct { arg1 func(models.ServiceBroker) bool }{arg1}) + stub := fake.ListServiceBrokersStub + fakeReturns := fake.listServiceBrokersReturns fake.recordInvocation("ListServiceBrokers", []interface{}{arg1}) fake.listServiceBrokersMutex.Unlock() - if fake.ListServiceBrokersStub != nil { - return fake.ListServiceBrokersStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listServiceBrokersReturns return fakeReturns.result1 } @@ -416,15 +421,16 @@ func (fake *FakeServiceBrokerRepository) Rename(arg1 string, arg2 string) error arg1 string arg2 string }{arg1, arg2}) + stub := fake.RenameStub + fakeReturns := fake.renameReturns fake.recordInvocation("Rename", []interface{}{arg1, arg2}) fake.renameMutex.Unlock() - if fake.RenameStub != nil { - return fake.RenameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.renameReturns return fakeReturns.result1 } @@ -476,15 +482,16 @@ func (fake *FakeServiceBrokerRepository) Update(arg1 models.ServiceBroker) error fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.ServiceBroker }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_key_repository.go b/cf/api/apifakes/fake_service_key_repository.go index 01baa02e2b..61fcfebfbf 100644 --- a/cf/api/apifakes/fake_service_key_repository.go +++ b/cf/api/apifakes/fake_service_key_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceKeyRepository struct { @@ -72,15 +72,16 @@ func (fake *FakeServiceKeyRepository) CreateServiceKey(arg1 string, arg2 string, arg2 string arg3 map[string]interface{} }{arg1, arg2, arg3}) + stub := fake.CreateServiceKeyStub + fakeReturns := fake.createServiceKeyReturns fake.recordInvocation("CreateServiceKey", []interface{}{arg1, arg2, arg3}) fake.createServiceKeyMutex.Unlock() - if fake.CreateServiceKeyStub != nil { - return fake.CreateServiceKeyStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.createServiceKeyReturns return fakeReturns.result1 } @@ -132,15 +133,16 @@ func (fake *FakeServiceKeyRepository) DeleteServiceKey(arg1 string) error { fake.deleteServiceKeyArgsForCall = append(fake.deleteServiceKeyArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteServiceKeyStub + fakeReturns := fake.deleteServiceKeyReturns fake.recordInvocation("DeleteServiceKey", []interface{}{arg1}) fake.deleteServiceKeyMutex.Unlock() - if fake.DeleteServiceKeyStub != nil { - return fake.DeleteServiceKeyStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteServiceKeyReturns return fakeReturns.result1 } @@ -193,15 +195,16 @@ func (fake *FakeServiceKeyRepository) GetServiceKey(arg1 string, arg2 string) (m arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceKeyStub + fakeReturns := fake.getServiceKeyReturns fake.recordInvocation("GetServiceKey", []interface{}{arg1, arg2}) fake.getServiceKeyMutex.Unlock() - if fake.GetServiceKeyStub != nil { - return fake.GetServiceKeyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceKeyReturns return fakeReturns.result1, fakeReturns.result2 } @@ -256,15 +259,16 @@ func (fake *FakeServiceKeyRepository) ListServiceKeys(arg1 string) ([]models.Ser fake.listServiceKeysArgsForCall = append(fake.listServiceKeysArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ListServiceKeysStub + fakeReturns := fake.listServiceKeysReturns fake.recordInvocation("ListServiceKeys", []interface{}{arg1}) fake.listServiceKeysMutex.Unlock() - if fake.ListServiceKeysStub != nil { - return fake.ListServiceKeysStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listServiceKeysReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_service_plan_repository.go b/cf/api/apifakes/fake_service_plan_repository.go index 9e1699b1fb..430740598f 100644 --- a/cf/api/apifakes/fake_service_plan_repository.go +++ b/cf/api/apifakes/fake_service_plan_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServicePlanRepository struct { @@ -63,15 +63,16 @@ func (fake *FakeServicePlanRepository) ListPlansFromManyServices(arg1 []string) fake.listPlansFromManyServicesArgsForCall = append(fake.listPlansFromManyServicesArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.ListPlansFromManyServicesStub + fakeReturns := fake.listPlansFromManyServicesReturns fake.recordInvocation("ListPlansFromManyServices", []interface{}{arg1Copy}) fake.listPlansFromManyServicesMutex.Unlock() - if fake.ListPlansFromManyServicesStub != nil { - return fake.ListPlansFromManyServicesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listPlansFromManyServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -126,15 +127,16 @@ func (fake *FakeServicePlanRepository) Search(arg1 map[string]string) ([]models. fake.searchArgsForCall = append(fake.searchArgsForCall, struct { arg1 map[string]string }{arg1}) + stub := fake.SearchStub + fakeReturns := fake.searchReturns fake.recordInvocation("Search", []interface{}{arg1}) fake.searchMutex.Unlock() - if fake.SearchStub != nil { - return fake.SearchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.searchReturns return fakeReturns.result1, fakeReturns.result2 } @@ -191,15 +193,16 @@ func (fake *FakeServicePlanRepository) Update(arg1 models.ServicePlanFields, arg arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1, arg2, arg3}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_plan_visibility_repository.go b/cf/api/apifakes/fake_service_plan_visibility_repository.go index 0699c3ab8b..66cb2fa8da 100644 --- a/cf/api/apifakes/fake_service_plan_visibility_repository.go +++ b/cf/api/apifakes/fake_service_plan_visibility_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServicePlanVisibilityRepository struct { @@ -68,15 +68,16 @@ func (fake *FakeServicePlanVisibilityRepository) Create(arg1 string, arg2 string arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -128,15 +129,16 @@ func (fake *FakeServicePlanVisibilityRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -187,15 +189,16 @@ func (fake *FakeServicePlanVisibilityRepository) List() ([]models.ServicePlanVis ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] fake.listArgsForCall = append(fake.listArgsForCall, struct { }{}) + stub := fake.ListStub + fakeReturns := fake.listReturns fake.recordInvocation("List", []interface{}{}) fake.listMutex.Unlock() - if fake.ListStub != nil { - return fake.ListStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listReturns return fakeReturns.result1, fakeReturns.result2 } @@ -243,15 +246,16 @@ func (fake *FakeServicePlanVisibilityRepository) Search(arg1 map[string]string) fake.searchArgsForCall = append(fake.searchArgsForCall, struct { arg1 map[string]string }{arg1}) + stub := fake.SearchStub + fakeReturns := fake.searchReturns fake.recordInvocation("Search", []interface{}{arg1}) fake.searchMutex.Unlock() - if fake.SearchStub != nil { - return fake.SearchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.searchReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_service_repository.go b/cf/api/apifakes/fake_service_repository.go index a83227be35..c1a9a3df12 100644 --- a/cf/api/apifakes/fake_service_repository.go +++ b/cf/api/apifakes/fake_service_repository.go @@ -4,9 +4,9 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceRepository struct { @@ -259,15 +259,16 @@ func (fake *FakeServiceRepository) CreateServiceInstance(arg1 string, arg2 strin arg3 map[string]interface{} arg4 []string }{arg1, arg2, arg3, arg4Copy}) + stub := fake.CreateServiceInstanceStub + fakeReturns := fake.createServiceInstanceReturns fake.recordInvocation("CreateServiceInstance", []interface{}{arg1, arg2, arg3, arg4Copy}) fake.createServiceInstanceMutex.Unlock() - if fake.CreateServiceInstanceStub != nil { - return fake.CreateServiceInstanceStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.createServiceInstanceReturns return fakeReturns.result1 } @@ -319,15 +320,16 @@ func (fake *FakeServiceRepository) DeleteService(arg1 models.ServiceInstance) er fake.deleteServiceArgsForCall = append(fake.deleteServiceArgsForCall, struct { arg1 models.ServiceInstance }{arg1}) + stub := fake.DeleteServiceStub + fakeReturns := fake.deleteServiceReturns fake.recordInvocation("DeleteService", []interface{}{arg1}) fake.deleteServiceMutex.Unlock() - if fake.DeleteServiceStub != nil { - return fake.DeleteServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteServiceReturns return fakeReturns.result1 } @@ -379,15 +381,16 @@ func (fake *FakeServiceRepository) FindInstanceByName(arg1 string) (models.Servi fake.findInstanceByNameArgsForCall = append(fake.findInstanceByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindInstanceByNameStub + fakeReturns := fake.findInstanceByNameReturns fake.recordInvocation("FindInstanceByName", []interface{}{arg1}) fake.findInstanceByNameMutex.Unlock() - if fake.FindInstanceByNameStub != nil { - return fake.FindInstanceByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findInstanceByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -443,15 +446,16 @@ func (fake *FakeServiceRepository) FindServiceOfferingByLabelAndProvider(arg1 st arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindServiceOfferingByLabelAndProviderStub + fakeReturns := fake.findServiceOfferingByLabelAndProviderReturns fake.recordInvocation("FindServiceOfferingByLabelAndProvider", []interface{}{arg1, arg2}) fake.findServiceOfferingByLabelAndProviderMutex.Unlock() - if fake.FindServiceOfferingByLabelAndProviderStub != nil { - return fake.FindServiceOfferingByLabelAndProviderStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServiceOfferingByLabelAndProviderReturns return fakeReturns.result1, fakeReturns.result2 } @@ -506,15 +510,16 @@ func (fake *FakeServiceRepository) FindServiceOfferingsByLabel(arg1 string) (mod fake.findServiceOfferingsByLabelArgsForCall = append(fake.findServiceOfferingsByLabelArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindServiceOfferingsByLabelStub + fakeReturns := fake.findServiceOfferingsByLabelReturns fake.recordInvocation("FindServiceOfferingsByLabel", []interface{}{arg1}) fake.findServiceOfferingsByLabelMutex.Unlock() - if fake.FindServiceOfferingsByLabelStub != nil { - return fake.FindServiceOfferingsByLabelStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServiceOfferingsByLabelReturns return fakeReturns.result1, fakeReturns.result2 } @@ -570,15 +575,16 @@ func (fake *FakeServiceRepository) FindServiceOfferingsForSpaceByLabel(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindServiceOfferingsForSpaceByLabelStub + fakeReturns := fake.findServiceOfferingsForSpaceByLabelReturns fake.recordInvocation("FindServiceOfferingsForSpaceByLabel", []interface{}{arg1, arg2}) fake.findServiceOfferingsForSpaceByLabelMutex.Unlock() - if fake.FindServiceOfferingsForSpaceByLabelStub != nil { - return fake.FindServiceOfferingsForSpaceByLabelStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServiceOfferingsForSpaceByLabelReturns return fakeReturns.result1, fakeReturns.result2 } @@ -633,15 +639,16 @@ func (fake *FakeServiceRepository) FindServicePlanByDescription(arg1 resources.S fake.findServicePlanByDescriptionArgsForCall = append(fake.findServicePlanByDescriptionArgsForCall, struct { arg1 resources.ServicePlanDescription }{arg1}) + stub := fake.FindServicePlanByDescriptionStub + fakeReturns := fake.findServicePlanByDescriptionReturns fake.recordInvocation("FindServicePlanByDescription", []interface{}{arg1}) fake.findServicePlanByDescriptionMutex.Unlock() - if fake.FindServicePlanByDescriptionStub != nil { - return fake.FindServicePlanByDescriptionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findServicePlanByDescriptionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -695,15 +702,16 @@ func (fake *FakeServiceRepository) GetAllServiceOfferings() (models.ServiceOffer ret, specificReturn := fake.getAllServiceOfferingsReturnsOnCall[len(fake.getAllServiceOfferingsArgsForCall)] fake.getAllServiceOfferingsArgsForCall = append(fake.getAllServiceOfferingsArgsForCall, struct { }{}) + stub := fake.GetAllServiceOfferingsStub + fakeReturns := fake.getAllServiceOfferingsReturns fake.recordInvocation("GetAllServiceOfferings", []interface{}{}) fake.getAllServiceOfferingsMutex.Unlock() - if fake.GetAllServiceOfferingsStub != nil { - return fake.GetAllServiceOfferingsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAllServiceOfferingsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -751,15 +759,16 @@ func (fake *FakeServiceRepository) GetServiceInstanceCountForServicePlan(arg1 st fake.getServiceInstanceCountForServicePlanArgsForCall = append(fake.getServiceInstanceCountForServicePlanArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstanceCountForServicePlanStub + fakeReturns := fake.getServiceInstanceCountForServicePlanReturns fake.recordInvocation("GetServiceInstanceCountForServicePlan", []interface{}{arg1}) fake.getServiceInstanceCountForServicePlanMutex.Unlock() - if fake.GetServiceInstanceCountForServicePlanStub != nil { - return fake.GetServiceInstanceCountForServicePlanStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceInstanceCountForServicePlanReturns return fakeReturns.result1, fakeReturns.result2 } @@ -814,15 +823,16 @@ func (fake *FakeServiceRepository) GetServiceOfferingByGUID(arg1 string) (models fake.getServiceOfferingByGUIDArgsForCall = append(fake.getServiceOfferingByGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceOfferingByGUIDStub + fakeReturns := fake.getServiceOfferingByGUIDReturns fake.recordInvocation("GetServiceOfferingByGUID", []interface{}{arg1}) fake.getServiceOfferingByGUIDMutex.Unlock() - if fake.GetServiceOfferingByGUIDStub != nil { - return fake.GetServiceOfferingByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceOfferingByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -877,15 +887,16 @@ func (fake *FakeServiceRepository) GetServiceOfferingsForSpace(arg1 string) (mod fake.getServiceOfferingsForSpaceArgsForCall = append(fake.getServiceOfferingsForSpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceOfferingsForSpaceStub + fakeReturns := fake.getServiceOfferingsForSpaceReturns fake.recordInvocation("GetServiceOfferingsForSpace", []interface{}{arg1}) fake.getServiceOfferingsForSpaceMutex.Unlock() - if fake.GetServiceOfferingsForSpaceStub != nil { - return fake.GetServiceOfferingsForSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceOfferingsForSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -940,15 +951,16 @@ func (fake *FakeServiceRepository) ListServicesFromBroker(arg1 string) ([]models fake.listServicesFromBrokerArgsForCall = append(fake.listServicesFromBrokerArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ListServicesFromBrokerStub + fakeReturns := fake.listServicesFromBrokerReturns fake.recordInvocation("ListServicesFromBroker", []interface{}{arg1}) fake.listServicesFromBrokerMutex.Unlock() - if fake.ListServicesFromBrokerStub != nil { - return fake.ListServicesFromBrokerStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listServicesFromBrokerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1008,15 +1020,16 @@ func (fake *FakeServiceRepository) ListServicesFromManyBrokers(arg1 []string) ([ fake.listServicesFromManyBrokersArgsForCall = append(fake.listServicesFromManyBrokersArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.ListServicesFromManyBrokersStub + fakeReturns := fake.listServicesFromManyBrokersReturns fake.recordInvocation("ListServicesFromManyBrokers", []interface{}{arg1Copy}) fake.listServicesFromManyBrokersMutex.Unlock() - if fake.ListServicesFromManyBrokersStub != nil { - return fake.ListServicesFromManyBrokersStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listServicesFromManyBrokersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1072,15 +1085,16 @@ func (fake *FakeServiceRepository) MigrateServicePlanFromV1ToV2(arg1 string, arg arg1 string arg2 string }{arg1, arg2}) + stub := fake.MigrateServicePlanFromV1ToV2Stub + fakeReturns := fake.migrateServicePlanFromV1ToV2Returns fake.recordInvocation("MigrateServicePlanFromV1ToV2", []interface{}{arg1, arg2}) fake.migrateServicePlanFromV1ToV2Mutex.Unlock() - if fake.MigrateServicePlanFromV1ToV2Stub != nil { - return fake.MigrateServicePlanFromV1ToV2Stub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.migrateServicePlanFromV1ToV2Returns return fakeReturns.result1, fakeReturns.result2 } @@ -1135,15 +1149,16 @@ func (fake *FakeServiceRepository) PurgeServiceInstance(arg1 models.ServiceInsta fake.purgeServiceInstanceArgsForCall = append(fake.purgeServiceInstanceArgsForCall, struct { arg1 models.ServiceInstance }{arg1}) + stub := fake.PurgeServiceInstanceStub + fakeReturns := fake.purgeServiceInstanceReturns fake.recordInvocation("PurgeServiceInstance", []interface{}{arg1}) fake.purgeServiceInstanceMutex.Unlock() - if fake.PurgeServiceInstanceStub != nil { - return fake.PurgeServiceInstanceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.purgeServiceInstanceReturns return fakeReturns.result1 } @@ -1195,15 +1210,16 @@ func (fake *FakeServiceRepository) PurgeServiceOffering(arg1 models.ServiceOffer fake.purgeServiceOfferingArgsForCall = append(fake.purgeServiceOfferingArgsForCall, struct { arg1 models.ServiceOffering }{arg1}) + stub := fake.PurgeServiceOfferingStub + fakeReturns := fake.purgeServiceOfferingReturns fake.recordInvocation("PurgeServiceOffering", []interface{}{arg1}) fake.purgeServiceOfferingMutex.Unlock() - if fake.PurgeServiceOfferingStub != nil { - return fake.PurgeServiceOfferingStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.purgeServiceOfferingReturns return fakeReturns.result1 } @@ -1256,15 +1272,16 @@ func (fake *FakeServiceRepository) RenameService(arg1 models.ServiceInstance, ar arg1 models.ServiceInstance arg2 string }{arg1, arg2}) + stub := fake.RenameServiceStub + fakeReturns := fake.renameServiceReturns fake.recordInvocation("RenameService", []interface{}{arg1, arg2}) fake.renameServiceMutex.Unlock() - if fake.RenameServiceStub != nil { - return fake.RenameServiceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.renameServiceReturns return fakeReturns.result1 } @@ -1319,15 +1336,16 @@ func (fake *FakeServiceRepository) UpdateServiceInstance(arg1 string, arg2 strin arg3 map[string]interface{} arg4 *[]string }{arg1, arg2, arg3, arg4}) + stub := fake.UpdateServiceInstanceStub + fakeReturns := fake.updateServiceInstanceReturns fake.recordInvocation("UpdateServiceInstance", []interface{}{arg1, arg2, arg3, arg4}) fake.updateServiceInstanceMutex.Unlock() - if fake.UpdateServiceInstanceStub != nil { - return fake.UpdateServiceInstanceStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateServiceInstanceReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_service_summary_repository.go b/cf/api/apifakes/fake_service_summary_repository.go index c307bc0c21..f267206391 100644 --- a/cf/api/apifakes/fake_service_summary_repository.go +++ b/cf/api/apifakes/fake_service_summary_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeServiceSummaryRepository struct { @@ -30,15 +30,16 @@ func (fake *FakeServiceSummaryRepository) GetSummariesInCurrentSpace() ([]models ret, specificReturn := fake.getSummariesInCurrentSpaceReturnsOnCall[len(fake.getSummariesInCurrentSpaceArgsForCall)] fake.getSummariesInCurrentSpaceArgsForCall = append(fake.getSummariesInCurrentSpaceArgsForCall, struct { }{}) + stub := fake.GetSummariesInCurrentSpaceStub + fakeReturns := fake.getSummariesInCurrentSpaceReturns fake.recordInvocation("GetSummariesInCurrentSpace", []interface{}{}) fake.getSummariesInCurrentSpaceMutex.Unlock() - if fake.GetSummariesInCurrentSpaceStub != nil { - return fake.GetSummariesInCurrentSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSummariesInCurrentSpaceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/apifakes/fake_user_provided_service_instance_repository.go b/cf/api/apifakes/fake_user_provided_service_instance_repository.go index 047dcfb9af..8fb46194d1 100644 --- a/cf/api/apifakes/fake_user_provided_service_instance_repository.go +++ b/cf/api/apifakes/fake_user_provided_service_instance_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeUserProvidedServiceInstanceRepository struct { @@ -66,15 +66,16 @@ func (fake *FakeUserProvidedServiceInstanceRepository) Create(arg1 string, arg2 arg4 map[string]interface{} arg5 []string }{arg1, arg2, arg3, arg4, arg5Copy}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3, arg4, arg5Copy}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -125,15 +126,16 @@ func (fake *FakeUserProvidedServiceInstanceRepository) GetSummaries() (models.Us ret, specificReturn := fake.getSummariesReturnsOnCall[len(fake.getSummariesArgsForCall)] fake.getSummariesArgsForCall = append(fake.getSummariesArgsForCall, struct { }{}) + stub := fake.GetSummariesStub + fakeReturns := fake.getSummariesReturns fake.recordInvocation("GetSummaries", []interface{}{}) fake.getSummariesMutex.Unlock() - if fake.GetSummariesStub != nil { - return fake.GetSummariesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSummariesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -181,15 +183,16 @@ func (fake *FakeUserProvidedServiceInstanceRepository) Update(arg1 models.Servic fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.ServiceInstanceFields }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/fake_user_repository.go b/cf/api/apifakes/fake_user_repository.go index 9895b93f91..e23e141842 100644 --- a/cf/api/apifakes/fake_user_repository.go +++ b/cf/api/apifakes/fake_user_repository.go @@ -4,8 +4,8 @@ package apifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeUserRepository struct { @@ -203,15 +203,16 @@ func (fake *FakeUserRepository) Create(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -263,15 +264,16 @@ func (fake *FakeUserRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -323,15 +325,16 @@ func (fake *FakeUserRepository) FindAllByUsername(arg1 string) ([]models.UserFie fake.findAllByUsernameArgsForCall = append(fake.findAllByUsernameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindAllByUsernameStub + fakeReturns := fake.findAllByUsernameReturns fake.recordInvocation("FindAllByUsername", []interface{}{arg1}) fake.findAllByUsernameMutex.Unlock() - if fake.FindAllByUsernameStub != nil { - return fake.FindAllByUsernameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllByUsernameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -386,15 +389,16 @@ func (fake *FakeUserRepository) FindByUsername(arg1 string) (models.UserFields, fake.findByUsernameArgsForCall = append(fake.findByUsernameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByUsernameStub + fakeReturns := fake.findByUsernameReturns fake.recordInvocation("FindByUsername", []interface{}{arg1}) fake.findByUsernameMutex.Unlock() - if fake.FindByUsernameStub != nil { - return fake.FindByUsernameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByUsernameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -450,15 +454,16 @@ func (fake *FakeUserRepository) ListUsersInOrgForRoleWithNoUAA(arg1 string, arg2 arg1 string arg2 models.Role }{arg1, arg2}) + stub := fake.ListUsersInOrgForRoleWithNoUAAStub + fakeReturns := fake.listUsersInOrgForRoleWithNoUAAReturns fake.recordInvocation("ListUsersInOrgForRoleWithNoUAA", []interface{}{arg1, arg2}) fake.listUsersInOrgForRoleWithNoUAAMutex.Unlock() - if fake.ListUsersInOrgForRoleWithNoUAAStub != nil { - return fake.ListUsersInOrgForRoleWithNoUAAStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listUsersInOrgForRoleWithNoUAAReturns return fakeReturns.result1, fakeReturns.result2 } @@ -514,15 +519,16 @@ func (fake *FakeUserRepository) ListUsersInSpaceForRoleWithNoUAA(arg1 string, ar arg1 string arg2 models.Role }{arg1, arg2}) + stub := fake.ListUsersInSpaceForRoleWithNoUAAStub + fakeReturns := fake.listUsersInSpaceForRoleWithNoUAAReturns fake.recordInvocation("ListUsersInSpaceForRoleWithNoUAA", []interface{}{arg1, arg2}) fake.listUsersInSpaceForRoleWithNoUAAMutex.Unlock() - if fake.ListUsersInSpaceForRoleWithNoUAAStub != nil { - return fake.ListUsersInSpaceForRoleWithNoUAAStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listUsersInSpaceForRoleWithNoUAAReturns return fakeReturns.result1, fakeReturns.result2 } @@ -579,15 +585,16 @@ func (fake *FakeUserRepository) SetOrgRoleByGUID(arg1 string, arg2 string, arg3 arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.SetOrgRoleByGUIDStub + fakeReturns := fake.setOrgRoleByGUIDReturns fake.recordInvocation("SetOrgRoleByGUID", []interface{}{arg1, arg2, arg3}) fake.setOrgRoleByGUIDMutex.Unlock() - if fake.SetOrgRoleByGUIDStub != nil { - return fake.SetOrgRoleByGUIDStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.setOrgRoleByGUIDReturns return fakeReturns.result1 } @@ -641,15 +648,16 @@ func (fake *FakeUserRepository) SetOrgRoleByUsername(arg1 string, arg2 string, a arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.SetOrgRoleByUsernameStub + fakeReturns := fake.setOrgRoleByUsernameReturns fake.recordInvocation("SetOrgRoleByUsername", []interface{}{arg1, arg2, arg3}) fake.setOrgRoleByUsernameMutex.Unlock() - if fake.SetOrgRoleByUsernameStub != nil { - return fake.SetOrgRoleByUsernameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.setOrgRoleByUsernameReturns return fakeReturns.result1 } @@ -704,15 +712,16 @@ func (fake *FakeUserRepository) SetSpaceRoleByGUID(arg1 string, arg2 string, arg arg3 string arg4 models.Role }{arg1, arg2, arg3, arg4}) + stub := fake.SetSpaceRoleByGUIDStub + fakeReturns := fake.setSpaceRoleByGUIDReturns fake.recordInvocation("SetSpaceRoleByGUID", []interface{}{arg1, arg2, arg3, arg4}) fake.setSpaceRoleByGUIDMutex.Unlock() - if fake.SetSpaceRoleByGUIDStub != nil { - return fake.SetSpaceRoleByGUIDStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.setSpaceRoleByGUIDReturns return fakeReturns.result1 } @@ -767,15 +776,16 @@ func (fake *FakeUserRepository) SetSpaceRoleByUsername(arg1 string, arg2 string, arg3 string arg4 models.Role }{arg1, arg2, arg3, arg4}) + stub := fake.SetSpaceRoleByUsernameStub + fakeReturns := fake.setSpaceRoleByUsernameReturns fake.recordInvocation("SetSpaceRoleByUsername", []interface{}{arg1, arg2, arg3, arg4}) fake.setSpaceRoleByUsernameMutex.Unlock() - if fake.SetSpaceRoleByUsernameStub != nil { - return fake.SetSpaceRoleByUsernameStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.setSpaceRoleByUsernameReturns return fakeReturns.result1 } @@ -829,15 +839,16 @@ func (fake *FakeUserRepository) UnsetOrgRoleByGUID(arg1 string, arg2 string, arg arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.UnsetOrgRoleByGUIDStub + fakeReturns := fake.unsetOrgRoleByGUIDReturns fake.recordInvocation("UnsetOrgRoleByGUID", []interface{}{arg1, arg2, arg3}) fake.unsetOrgRoleByGUIDMutex.Unlock() - if fake.UnsetOrgRoleByGUIDStub != nil { - return fake.UnsetOrgRoleByGUIDStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsetOrgRoleByGUIDReturns return fakeReturns.result1 } @@ -891,15 +902,16 @@ func (fake *FakeUserRepository) UnsetOrgRoleByUsername(arg1 string, arg2 string, arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.UnsetOrgRoleByUsernameStub + fakeReturns := fake.unsetOrgRoleByUsernameReturns fake.recordInvocation("UnsetOrgRoleByUsername", []interface{}{arg1, arg2, arg3}) fake.unsetOrgRoleByUsernameMutex.Unlock() - if fake.UnsetOrgRoleByUsernameStub != nil { - return fake.UnsetOrgRoleByUsernameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsetOrgRoleByUsernameReturns return fakeReturns.result1 } @@ -953,15 +965,16 @@ func (fake *FakeUserRepository) UnsetSpaceRoleByGUID(arg1 string, arg2 string, a arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.UnsetSpaceRoleByGUIDStub + fakeReturns := fake.unsetSpaceRoleByGUIDReturns fake.recordInvocation("UnsetSpaceRoleByGUID", []interface{}{arg1, arg2, arg3}) fake.unsetSpaceRoleByGUIDMutex.Unlock() - if fake.UnsetSpaceRoleByGUIDStub != nil { - return fake.UnsetSpaceRoleByGUIDStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsetSpaceRoleByGUIDReturns return fakeReturns.result1 } @@ -1015,15 +1028,16 @@ func (fake *FakeUserRepository) UnsetSpaceRoleByUsername(arg1 string, arg2 strin arg2 string arg3 models.Role }{arg1, arg2, arg3}) + stub := fake.UnsetSpaceRoleByUsernameStub + fakeReturns := fake.unsetSpaceRoleByUsernameReturns fake.recordInvocation("UnsetSpaceRoleByUsername", []interface{}{arg1, arg2, arg3}) fake.unsetSpaceRoleByUsernameMutex.Unlock() - if fake.UnsetSpaceRoleByUsernameStub != nil { - return fake.UnsetSpaceRoleByUsernameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsetSpaceRoleByUsernameReturns return fakeReturns.result1 } diff --git a/cf/api/apifakes/old_fake_app_summary_repo.go b/cf/api/apifakes/old_fake_app_summary_repo.go index fa376a99bc..29e285cf75 100644 --- a/cf/api/apifakes/old_fake_app_summary_repo.go +++ b/cf/api/apifakes/old_fake_app_summary_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeAppSummaryRepo struct { diff --git a/cf/api/apifakes/old_fake_auth_token_repo.go b/cf/api/apifakes/old_fake_auth_token_repo.go index 3ab8e08064..31fb1e1e80 100644 --- a/cf/api/apifakes/old_fake_auth_token_repo.go +++ b/cf/api/apifakes/old_fake_auth_token_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type OldFakeAuthTokenRepo struct { CreatedServiceAuthTokenFields models.ServiceAuthTokenFields diff --git a/cf/api/apifakes/old_fake_buildpack_bits_repo.go b/cf/api/apifakes/old_fake_buildpack_bits_repo.go index f620c1d107..d220f07437 100644 --- a/cf/api/apifakes/old_fake_buildpack_bits_repo.go +++ b/cf/api/apifakes/old_fake_buildpack_bits_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeBuildpackBitsRepository struct { diff --git a/cf/api/apifakes/old_fake_buildpack_repo.go b/cf/api/apifakes/old_fake_buildpack_repo.go index 75f276e8ed..ba133f9d4e 100644 --- a/cf/api/apifakes/old_fake_buildpack_repo.go +++ b/cf/api/apifakes/old_fake_buildpack_repo.go @@ -1,8 +1,8 @@ package apifakes import ( - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeBuildpackRepository struct { diff --git a/cf/api/apifakes/old_fake_cc_request.go b/cf/api/apifakes/old_fake_cc_request.go index 3d520a1822..c01fcec4d6 100644 --- a/cf/api/apifakes/old_fake_cc_request.go +++ b/cf/api/apifakes/old_fake_cc_request.go @@ -3,7 +3,7 @@ package apifakes import ( "net/http" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" ) func NewCloudControllerTestRequest(request testnet.TestRequest) testnet.TestRequest { diff --git a/cf/api/apifakes/old_fake_password_repo.go b/cf/api/apifakes/old_fake_password_repo.go index 68c6c3cff7..46e8817011 100644 --- a/cf/api/apifakes/old_fake_password_repo.go +++ b/cf/api/apifakes/old_fake_password_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/v8/cf/errors" +import "code.cloudfoundry.org/cli/v9/cf/errors" type OldFakePasswordRepo struct { Score string diff --git a/cf/api/apifakes/old_fake_service_key_repo.go b/cf/api/apifakes/old_fake_service_key_repo.go index d5e40af811..368e413b9a 100644 --- a/cf/api/apifakes/old_fake_service_key_repo.go +++ b/cf/api/apifakes/old_fake_service_key_repo.go @@ -1,7 +1,7 @@ package apifakes import ( - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeServiceKeyRepo struct { diff --git a/cf/api/apifakes/old_fake_service_plan_repo.go b/cf/api/apifakes/old_fake_service_plan_repo.go index ac0b0b0565..68af109969 100644 --- a/cf/api/apifakes/old_fake_service_plan_repo.go +++ b/cf/api/apifakes/old_fake_service_plan_repo.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type OldFakeServicePlanRepo struct { diff --git a/cf/api/apifakes/old_fake_service_summary_repo.go b/cf/api/apifakes/old_fake_service_summary_repo.go index 5fce171683..9e36413672 100644 --- a/cf/api/apifakes/old_fake_service_summary_repo.go +++ b/cf/api/apifakes/old_fake_service_summary_repo.go @@ -1,6 +1,6 @@ package apifakes -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type OldFakeServiceSummaryRepo struct { GetSummariesInCurrentSpaceInstances []models.ServiceInstance diff --git a/cf/api/app_summary.go b/cf/api/app_summary.go index d67ecb8b4c..a2080c7f4f 100644 --- a/cf/api/app_summary.go +++ b/cf/api/app_summary.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type ApplicationSummaries struct { diff --git a/cf/api/app_summary_test.go b/cf/api/app_summary_test.go index 6d2c7d6eaa..9913c472e2 100644 --- a/cf/api/app_summary_test.go +++ b/cf/api/app_summary_test.go @@ -5,14 +5,14 @@ import ( "net/http/httptest" "time" - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appevents/app_events.go b/cf/api/appevents/app_events.go index b6463f62f3..4679e23ca1 100644 --- a/cf/api/appevents/app_events.go +++ b/cf/api/appevents/app_events.go @@ -3,10 +3,10 @@ package appevents import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/appevents/app_events_suite_test.go b/cf/api/appevents/app_events_suite_test.go index 6bd71155a9..4556e17b79 100644 --- a/cf/api/appevents/app_events_suite_test.go +++ b/cf/api/appevents/app_events_suite_test.go @@ -1,8 +1,8 @@ package appevents_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appevents/app_events_test.go b/cf/api/appevents/app_events_test.go index 7330fbd982..e56fc872d1 100644 --- a/cf/api/appevents/app_events_test.go +++ b/cf/api/appevents/app_events_test.go @@ -6,14 +6,14 @@ import ( "time" - . "code.cloudfoundry.org/cli/v8/cf/api/appevents" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + . "code.cloudfoundry.org/cli/v9/cf/api/appevents" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appevents/appeventsfakes/fake_app_events_repository.go b/cf/api/appevents/appeventsfakes/fake_app_events_repository.go index 2b854c8f30..54e9bb68ed 100644 --- a/cf/api/appevents/appeventsfakes/fake_app_events_repository.go +++ b/cf/api/appevents/appeventsfakes/fake_app_events_repository.go @@ -4,8 +4,8 @@ package appeventsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/appevents" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/appevents" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeAppEventsRepository struct { diff --git a/cf/api/appevents/appeventsfakes/fake_repository.go b/cf/api/appevents/appeventsfakes/fake_repository.go index a229e46fe2..2b26fc412d 100644 --- a/cf/api/appevents/appeventsfakes/fake_repository.go +++ b/cf/api/appevents/appeventsfakes/fake_repository.go @@ -4,8 +4,8 @@ package appeventsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/appevents" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/appevents" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRepository struct { @@ -34,15 +34,16 @@ func (fake *FakeRepository) RecentEvents(arg1 string, arg2 int64) ([]models.Even arg1 string arg2 int64 }{arg1, arg2}) + stub := fake.RecentEventsStub + fakeReturns := fake.recentEventsReturns fake.recordInvocation("RecentEvents", []interface{}{arg1, arg2}) fake.recentEventsMutex.Unlock() - if fake.RecentEventsStub != nil { - return fake.RecentEventsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.recentEventsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/appfiles/app_files.go b/cf/api/appfiles/app_files.go index 982006c46a..8fec307cd9 100644 --- a/cf/api/appfiles/app_files.go +++ b/cf/api/appfiles/app_files.go @@ -3,8 +3,8 @@ package appfiles import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/appfiles/app_files_suite_test.go b/cf/api/appfiles/app_files_suite_test.go index cda4809d9f..b6a499efb3 100644 --- a/cf/api/appfiles/app_files_suite_test.go +++ b/cf/api/appfiles/app_files_suite_test.go @@ -1,8 +1,8 @@ package appfiles_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appfiles/app_files_test.go b/cf/api/appfiles/app_files_test.go index afdd65236e..9d0fc8d41d 100644 --- a/cf/api/appfiles/app_files_test.go +++ b/cf/api/appfiles/app_files_test.go @@ -6,15 +6,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/v8/cf/api/appfiles" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go b/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go index 15b944270d..a9c97cbdf9 100644 --- a/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go +++ b/cf/api/appfiles/appfilesfakes/fake_app_files_repository.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/api/appfiles" ) type FakeAppFilesRepository struct { diff --git a/cf/api/appfiles/appfilesfakes/fake_repository.go b/cf/api/appfiles/appfilesfakes/fake_repository.go index 9356a885da..2a121098be 100644 --- a/cf/api/appfiles/appfilesfakes/fake_repository.go +++ b/cf/api/appfiles/appfilesfakes/fake_repository.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/api/appfiles" ) type FakeRepository struct { @@ -35,15 +35,16 @@ func (fake *FakeRepository) ListFiles(arg1 string, arg2 int, arg3 string) (strin arg2 int arg3 string }{arg1, arg2, arg3}) + stub := fake.ListFilesStub + fakeReturns := fake.listFilesReturns fake.recordInvocation("ListFiles", []interface{}{arg1, arg2, arg3}) fake.listFilesMutex.Unlock() - if fake.ListFilesStub != nil { - return fake.ListFilesStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listFilesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/appinstances/app_instances.go b/cf/api/appinstances/app_instances.go index 286426b1ad..8f2e882924 100644 --- a/cf/api/appinstances/app_instances.go +++ b/cf/api/appinstances/app_instances.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type InstancesAPIResponse map[string]InstanceAPIResponse diff --git a/cf/api/appinstances/app_instances_suite_test.go b/cf/api/appinstances/app_instances_suite_test.go index 72e6aaf0ba..96cb394651 100644 --- a/cf/api/appinstances/app_instances_suite_test.go +++ b/cf/api/appinstances/app_instances_suite_test.go @@ -1,8 +1,8 @@ package appinstances_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/appinstances/app_instances_test.go b/cf/api/appinstances/app_instances_test.go index 5960872041..d4adffa3c8 100644 --- a/cf/api/appinstances/app_instances_test.go +++ b/cf/api/appinstances/app_instances_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api/appinstances" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go b/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go index b11ceb274b..948ecf088e 100644 --- a/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go +++ b/cf/api/appinstances/appinstancesfakes/fake_app_instances_repository.go @@ -4,8 +4,8 @@ package appinstancesfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeAppInstancesRepository struct { diff --git a/cf/api/appinstances/appinstancesfakes/fake_repository.go b/cf/api/appinstances/appinstancesfakes/fake_repository.go index 311dff9205..8122dd1219 100644 --- a/cf/api/appinstances/appinstancesfakes/fake_repository.go +++ b/cf/api/appinstances/appinstancesfakes/fake_repository.go @@ -4,8 +4,8 @@ package appinstancesfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRepository struct { @@ -45,15 +45,16 @@ func (fake *FakeRepository) DeleteInstance(arg1 string, arg2 int) error { arg1 string arg2 int }{arg1, arg2}) + stub := fake.DeleteInstanceStub + fakeReturns := fake.deleteInstanceReturns fake.recordInvocation("DeleteInstance", []interface{}{arg1, arg2}) fake.deleteInstanceMutex.Unlock() - if fake.DeleteInstanceStub != nil { - return fake.DeleteInstanceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteInstanceReturns return fakeReturns.result1 } @@ -105,15 +106,16 @@ func (fake *FakeRepository) GetInstances(arg1 string) ([]models.AppInstanceField fake.getInstancesArgsForCall = append(fake.getInstancesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetInstancesStub + fakeReturns := fake.getInstancesReturns fake.recordInvocation("GetInstances", []interface{}{arg1}) fake.getInstancesMutex.Unlock() - if fake.GetInstancesStub != nil { - return fake.GetInstancesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getInstancesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/applicationbits/application_bits.go b/cf/api/applicationbits/application_bits.go index fe1bb99601..c8468c7c4a 100644 --- a/cf/api/applicationbits/application_bits.go +++ b/cf/api/applicationbits/application_bits.go @@ -10,10 +10,10 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/api/applicationbits/application_bits_suite_test.go b/cf/api/applicationbits/application_bits_suite_test.go index d3f5dc3c2e..8056aca8a6 100644 --- a/cf/api/applicationbits/application_bits_suite_test.go +++ b/cf/api/applicationbits/application_bits_suite_test.go @@ -1,8 +1,8 @@ package applicationbits_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/applicationbits/application_bits_test.go b/cf/api/applicationbits/application_bits_test.go index 54d2402522..e71596519a 100644 --- a/cf/api/applicationbits/application_bits_test.go +++ b/cf/api/applicationbits/application_bits_test.go @@ -13,16 +13,16 @@ import ( "strings" "time" - testapi "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + testapi "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go b/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go index b980aa2fdc..60ae07faaf 100644 --- a/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go +++ b/cf/api/applicationbits/applicationbitsfakes/fake_application_bits_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" - "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/api/resources" ) type FakeApplicationBitsRepository struct { diff --git a/cf/api/applicationbits/applicationbitsfakes/fake_repository.go b/cf/api/applicationbits/applicationbitsfakes/fake_repository.go index 56fe5c6554..18fb3284c8 100644 --- a/cf/api/applicationbits/applicationbitsfakes/fake_repository.go +++ b/cf/api/applicationbits/applicationbitsfakes/fake_repository.go @@ -5,8 +5,8 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" - "code.cloudfoundry.org/cli/v8/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/api/resources" ) type FakeRepository struct { @@ -51,15 +51,16 @@ func (fake *FakeRepository) GetApplicationFiles(arg1 []resources.AppFileResource fake.getApplicationFilesArgsForCall = append(fake.getApplicationFilesArgsForCall, struct { arg1 []resources.AppFileResource }{arg1Copy}) + stub := fake.GetApplicationFilesStub + fakeReturns := fake.getApplicationFilesReturns fake.recordInvocation("GetApplicationFiles", []interface{}{arg1Copy}) fake.getApplicationFilesMutex.Unlock() - if fake.GetApplicationFilesStub != nil { - return fake.GetApplicationFilesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getApplicationFilesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -121,15 +122,16 @@ func (fake *FakeRepository) UploadBits(arg1 string, arg2 *os.File, arg3 []resour arg2 *os.File arg3 []resources.AppFileResource }{arg1, arg2, arg3Copy}) + stub := fake.UploadBitsStub + fakeReturns := fake.uploadBitsReturns fake.recordInvocation("UploadBits", []interface{}{arg1, arg2, arg3Copy}) fake.uploadBitsMutex.Unlock() - if fake.UploadBitsStub != nil { - return fake.UploadBitsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.uploadBitsReturns return fakeReturns.result1 } diff --git a/cf/api/applications/applications.go b/cf/api/applications/applications.go index efd8323ecf..b5238f6550 100644 --- a/cf/api/applications/applications.go +++ b/cf/api/applications/applications.go @@ -7,13 +7,13 @@ import ( "net/url" "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/applications/applications_suite_test.go b/cf/api/applications/applications_suite_test.go index a987b0247a..9e877a7d3d 100644 --- a/cf/api/applications/applications_suite_test.go +++ b/cf/api/applications/applications_suite_test.go @@ -1,8 +1,8 @@ package applications_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/applications/applications_test.go b/cf/api/applications/applications_test.go index 4668415ae9..974662d520 100644 --- a/cf/api/applications/applications_test.go +++ b/cf/api/applications/applications_test.go @@ -8,19 +8,19 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/applications/applicationsfakes/fake_repository.go b/cf/api/applications/applicationsfakes/fake_repository.go index c575e232ae..766349b8db 100644 --- a/cf/api/applications/applicationsfakes/fake_repository.go +++ b/cf/api/applications/applicationsfakes/fake_repository.go @@ -4,8 +4,8 @@ package applicationsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRepository struct { @@ -134,15 +134,16 @@ func (fake *FakeRepository) Create(arg1 models.AppParams) (models.Application, e fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.AppParams }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -197,15 +198,16 @@ func (fake *FakeRepository) CreateRestageRequest(arg1 string) error { fake.createRestageRequestArgsForCall = append(fake.createRestageRequestArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateRestageRequestStub + fakeReturns := fake.createRestageRequestReturns fake.recordInvocation("CreateRestageRequest", []interface{}{arg1}) fake.createRestageRequestMutex.Unlock() - if fake.CreateRestageRequestStub != nil { - return fake.CreateRestageRequestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createRestageRequestReturns return fakeReturns.result1 } @@ -257,15 +259,16 @@ func (fake *FakeRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -317,15 +320,16 @@ func (fake *FakeRepository) GetApp(arg1 string) (models.Application, error) { fake.getAppArgsForCall = append(fake.getAppArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetAppStub + fakeReturns := fake.getAppReturns fake.recordInvocation("GetApp", []interface{}{arg1}) fake.getAppMutex.Unlock() - if fake.GetAppStub != nil { - return fake.GetAppStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAppReturns return fakeReturns.result1, fakeReturns.result2 } @@ -380,15 +384,16 @@ func (fake *FakeRepository) GetAppRoutes(arg1 string) ([]models.Route, error) { fake.getAppRoutesArgsForCall = append(fake.getAppRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetAppRoutesStub + fakeReturns := fake.getAppRoutesReturns fake.recordInvocation("GetAppRoutes", []interface{}{arg1}) fake.getAppRoutesMutex.Unlock() - if fake.GetAppRoutesStub != nil { - return fake.GetAppRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAppRoutesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -443,15 +448,16 @@ func (fake *FakeRepository) Read(arg1 string) (models.Application, error) { fake.readArgsForCall = append(fake.readArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } @@ -506,15 +512,16 @@ func (fake *FakeRepository) ReadEnv(arg1 string) (*models.Environment, error) { fake.readEnvArgsForCall = append(fake.readEnvArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadEnvStub + fakeReturns := fake.readEnvReturns fake.recordInvocation("ReadEnv", []interface{}{arg1}) fake.readEnvMutex.Unlock() - if fake.ReadEnvStub != nil { - return fake.ReadEnvStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readEnvReturns return fakeReturns.result1, fakeReturns.result2 } @@ -570,15 +577,16 @@ func (fake *FakeRepository) ReadFromSpace(arg1 string, arg2 string) (models.Appl arg1 string arg2 string }{arg1, arg2}) + stub := fake.ReadFromSpaceStub + fakeReturns := fake.readFromSpaceReturns fake.recordInvocation("ReadFromSpace", []interface{}{arg1, arg2}) fake.readFromSpaceMutex.Unlock() - if fake.ReadFromSpaceStub != nil { - return fake.ReadFromSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readFromSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -634,15 +642,16 @@ func (fake *FakeRepository) Update(arg1 string, arg2 models.AppParams) (models.A arg1 string arg2 models.AppParams }{arg1, arg2}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1, arg2}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/authentication/authentication.go b/cf/api/authentication/authentication.go index 1405616319..f5f1238181 100644 --- a/cf/api/authentication/authentication.go +++ b/cf/api/authentication/authentication.go @@ -10,11 +10,11 @@ import ( "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/util" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . TokenRefresher diff --git a/cf/api/authentication/authentication_suite_test.go b/cf/api/authentication/authentication_suite_test.go index f1062a9627..14e4bb19d8 100644 --- a/cf/api/authentication/authentication_suite_test.go +++ b/cf/api/authentication/authentication_suite_test.go @@ -1,8 +1,8 @@ package authentication_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/authentication/authentication_test.go b/cf/api/authentication/authentication_test.go index 33586dbcde..6f482acb5b 100644 --- a/cf/api/authentication/authentication_test.go +++ b/cf/api/authentication/authentication_test.go @@ -7,15 +7,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/authentication/authenticationfakes/fake_repository.go b/cf/api/authentication/authenticationfakes/fake_repository.go index 30ba8e77de..a28b6e87a7 100644 --- a/cf/api/authentication/authenticationfakes/fake_repository.go +++ b/cf/api/authentication/authenticationfakes/fake_repository.go @@ -5,8 +5,8 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" ) type FakeRepository struct { @@ -91,15 +91,16 @@ func (fake *FakeRepository) Authenticate(arg1 map[string]string) error { fake.authenticateArgsForCall = append(fake.authenticateArgsForCall, struct { arg1 map[string]string }{arg1}) + stub := fake.AuthenticateStub + fakeReturns := fake.authenticateReturns fake.recordInvocation("Authenticate", []interface{}{arg1}) fake.authenticateMutex.Unlock() - if fake.AuthenticateStub != nil { - return fake.AuthenticateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.authenticateReturns return fakeReturns.result1 } @@ -151,15 +152,16 @@ func (fake *FakeRepository) Authorize(arg1 string) (string, error) { fake.authorizeArgsForCall = append(fake.authorizeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.AuthorizeStub + fakeReturns := fake.authorizeReturns fake.recordInvocation("Authorize", []interface{}{arg1}) fake.authorizeMutex.Unlock() - if fake.AuthorizeStub != nil { - return fake.AuthorizeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.authorizeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -213,9 +215,10 @@ func (fake *FakeRepository) DumpRequest(arg1 *http.Request) { fake.dumpRequestArgsForCall = append(fake.dumpRequestArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.DumpRequestStub fake.recordInvocation("DumpRequest", []interface{}{arg1}) fake.dumpRequestMutex.Unlock() - if fake.DumpRequestStub != nil { + if stub != nil { fake.DumpRequestStub(arg1) } } @@ -244,9 +247,10 @@ func (fake *FakeRepository) DumpResponse(arg1 *http.Response) { fake.dumpResponseArgsForCall = append(fake.dumpResponseArgsForCall, struct { arg1 *http.Response }{arg1}) + stub := fake.DumpResponseStub fake.recordInvocation("DumpResponse", []interface{}{arg1}) fake.dumpResponseMutex.Unlock() - if fake.DumpResponseStub != nil { + if stub != nil { fake.DumpResponseStub(arg1) } } @@ -275,15 +279,16 @@ func (fake *FakeRepository) GetLoginPromptsAndSaveUAAServerURL() (map[string]cor ret, specificReturn := fake.getLoginPromptsAndSaveUAAServerURLReturnsOnCall[len(fake.getLoginPromptsAndSaveUAAServerURLArgsForCall)] fake.getLoginPromptsAndSaveUAAServerURLArgsForCall = append(fake.getLoginPromptsAndSaveUAAServerURLArgsForCall, struct { }{}) + stub := fake.GetLoginPromptsAndSaveUAAServerURLStub + fakeReturns := fake.getLoginPromptsAndSaveUAAServerURLReturns fake.recordInvocation("GetLoginPromptsAndSaveUAAServerURL", []interface{}{}) fake.getLoginPromptsAndSaveUAAServerURLMutex.Unlock() - if fake.GetLoginPromptsAndSaveUAAServerURLStub != nil { - return fake.GetLoginPromptsAndSaveUAAServerURLStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getLoginPromptsAndSaveUAAServerURLReturns return fakeReturns.result1, fakeReturns.result2 } @@ -330,15 +335,16 @@ func (fake *FakeRepository) RefreshAuthToken() (string, error) { ret, specificReturn := fake.refreshAuthTokenReturnsOnCall[len(fake.refreshAuthTokenArgsForCall)] fake.refreshAuthTokenArgsForCall = append(fake.refreshAuthTokenArgsForCall, struct { }{}) + stub := fake.RefreshAuthTokenStub + fakeReturns := fake.refreshAuthTokenReturns fake.recordInvocation("RefreshAuthToken", []interface{}{}) fake.refreshAuthTokenMutex.Unlock() - if fake.RefreshAuthTokenStub != nil { - return fake.RefreshAuthTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAuthTokenReturns return fakeReturns.result1, fakeReturns.result2 } @@ -386,15 +392,16 @@ func (fake *FakeRepository) RefreshToken(arg1 string) (string, error) { fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{arg1}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/authentication/authenticationfakes/fake_token_refresher.go b/cf/api/authentication/authenticationfakes/fake_token_refresher.go index d4c46a7e86..c217811f1b 100644 --- a/cf/api/authentication/authenticationfakes/fake_token_refresher.go +++ b/cf/api/authentication/authenticationfakes/fake_token_refresher.go @@ -4,7 +4,7 @@ package authenticationfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" ) type FakeTokenRefresher struct { @@ -29,15 +29,16 @@ func (fake *FakeTokenRefresher) RefreshAuthToken() (string, error) { ret, specificReturn := fake.refreshAuthTokenReturnsOnCall[len(fake.refreshAuthTokenArgsForCall)] fake.refreshAuthTokenArgsForCall = append(fake.refreshAuthTokenArgsForCall, struct { }{}) + stub := fake.RefreshAuthTokenStub + fakeReturns := fake.refreshAuthTokenReturns fake.recordInvocation("RefreshAuthToken", []interface{}{}) fake.refreshAuthTokenMutex.Unlock() - if fake.RefreshAuthTokenStub != nil { - return fake.RefreshAuthTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAuthTokenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/buildpack_bits.go b/cf/api/buildpack_bits.go index 801f0ccbfd..3a1e68661a 100644 --- a/cf/api/buildpack_bits.go +++ b/cf/api/buildpack_bits.go @@ -16,13 +16,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/cf/appfiles" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/util" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/api/buildpack_bits_test.go b/cf/api/buildpack_bits_test.go index ed7f35c698..c7e6824493 100644 --- a/cf/api/buildpack_bits_test.go +++ b/cf/api/buildpack_bits_test.go @@ -15,17 +15,17 @@ import ( "sort" "time" - "code.cloudfoundry.org/cli/v8/cf/appfiles" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/buildpacks.go b/cf/api/buildpacks.go index 0541801ebc..270b857e54 100644 --- a/cf/api/buildpacks.go +++ b/cf/api/buildpacks.go @@ -6,12 +6,12 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BuildpackRepository diff --git a/cf/api/buildpacks_test.go b/cf/api/buildpacks_test.go index 73f851eafb..8f9bc6b59c 100644 --- a/cf/api/buildpacks_test.go +++ b/cf/api/buildpacks_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/clients.go b/cf/api/clients.go index c317a86c20..ec075d9387 100644 --- a/cf/api/clients.go +++ b/cf/api/clients.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ClientRepository diff --git a/cf/api/clients_test.go b/cf/api/clients_test.go index 5a6d44e56b..b78b81dbe4 100644 --- a/cf/api/clients_test.go +++ b/cf/api/clients_test.go @@ -4,13 +4,13 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/copyapplicationsource/copy_application_source.go b/cf/api/copyapplicationsource/copy_application_source.go index 51a3ab66ec..222f47bf85 100644 --- a/cf/api/copyapplicationsource/copy_application_source.go +++ b/cf/api/copyapplicationsource/copy_application_source.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/copyapplicationsource/copy_application_source_suite_test.go b/cf/api/copyapplicationsource/copy_application_source_suite_test.go index 13132289ef..abd61de112 100644 --- a/cf/api/copyapplicationsource/copy_application_source_suite_test.go +++ b/cf/api/copyapplicationsource/copy_application_source_suite_test.go @@ -1,8 +1,8 @@ package copyapplicationsource_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/copyapplicationsource/copy_application_source_test.go b/cf/api/copyapplicationsource/copy_application_source_test.go index 87a90df724..e6b7596c92 100644 --- a/cf/api/copyapplicationsource/copy_application_source_test.go +++ b/cf/api/copyapplicationsource/copy_application_source_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - . "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + . "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go b/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go index 56b3b9afde..49f34ce288 100644 --- a/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go +++ b/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go @@ -4,7 +4,7 @@ package copyapplicationsourcefakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource" ) type FakeRepository struct { @@ -31,15 +31,16 @@ func (fake *FakeRepository) CopyApplication(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.CopyApplicationStub + fakeReturns := fake.copyApplicationReturns fake.recordInvocation("CopyApplication", []interface{}{arg1, arg2}) fake.copyApplicationMutex.Unlock() - if fake.CopyApplicationStub != nil { - return fake.CopyApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.copyApplicationReturns return fakeReturns.result1 } diff --git a/cf/api/curl.go b/cf/api/curl.go index 59968724d6..50cc592b7e 100644 --- a/cf/api/curl.go +++ b/cf/api/curl.go @@ -9,10 +9,10 @@ import ( "net/textproto" "strings" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CurlRepository diff --git a/cf/api/curl_test.go b/cf/api/curl_test.go index c5c843c353..adf59753aa 100644 --- a/cf/api/curl_test.go +++ b/cf/api/curl_test.go @@ -6,16 +6,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/domains.go b/cf/api/domains.go index 58a4d85544..928e3eee59 100644 --- a/cf/api/domains.go +++ b/cf/api/domains.go @@ -6,13 +6,13 @@ import ( "fmt" "net/url" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DomainRepository diff --git a/cf/api/domains_test.go b/cf/api/domains_test.go index e30e58976a..40618873f9 100644 --- a/cf/api/domains_test.go +++ b/cf/api/domains_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/endpoints.go b/cf/api/endpoints.go index 4d3d5a372f..164f29d9ad 100644 --- a/cf/api/endpoints.go +++ b/cf/api/endpoints.go @@ -3,8 +3,8 @@ package api import ( "strings" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" ) type RemoteInfoRepository struct { diff --git a/cf/api/endpoints_test.go b/cf/api/endpoints_test.go index 5bebc85afd..8c2ec49579 100644 --- a/cf/api/endpoints_test.go +++ b/cf/api/endpoints_test.go @@ -10,14 +10,14 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/environmentvariablegroups/environment_variable_groups.go b/cf/api/environmentvariablegroups/environment_variable_groups.go index bb8419b842..95a1adf81f 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go b/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go index d1cd00431b..287fa433ee 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go @@ -1,8 +1,8 @@ package environmentvariablegroups_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/environmentvariablegroups/environment_variable_groups_test.go b/cf/api/environmentvariablegroups/environment_variable_groups_test.go index fe873b78f8..a4901d1203 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups_test.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups_test.go @@ -4,17 +4,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go b/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go index f0f01aa61c..d55759cfeb 100644 --- a/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go +++ b/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go @@ -4,8 +4,8 @@ package environmentvariablegroupsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRepository struct { @@ -64,15 +64,16 @@ func (fake *FakeRepository) ListRunning() ([]models.EnvironmentVariable, error) ret, specificReturn := fake.listRunningReturnsOnCall[len(fake.listRunningArgsForCall)] fake.listRunningArgsForCall = append(fake.listRunningArgsForCall, struct { }{}) + stub := fake.ListRunningStub + fakeReturns := fake.listRunningReturns fake.recordInvocation("ListRunning", []interface{}{}) fake.listRunningMutex.Unlock() - if fake.ListRunningStub != nil { - return fake.ListRunningStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listRunningReturns return fakeReturns.result1, fakeReturns.result2 } @@ -119,15 +120,16 @@ func (fake *FakeRepository) ListStaging() ([]models.EnvironmentVariable, error) ret, specificReturn := fake.listStagingReturnsOnCall[len(fake.listStagingArgsForCall)] fake.listStagingArgsForCall = append(fake.listStagingArgsForCall, struct { }{}) + stub := fake.ListStagingStub + fakeReturns := fake.listStagingReturns fake.recordInvocation("ListStaging", []interface{}{}) fake.listStagingMutex.Unlock() - if fake.ListStagingStub != nil { - return fake.ListStagingStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listStagingReturns return fakeReturns.result1, fakeReturns.result2 } @@ -175,15 +177,16 @@ func (fake *FakeRepository) SetRunning(arg1 string) error { fake.setRunningArgsForCall = append(fake.setRunningArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRunningStub + fakeReturns := fake.setRunningReturns fake.recordInvocation("SetRunning", []interface{}{arg1}) fake.setRunningMutex.Unlock() - if fake.SetRunningStub != nil { - return fake.SetRunningStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.setRunningReturns return fakeReturns.result1 } @@ -235,15 +238,16 @@ func (fake *FakeRepository) SetStaging(arg1 string) error { fake.setStagingArgsForCall = append(fake.setStagingArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetStagingStub + fakeReturns := fake.setStagingReturns fake.recordInvocation("SetStaging", []interface{}{arg1}) fake.setStagingMutex.Unlock() - if fake.SetStagingStub != nil { - return fake.SetStagingStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.setStagingReturns return fakeReturns.result1 } diff --git a/cf/api/featureflags/feature_flags.go b/cf/api/featureflags/feature_flags.go index 5ea926c873..b24f3d4c6e 100644 --- a/cf/api/featureflags/feature_flags.go +++ b/cf/api/featureflags/feature_flags.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . FeatureFlagRepository diff --git a/cf/api/featureflags/feature_flags_suite_test.go b/cf/api/featureflags/feature_flags_suite_test.go index db79b4771f..e13b27da38 100644 --- a/cf/api/featureflags/feature_flags_suite_test.go +++ b/cf/api/featureflags/feature_flags_suite_test.go @@ -1,8 +1,8 @@ package featureflags_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/featureflags/feature_flags_test.go b/cf/api/featureflags/feature_flags_test.go index b88f7c8301..15e7d30026 100644 --- a/cf/api/featureflags/feature_flags_test.go +++ b/cf/api/featureflags/feature_flags_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go b/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go index cbaf7a0f2a..f81353350d 100644 --- a/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go +++ b/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go @@ -4,8 +4,8 @@ package featureflagsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeFeatureFlagRepository struct { @@ -56,15 +56,16 @@ func (fake *FakeFeatureFlagRepository) FindByName(arg1 string) (models.FeatureFl fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -118,15 +119,16 @@ func (fake *FakeFeatureFlagRepository) List() ([]models.FeatureFlag, error) { ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] fake.listArgsForCall = append(fake.listArgsForCall, struct { }{}) + stub := fake.ListStub + fakeReturns := fake.listReturns fake.recordInvocation("List", []interface{}{}) fake.listMutex.Unlock() - if fake.ListStub != nil { - return fake.ListStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listReturns return fakeReturns.result1, fakeReturns.result2 } @@ -175,15 +177,16 @@ func (fake *FakeFeatureFlagRepository) Update(arg1 string, arg2 bool) error { arg1 string arg2 bool }{arg1, arg2}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1, arg2}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/logs/log_cache_message.go b/cf/api/logs/log_cache_message.go index d54a83f6aa..1bee1f8034 100644 --- a/cf/api/logs/log_cache_message.go +++ b/cf/api/logs/log_cache_message.go @@ -6,7 +6,7 @@ import ( "time" "unicode/utf8" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ColorLogger diff --git a/cf/api/logs/log_cache_message_test.go b/cf/api/logs/log_cache_message_test.go index 087b908c17..4e147dffaf 100644 --- a/cf/api/logs/log_cache_message_test.go +++ b/cf/api/logs/log_cache_message_test.go @@ -3,9 +3,9 @@ package logs_test import ( "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/cf/api/logs" - "code.cloudfoundry.org/cli/v8/cf/api/logs/logsfakes" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs/logsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/log_cache_repository.go b/cf/api/logs/log_cache_repository.go index b17b4ebf13..1e5e660010 100644 --- a/cf/api/logs/log_cache_repository.go +++ b/cf/api/logs/log_cache_repository.go @@ -3,8 +3,8 @@ package logs import ( "context" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type terminalColorLogger struct { diff --git a/cf/api/logs/log_cache_repository_test.go b/cf/api/logs/log_cache_repository_test.go index cc2a39b5f8..7c0ba80004 100644 --- a/cf/api/logs/log_cache_repository_test.go +++ b/cf/api/logs/log_cache_repository_test.go @@ -5,9 +5,9 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/cf/api/logs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/logsfakes/fake_color_logger.go b/cf/api/logs/logsfakes/fake_color_logger.go index 1d9b85492a..57b5eb05c3 100644 --- a/cf/api/logs/logsfakes/fake_color_logger.go +++ b/cf/api/logs/logsfakes/fake_color_logger.go @@ -4,7 +4,7 @@ package logsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs" ) type FakeColorLogger struct { @@ -51,15 +51,16 @@ func (fake *FakeColorLogger) LogStderrColor(arg1 string) string { fake.logStderrColorArgsForCall = append(fake.logStderrColorArgsForCall, struct { arg1 string }{arg1}) + stub := fake.LogStderrColorStub + fakeReturns := fake.logStderrColorReturns fake.recordInvocation("LogStderrColor", []interface{}{arg1}) fake.logStderrColorMutex.Unlock() - if fake.LogStderrColorStub != nil { - return fake.LogStderrColorStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.logStderrColorReturns return fakeReturns.result1 } @@ -111,15 +112,16 @@ func (fake *FakeColorLogger) LogStdoutColor(arg1 string) string { fake.logStdoutColorArgsForCall = append(fake.logStdoutColorArgsForCall, struct { arg1 string }{arg1}) + stub := fake.LogStdoutColorStub + fakeReturns := fake.logStdoutColorReturns fake.recordInvocation("LogStdoutColor", []interface{}{arg1}) fake.logStdoutColorMutex.Unlock() - if fake.LogStdoutColorStub != nil { - return fake.LogStdoutColorStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.logStdoutColorReturns return fakeReturns.result1 } @@ -171,15 +173,16 @@ func (fake *FakeColorLogger) LogSysHeaderColor(arg1 string) string { fake.logSysHeaderColorArgsForCall = append(fake.logSysHeaderColorArgsForCall, struct { arg1 string }{arg1}) + stub := fake.LogSysHeaderColorStub + fakeReturns := fake.logSysHeaderColorReturns fake.recordInvocation("LogSysHeaderColor", []interface{}{arg1}) fake.logSysHeaderColorMutex.Unlock() - if fake.LogSysHeaderColorStub != nil { - return fake.LogSysHeaderColorStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.logSysHeaderColorReturns return fakeReturns.result1 } diff --git a/cf/api/logs/logsfakes/fake_loggable.go b/cf/api/logs/logsfakes/fake_loggable.go index 49b2c3f506..3ba8b07f98 100644 --- a/cf/api/logs/logsfakes/fake_loggable.go +++ b/cf/api/logs/logsfakes/fake_loggable.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs" ) type FakeLoggable struct { @@ -49,15 +49,16 @@ func (fake *FakeLoggable) GetSourceName() string { ret, specificReturn := fake.getSourceNameReturnsOnCall[len(fake.getSourceNameArgsForCall)] fake.getSourceNameArgsForCall = append(fake.getSourceNameArgsForCall, struct { }{}) + stub := fake.GetSourceNameStub + fakeReturns := fake.getSourceNameReturns fake.recordInvocation("GetSourceName", []interface{}{}) fake.getSourceNameMutex.Unlock() - if fake.GetSourceNameStub != nil { - return fake.GetSourceNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getSourceNameReturns return fakeReturns.result1 } @@ -102,15 +103,16 @@ func (fake *FakeLoggable) ToLog(arg1 *time.Location) string { fake.toLogArgsForCall = append(fake.toLogArgsForCall, struct { arg1 *time.Location }{arg1}) + stub := fake.ToLogStub + fakeReturns := fake.toLogReturns fake.recordInvocation("ToLog", []interface{}{arg1}) fake.toLogMutex.Unlock() - if fake.ToLogStub != nil { - return fake.ToLogStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.toLogReturns return fakeReturns.result1 } @@ -161,15 +163,16 @@ func (fake *FakeLoggable) ToSimpleLog() string { ret, specificReturn := fake.toSimpleLogReturnsOnCall[len(fake.toSimpleLogArgsForCall)] fake.toSimpleLogArgsForCall = append(fake.toSimpleLogArgsForCall, struct { }{}) + stub := fake.ToSimpleLogStub + fakeReturns := fake.toSimpleLogReturns fake.recordInvocation("ToSimpleLog", []interface{}{}) fake.toSimpleLogMutex.Unlock() - if fake.ToSimpleLogStub != nil { - return fake.ToSimpleLogStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.toSimpleLogReturns return fakeReturns.result1 } diff --git a/cf/api/logs/logsfakes/fake_repository.go b/cf/api/logs/logsfakes/fake_repository.go index f17edff7c1..d0acc7b17d 100644 --- a/cf/api/logs/logsfakes/fake_repository.go +++ b/cf/api/logs/logsfakes/fake_repository.go @@ -4,7 +4,7 @@ package logsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs" ) type FakeRepository struct { @@ -41,9 +41,10 @@ func (fake *FakeRepository) Close() { fake.closeMutex.Lock() fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { + if stub != nil { fake.CloseStub() } } @@ -66,15 +67,16 @@ func (fake *FakeRepository) RecentLogsFor(arg1 string) ([]logs.Loggable, error) fake.recentLogsForArgsForCall = append(fake.recentLogsForArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RecentLogsForStub + fakeReturns := fake.recentLogsForReturns fake.recordInvocation("RecentLogsFor", []interface{}{arg1}) fake.recentLogsForMutex.Unlock() - if fake.RecentLogsForStub != nil { - return fake.RecentLogsForStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.recentLogsForReturns return fakeReturns.result1, fakeReturns.result2 } @@ -131,9 +133,10 @@ func (fake *FakeRepository) TailLogsFor(arg1 string, arg2 func(), arg3 chan<- lo arg3 chan<- logs.Loggable arg4 chan<- error }{arg1, arg2, arg3, arg4}) + stub := fake.TailLogsForStub fake.recordInvocation("TailLogsFor", []interface{}{arg1, arg2, arg3, arg4}) fake.tailLogsForMutex.Unlock() - if fake.TailLogsForStub != nil { + if stub != nil { fake.TailLogsForStub(arg1, arg2, arg3, arg4) } } diff --git a/cf/api/organizations/organizations.go b/cf/api/organizations/organizations.go index 3ea3a78e7b..a8c154f0a9 100644 --- a/cf/api/organizations/organizations.go +++ b/cf/api/organizations/organizations.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrganizationRepository diff --git a/cf/api/organizations/organizations_suite_test.go b/cf/api/organizations/organizations_suite_test.go index e86bfb1bb2..2362d94a34 100644 --- a/cf/api/organizations/organizations_suite_test.go +++ b/cf/api/organizations/organizations_suite_test.go @@ -1,8 +1,8 @@ package organizations_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/organizations/organizations_test.go b/cf/api/organizations/organizations_test.go index 530d7a8334..bfdafa8d15 100644 --- a/cf/api/organizations/organizations_test.go +++ b/cf/api/organizations/organizations_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/organizations/organizationsfakes/fake_organization_repository.go b/cf/api/organizations/organizationsfakes/fake_organization_repository.go index 0e514c5e20..181830ca0f 100644 --- a/cf/api/organizations/organizationsfakes/fake_organization_repository.go +++ b/cf/api/organizations/organizationsfakes/fake_organization_repository.go @@ -4,8 +4,8 @@ package organizationsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeOrganizationRepository struct { @@ -116,15 +116,16 @@ func (fake *FakeOrganizationRepository) Create(arg1 models.Organization) error { fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.Organization }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -176,15 +177,16 @@ func (fake *FakeOrganizationRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -236,15 +238,16 @@ func (fake *FakeOrganizationRepository) FindByName(arg1 string) (models.Organiza fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -304,15 +307,16 @@ func (fake *FakeOrganizationRepository) GetManyOrgsByGUID(arg1 []string) ([]mode fake.getManyOrgsByGUIDArgsForCall = append(fake.getManyOrgsByGUIDArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.GetManyOrgsByGUIDStub + fakeReturns := fake.getManyOrgsByGUIDReturns fake.recordInvocation("GetManyOrgsByGUID", []interface{}{arg1Copy}) fake.getManyOrgsByGUIDMutex.Unlock() - if fake.GetManyOrgsByGUIDStub != nil { - return fake.GetManyOrgsByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getManyOrgsByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -367,15 +371,16 @@ func (fake *FakeOrganizationRepository) ListOrgs(arg1 int) ([]models.Organizatio fake.listOrgsArgsForCall = append(fake.listOrgsArgsForCall, struct { arg1 int }{arg1}) + stub := fake.ListOrgsStub + fakeReturns := fake.listOrgsReturns fake.recordInvocation("ListOrgs", []interface{}{arg1}) fake.listOrgsMutex.Unlock() - if fake.ListOrgsStub != nil { - return fake.ListOrgsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -431,15 +436,16 @@ func (fake *FakeOrganizationRepository) Rename(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.RenameStub + fakeReturns := fake.renameReturns fake.recordInvocation("Rename", []interface{}{arg1, arg2}) fake.renameMutex.Unlock() - if fake.RenameStub != nil { - return fake.RenameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.renameReturns return fakeReturns.result1 } @@ -492,15 +498,16 @@ func (fake *FakeOrganizationRepository) SharePrivateDomain(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.SharePrivateDomainStub + fakeReturns := fake.sharePrivateDomainReturns fake.recordInvocation("SharePrivateDomain", []interface{}{arg1, arg2}) fake.sharePrivateDomainMutex.Unlock() - if fake.SharePrivateDomainStub != nil { - return fake.SharePrivateDomainStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.sharePrivateDomainReturns return fakeReturns.result1 } @@ -553,15 +560,16 @@ func (fake *FakeOrganizationRepository) UnsharePrivateDomain(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnsharePrivateDomainStub + fakeReturns := fake.unsharePrivateDomainReturns fake.recordInvocation("UnsharePrivateDomain", []interface{}{arg1, arg2}) fake.unsharePrivateDomainMutex.Unlock() - if fake.UnsharePrivateDomainStub != nil { - return fake.UnsharePrivateDomainStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unsharePrivateDomainReturns return fakeReturns.result1 } diff --git a/cf/api/password/password.go b/cf/api/password/password.go index 2b579f7a50..9983b200a8 100644 --- a/cf/api/password/password.go +++ b/cf/api/password/password.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Repository diff --git a/cf/api/password/password_suite_test.go b/cf/api/password/password_suite_test.go index 26cbe329a4..44c32b90e6 100644 --- a/cf/api/password/password_suite_test.go +++ b/cf/api/password/password_suite_test.go @@ -1,8 +1,8 @@ package password_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/password/password_test.go b/cf/api/password/password_test.go index d34d9d5404..d77e46b898 100644 --- a/cf/api/password/password_test.go +++ b/cf/api/password/password_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/v8/cf/api/password" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api/password" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/password/passwordfakes/fake_repository.go b/cf/api/password/passwordfakes/fake_repository.go index fd4f98364a..a7578a881b 100644 --- a/cf/api/password/passwordfakes/fake_repository.go +++ b/cf/api/password/passwordfakes/fake_repository.go @@ -4,7 +4,7 @@ package passwordfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/password" + "code.cloudfoundry.org/cli/v9/cf/api/password" ) type FakeRepository struct { @@ -31,15 +31,16 @@ func (fake *FakeRepository) UpdatePassword(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdatePasswordStub + fakeReturns := fake.updatePasswordReturns fake.recordInvocation("UpdatePassword", []interface{}{arg1, arg2}) fake.updatePasswordMutex.Unlock() - if fake.UpdatePasswordStub != nil { - return fake.UpdatePasswordStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.updatePasswordReturns return fakeReturns.result1 } diff --git a/cf/api/quotas/quotas.go b/cf/api/quotas/quotas.go index f13d17b6b0..0708f89772 100644 --- a/cf/api/quotas/quotas.go +++ b/cf/api/quotas/quotas.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . QuotaRepository diff --git a/cf/api/quotas/quotas_suite_test.go b/cf/api/quotas/quotas_suite_test.go index 5199e6cb47..02ab38949f 100644 --- a/cf/api/quotas/quotas_suite_test.go +++ b/cf/api/quotas/quotas_suite_test.go @@ -1,8 +1,8 @@ package quotas_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/quotas/quotas_test.go b/cf/api/quotas/quotas_test.go index 74e278c73e..61c892ce61 100644 --- a/cf/api/quotas/quotas_test.go +++ b/cf/api/quotas/quotas_test.go @@ -4,19 +4,19 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" "encoding/json" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/quotas/quotasfakes/fake_quota_repository.go b/cf/api/quotas/quotasfakes/fake_quota_repository.go index 00f96cf222..0591f43b77 100644 --- a/cf/api/quotas/quotasfakes/fake_quota_repository.go +++ b/cf/api/quotas/quotasfakes/fake_quota_repository.go @@ -4,8 +4,8 @@ package quotasfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeQuotaRepository struct { @@ -90,15 +90,16 @@ func (fake *FakeQuotaRepository) AssignQuotaToOrg(arg1 string, arg2 string) erro arg1 string arg2 string }{arg1, arg2}) + stub := fake.AssignQuotaToOrgStub + fakeReturns := fake.assignQuotaToOrgReturns fake.recordInvocation("AssignQuotaToOrg", []interface{}{arg1, arg2}) fake.assignQuotaToOrgMutex.Unlock() - if fake.AssignQuotaToOrgStub != nil { - return fake.AssignQuotaToOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.assignQuotaToOrgReturns return fakeReturns.result1 } @@ -150,15 +151,16 @@ func (fake *FakeQuotaRepository) Create(arg1 models.QuotaFields) error { fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.QuotaFields }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -210,15 +212,16 @@ func (fake *FakeQuotaRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -269,15 +272,16 @@ func (fake *FakeQuotaRepository) FindAll() ([]models.QuotaFields, error) { ret, specificReturn := fake.findAllReturnsOnCall[len(fake.findAllArgsForCall)] fake.findAllArgsForCall = append(fake.findAllArgsForCall, struct { }{}) + stub := fake.FindAllStub + fakeReturns := fake.findAllReturns fake.recordInvocation("FindAll", []interface{}{}) fake.findAllMutex.Unlock() - if fake.FindAllStub != nil { - return fake.FindAllStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllReturns return fakeReturns.result1, fakeReturns.result2 } @@ -325,15 +329,16 @@ func (fake *FakeQuotaRepository) FindByName(arg1 string) (models.QuotaFields, er fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -388,15 +393,16 @@ func (fake *FakeQuotaRepository) Update(arg1 models.QuotaFields) error { fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.QuotaFields }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/repository_locator.go b/cf/api/repository_locator.go index 9cb7048b0f..62a77971a5 100644 --- a/cf/api/repository_locator.go +++ b/cf/api/repository_locator.go @@ -1,34 +1,34 @@ package api import ( - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - v7action2 "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/logcache" - "code.cloudfoundry.org/cli/v8/cf/api/appevents" - api_appfiles "code.cloudfoundry.org/cli/v8/cf/api/appfiles" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances" - "code.cloudfoundry.org/cli/v8/cf/api/applicationbits" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/api/logs" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/password" - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" - securitygroupspaces "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/api/stacks" - "code.cloudfoundry.org/cli/v8/cf/appfiles" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/trace" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + v7action2 "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/cf/api/appevents" + api_appfiles "code.cloudfoundry.org/cli/v9/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/password" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + securitygroupspaces "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type RepositoryLocator struct { diff --git a/cf/api/resources/applications.go b/cf/api/resources/applications.go index 535ed65171..6488a70b6f 100644 --- a/cf/api/resources/applications.go +++ b/cf/api/resources/applications.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type PaginatedApplicationResources struct { diff --git a/cf/api/resources/applications_test.go b/cf/api/resources/applications_test.go index 46af57fade..a1d88bf3ca 100644 --- a/cf/api/resources/applications_test.go +++ b/cf/api/resources/applications_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/auth_tokens.go b/cf/api/resources/auth_tokens.go index 94c6d66707..d69f7fdb1a 100644 --- a/cf/api/resources/auth_tokens.go +++ b/cf/api/resources/auth_tokens.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedAuthTokenResources struct { Resources []AuthTokenResource diff --git a/cf/api/resources/buildpacks.go b/cf/api/resources/buildpacks.go index 4e6993b940..a91bb64130 100644 --- a/cf/api/resources/buildpacks.go +++ b/cf/api/resources/buildpacks.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type BuildpackResource struct { Resource diff --git a/cf/api/resources/domains.go b/cf/api/resources/domains.go index 36b5421f51..8e0f00e293 100644 --- a/cf/api/resources/domains.go +++ b/cf/api/resources/domains.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type DomainResource struct { Resource diff --git a/cf/api/resources/events.go b/cf/api/resources/events.go index 446048c386..45d7e068e6 100644 --- a/cf/api/resources/events.go +++ b/cf/api/resources/events.go @@ -6,9 +6,9 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/util/generic" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/util/generic" ) type EventResource interface { diff --git a/cf/api/resources/events_test.go b/cf/api/resources/events_test.go index c2bd07aede..9f17dacfde 100644 --- a/cf/api/resources/events_test.go +++ b/cf/api/resources/events_test.go @@ -5,7 +5,7 @@ import ( "time" - . "code.cloudfoundry.org/cli/v8/cf/api/resources" + . "code.cloudfoundry.org/cli/v9/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/feature_flags.go b/cf/api/resources/feature_flags.go index 74d98babd9..b1f95de383 100644 --- a/cf/api/resources/feature_flags.go +++ b/cf/api/resources/feature_flags.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type FeatureFlagResource struct { Entity models.FeatureFlag diff --git a/cf/api/resources/organizations.go b/cf/api/resources/organizations.go index dc109565ad..55d5f74e30 100644 --- a/cf/api/resources/organizations.go +++ b/cf/api/resources/organizations.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type OrganizationResource struct { Resource diff --git a/cf/api/resources/quotas.go b/cf/api/resources/quotas.go index 48ea9a5e22..59032ea345 100644 --- a/cf/api/resources/quotas.go +++ b/cf/api/resources/quotas.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedQuotaResources struct { Resources []QuotaResource diff --git a/cf/api/resources/quotas_test.go b/cf/api/resources/quotas_test.go index 3306b6f37a..37959c026e 100644 --- a/cf/api/resources/quotas_test.go +++ b/cf/api/resources/quotas_test.go @@ -1,9 +1,9 @@ package resources_test import ( - . "code.cloudfoundry.org/cli/v8/cf/api/resources" + . "code.cloudfoundry.org/cli/v9/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" "encoding/json" . "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 1ecf4c9b0f..1b7e5db85c 100644 --- a/cf/api/resources/resources_test.go +++ b/cf/api/resources/resources_test.go @@ -3,8 +3,8 @@ package resources_test import ( "testing" - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/routes.go b/cf/api/resources/routes.go index a21da2a76b..df951766cb 100644 --- a/cf/api/resources/routes.go +++ b/cf/api/resources/routes.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type RouteResource struct { Resource diff --git a/cf/api/resources/security_groups.go b/cf/api/resources/security_groups.go index 120eed5d74..04d173cd11 100644 --- a/cf/api/resources/security_groups.go +++ b/cf/api/resources/security_groups.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedSecurityGroupResources struct { Resources []SecurityGroupResource diff --git a/cf/api/resources/service_bindings.go b/cf/api/resources/service_bindings.go index 411026c719..58d2a06e55 100644 --- a/cf/api/resources/service_bindings.go +++ b/cf/api/resources/service_bindings.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type ServiceBindingResource struct { Resource diff --git a/cf/api/resources/service_brokers.go b/cf/api/resources/service_brokers.go index e42fe2825d..ea3e22d483 100644 --- a/cf/api/resources/service_brokers.go +++ b/cf/api/resources/service_brokers.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type ServiceBrokerResource struct { Resource diff --git a/cf/api/resources/service_instances.go b/cf/api/resources/service_instances.go index a13bb43b32..3112187764 100644 --- a/cf/api/resources/service_instances.go +++ b/cf/api/resources/service_instances.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedServiceInstanceResources struct { TotalResults int `json:"total_results"` diff --git a/cf/api/resources/service_instances_test.go b/cf/api/resources/service_instances_test.go index 9af6584bb5..c2982013fa 100644 --- a/cf/api/resources/service_instances_test.go +++ b/cf/api/resources/service_instances_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - . "code.cloudfoundry.org/cli/v8/cf/api/resources" + . "code.cloudfoundry.org/cli/v9/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/resources/service_keys.go b/cf/api/resources/service_keys.go index c4731821aa..03b1479525 100644 --- a/cf/api/resources/service_keys.go +++ b/cf/api/resources/service_keys.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type ServiceKeyResource struct { Resource diff --git a/cf/api/resources/service_keys_test.go b/cf/api/resources/service_keys_test.go index 1680cfa90d..8a85d2e7ea 100644 --- a/cf/api/resources/service_keys_test.go +++ b/cf/api/resources/service_keys_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/cf/api/resources" + . "code.cloudfoundry.org/cli/v9/cf/api/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/resources/service_offerings.go b/cf/api/resources/service_offerings.go index a86a41a78c..586136c319 100644 --- a/cf/api/resources/service_offerings.go +++ b/cf/api/resources/service_offerings.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strconv" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type PaginatedServiceOfferingResources struct { diff --git a/cf/api/resources/service_plan_visibility.go b/cf/api/resources/service_plan_visibility.go index ac4fa03415..0acc5b3b78 100644 --- a/cf/api/resources/service_plan_visibility.go +++ b/cf/api/resources/service_plan_visibility.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type ServicePlanVisibilityResource struct { Resource diff --git a/cf/api/resources/service_plans.go b/cf/api/resources/service_plans.go index 17566b912d..a1d4e8e1cf 100644 --- a/cf/api/resources/service_plans.go +++ b/cf/api/resources/service_plans.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" ) type ServicePlanResource struct { diff --git a/cf/api/resources/space_quotas.go b/cf/api/resources/space_quotas.go index 98a7652538..4709408860 100644 --- a/cf/api/resources/space_quotas.go +++ b/cf/api/resources/space_quotas.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedSpaceQuotaResources struct { Resources []SpaceQuotaResource diff --git a/cf/api/resources/spaces.go b/cf/api/resources/spaces.go index 293baa16cc..9a4536c11e 100644 --- a/cf/api/resources/spaces.go +++ b/cf/api/resources/spaces.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type SpaceResource struct { Resource diff --git a/cf/api/resources/stacks.go b/cf/api/resources/stacks.go index 98bcc209a5..b8c0eeaed7 100644 --- a/cf/api/resources/stacks.go +++ b/cf/api/resources/stacks.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type PaginatedStackResources struct { Resources []StackResource diff --git a/cf/api/resources/users.go b/cf/api/resources/users.go index 6e7a395422..b2f9b7fd8c 100644 --- a/cf/api/resources/users.go +++ b/cf/api/resources/users.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/cf/models" +import "code.cloudfoundry.org/cli/v9/cf/models" type UserResource struct { Resource diff --git a/cf/api/route_service_binding_repository.go b/cf/api/route_service_binding_repository.go index 6eff9be552..96f76aa26a 100644 --- a/cf/api/route_service_binding_repository.go +++ b/cf/api/route_service_binding_repository.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteServiceBindingRepository diff --git a/cf/api/route_service_binding_repository_test.go b/cf/api/route_service_binding_repository_test.go index afc33fe202..480ad34c6e 100644 --- a/cf/api/route_service_binding_repository_test.go +++ b/cf/api/route_service_binding_repository_test.go @@ -5,17 +5,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/routes.go b/cf/api/routes.go index aeacee023d..0a539e1721 100644 --- a/cf/api/routes.go +++ b/cf/api/routes.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" "github.com/google/go-querystring/query" ) diff --git a/cf/api/routes_test.go b/cf/api/routes_test.go index 40b5ba5c8f..dc938af51f 100644 --- a/cf/api/routes_test.go +++ b/cf/api/routes_test.go @@ -6,18 +6,18 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/routing_api.go b/cf/api/routing_api.go index f045ab8803..744042251e 100644 --- a/cf/api/routing_api.go +++ b/cf/api/routing_api.go @@ -3,9 +3,9 @@ package api import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type routingAPIRepository struct { diff --git a/cf/api/routing_api_test.go b/cf/api/routing_api_test.go index 38311e2c9f..e43cfe9302 100644 --- a/cf/api/routing_api_test.go +++ b/cf/api/routing_api_test.go @@ -6,14 +6,14 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/securitygroups/defaults/defaults.go b/cf/api/securitygroups/defaults/defaults.go index cfc9e629f4..bb545ff036 100644 --- a/cf/api/securitygroups/defaults/defaults.go +++ b/cf/api/securitygroups/defaults/defaults.go @@ -3,10 +3,10 @@ package defaults import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type DefaultSecurityGroupsRepoBase struct { diff --git a/cf/api/securitygroups/defaults/running/running.go b/cf/api/securitygroups/defaults/running/running.go index 5a8018b049..be24c2a98b 100644 --- a/cf/api/securitygroups/defaults/running/running.go +++ b/cf/api/securitygroups/defaults/running/running.go @@ -1,11 +1,11 @@ package running import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults" ) const urlPath = "/v2/config/running_security_groups" diff --git a/cf/api/securitygroups/defaults/running/running_suite_test.go b/cf/api/securitygroups/defaults/running/running_suite_test.go index d071aca402..5fcd5a18d1 100644 --- a/cf/api/securitygroups/defaults/running/running_suite_test.go +++ b/cf/api/securitygroups/defaults/running/running_suite_test.go @@ -1,8 +1,8 @@ package running_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/defaults/running/running_test.go b/cf/api/securitygroups/defaults/running/running_test.go index 9fb0868740..10bf91e9c6 100644 --- a/cf/api/securitygroups/defaults/running/running_test.go +++ b/cf/api/securitygroups/defaults/running/running_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go b/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go index 8d73e58ec6..a90a98ac43 100644 --- a/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go +++ b/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go @@ -4,8 +4,8 @@ package runningfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSecurityGroupsRepo struct { @@ -53,15 +53,16 @@ func (fake *FakeSecurityGroupsRepo) BindToRunningSet(arg1 string) error { fake.bindToRunningSetArgsForCall = append(fake.bindToRunningSetArgsForCall, struct { arg1 string }{arg1}) + stub := fake.BindToRunningSetStub + fakeReturns := fake.bindToRunningSetReturns fake.recordInvocation("BindToRunningSet", []interface{}{arg1}) fake.bindToRunningSetMutex.Unlock() - if fake.BindToRunningSetStub != nil { - return fake.BindToRunningSetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindToRunningSetReturns return fakeReturns.result1 } @@ -112,15 +113,16 @@ func (fake *FakeSecurityGroupsRepo) List() ([]models.SecurityGroupFields, error) ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] fake.listArgsForCall = append(fake.listArgsForCall, struct { }{}) + stub := fake.ListStub + fakeReturns := fake.listReturns fake.recordInvocation("List", []interface{}{}) fake.listMutex.Unlock() - if fake.ListStub != nil { - return fake.ListStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listReturns return fakeReturns.result1, fakeReturns.result2 } @@ -168,15 +170,16 @@ func (fake *FakeSecurityGroupsRepo) UnbindFromRunningSet(arg1 string) error { fake.unbindFromRunningSetArgsForCall = append(fake.unbindFromRunningSetArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UnbindFromRunningSetStub + fakeReturns := fake.unbindFromRunningSetReturns fake.recordInvocation("UnbindFromRunningSet", []interface{}{arg1}) fake.unbindFromRunningSetMutex.Unlock() - if fake.UnbindFromRunningSetStub != nil { - return fake.UnbindFromRunningSetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindFromRunningSetReturns return fakeReturns.result1 } diff --git a/cf/api/securitygroups/defaults/staging/staging.go b/cf/api/securitygroups/defaults/staging/staging.go index abafa4a1f5..a871376707 100644 --- a/cf/api/securitygroups/defaults/staging/staging.go +++ b/cf/api/securitygroups/defaults/staging/staging.go @@ -1,11 +1,11 @@ package staging import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults" ) const urlPath = "/v2/config/staging_security_groups" diff --git a/cf/api/securitygroups/defaults/staging/staging_suite_test.go b/cf/api/securitygroups/defaults/staging/staging_suite_test.go index 46ff3f88a7..70988c05f4 100644 --- a/cf/api/securitygroups/defaults/staging/staging_suite_test.go +++ b/cf/api/securitygroups/defaults/staging/staging_suite_test.go @@ -1,8 +1,8 @@ package staging_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/defaults/staging/staging_test.go b/cf/api/securitygroups/defaults/staging/staging_test.go index b4d2e1caee..6a7928640e 100644 --- a/cf/api/securitygroups/defaults/staging/staging_test.go +++ b/cf/api/securitygroups/defaults/staging/staging_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go b/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go index 8411e02607..acbb211aa0 100644 --- a/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go +++ b/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go @@ -4,8 +4,8 @@ package stagingfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSecurityGroupsRepo struct { @@ -53,15 +53,16 @@ func (fake *FakeSecurityGroupsRepo) BindToStagingSet(arg1 string) error { fake.bindToStagingSetArgsForCall = append(fake.bindToStagingSetArgsForCall, struct { arg1 string }{arg1}) + stub := fake.BindToStagingSetStub + fakeReturns := fake.bindToStagingSetReturns fake.recordInvocation("BindToStagingSet", []interface{}{arg1}) fake.bindToStagingSetMutex.Unlock() - if fake.BindToStagingSetStub != nil { - return fake.BindToStagingSetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindToStagingSetReturns return fakeReturns.result1 } @@ -112,15 +113,16 @@ func (fake *FakeSecurityGroupsRepo) List() ([]models.SecurityGroupFields, error) ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] fake.listArgsForCall = append(fake.listArgsForCall, struct { }{}) + stub := fake.ListStub + fakeReturns := fake.listReturns fake.recordInvocation("List", []interface{}{}) fake.listMutex.Unlock() - if fake.ListStub != nil { - return fake.ListStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listReturns return fakeReturns.result1, fakeReturns.result2 } @@ -168,15 +170,16 @@ func (fake *FakeSecurityGroupsRepo) UnbindFromStagingSet(arg1 string) error { fake.unbindFromStagingSetArgsForCall = append(fake.unbindFromStagingSetArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UnbindFromStagingSetStub + fakeReturns := fake.unbindFromStagingSetReturns fake.recordInvocation("UnbindFromStagingSet", []interface{}{arg1}) fake.unbindFromStagingSetMutex.Unlock() - if fake.UnbindFromStagingSetStub != nil { - return fake.UnbindFromStagingSetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindFromStagingSetReturns return fakeReturns.result1 } diff --git a/cf/api/securitygroups/security_groups.go b/cf/api/securitygroups/security_groups.go index 86dddfc861..3752de9995 100644 --- a/cf/api/securitygroups/security_groups.go +++ b/cf/api/securitygroups/security_groups.go @@ -4,11 +4,11 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecurityGroupRepo diff --git a/cf/api/securitygroups/security_groups_suite_test.go b/cf/api/securitygroups/security_groups_suite_test.go index f35c5e93a0..18bd946a18 100644 --- a/cf/api/securitygroups/security_groups_suite_test.go +++ b/cf/api/securitygroups/security_groups_suite_test.go @@ -1,8 +1,8 @@ package securitygroups_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/securitygroups/security_groups_test.go b/cf/api/securitygroups/security_groups_test.go index 7360b1c0df..4501bf8f41 100644 --- a/cf/api/securitygroups/security_groups_test.go +++ b/cf/api/securitygroups/security_groups_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go b/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go index 9ad0b0d87c..b46bb81454 100644 --- a/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go +++ b/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go @@ -4,8 +4,8 @@ package securitygroupsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSecurityGroupRepo struct { @@ -85,15 +85,16 @@ func (fake *FakeSecurityGroupRepo) Create(arg1 string, arg2 []map[string]interfa arg1 string arg2 []map[string]interface{} }{arg1, arg2Copy}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2Copy}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -145,15 +146,16 @@ func (fake *FakeSecurityGroupRepo) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -204,15 +206,16 @@ func (fake *FakeSecurityGroupRepo) FindAll() ([]models.SecurityGroup, error) { ret, specificReturn := fake.findAllReturnsOnCall[len(fake.findAllArgsForCall)] fake.findAllArgsForCall = append(fake.findAllArgsForCall, struct { }{}) + stub := fake.FindAllStub + fakeReturns := fake.findAllReturns fake.recordInvocation("FindAll", []interface{}{}) fake.findAllMutex.Unlock() - if fake.FindAllStub != nil { - return fake.FindAllStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllReturns return fakeReturns.result1, fakeReturns.result2 } @@ -260,15 +263,16 @@ func (fake *FakeSecurityGroupRepo) Read(arg1 string) (models.SecurityGroup, erro fake.readArgsForCall = append(fake.readArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadStub + fakeReturns := fake.readReturns fake.recordInvocation("Read", []interface{}{arg1}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readReturns return fakeReturns.result1, fakeReturns.result2 } @@ -329,15 +333,16 @@ func (fake *FakeSecurityGroupRepo) Update(arg1 string, arg2 []map[string]interfa arg1 string arg2 []map[string]interface{} }{arg1, arg2Copy}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1, arg2Copy}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/securitygroups/spaces/space_binder.go b/cf/api/securitygroups/spaces/space_binder.go index 4112df26d9..4c1868d539 100644 --- a/cf/api/securitygroups/spaces/space_binder.go +++ b/cf/api/securitygroups/spaces/space_binder.go @@ -3,9 +3,9 @@ package spaces import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecurityGroupSpaceBinder diff --git a/cf/api/securitygroups/spaces/space_binder_test.go b/cf/api/securitygroups/spaces/space_binder_test.go index 7c1fcf06ea..aab76ea543 100644 --- a/cf/api/securitygroups/spaces/space_binder_test.go +++ b/cf/api/securitygroups/spaces/space_binder_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go b/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go index b32d69f549..c70fb6e972 100644 --- a/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go +++ b/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go @@ -4,7 +4,7 @@ package spacesfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" ) type FakeSecurityGroupSpaceBinder struct { @@ -43,15 +43,16 @@ func (fake *FakeSecurityGroupSpaceBinder) BindSpace(arg1 string, arg2 string) er arg1 string arg2 string }{arg1, arg2}) + stub := fake.BindSpaceStub + fakeReturns := fake.bindSpaceReturns fake.recordInvocation("BindSpace", []interface{}{arg1, arg2}) fake.bindSpaceMutex.Unlock() - if fake.BindSpaceStub != nil { - return fake.BindSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindSpaceReturns return fakeReturns.result1 } @@ -104,15 +105,16 @@ func (fake *FakeSecurityGroupSpaceBinder) UnbindSpace(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnbindSpaceStub + fakeReturns := fake.unbindSpaceReturns fake.recordInvocation("UnbindSpace", []interface{}{arg1, arg2}) fake.unbindSpaceMutex.Unlock() - if fake.UnbindSpaceStub != nil { - return fake.UnbindSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindSpaceReturns return fakeReturns.result1 } diff --git a/cf/api/securitygroups/spaces/suite_test.go b/cf/api/securitygroups/spaces/suite_test.go index 3eda6b8f7c..2c97f58c25 100644 --- a/cf/api/securitygroups/spaces/suite_test.go +++ b/cf/api/securitygroups/spaces/suite_test.go @@ -1,8 +1,8 @@ package spaces_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/service_auth_tokens.go b/cf/api/service_auth_tokens.go index 0ac8af9ad0..881622cf11 100644 --- a/cf/api/service_auth_tokens.go +++ b/cf/api/service_auth_tokens.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceAuthTokenRepository diff --git a/cf/api/service_auth_tokens_test.go b/cf/api/service_auth_tokens_test.go index e134158314..0e4f8f0bcf 100644 --- a/cf/api/service_auth_tokens_test.go +++ b/cf/api/service_auth_tokens_test.go @@ -5,18 +5,18 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_bindings.go b/cf/api/service_bindings.go index f9c0cc6926..9646200dfd 100644 --- a/cf/api/service_bindings.go +++ b/cf/api/service_bindings.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBindingRepository diff --git a/cf/api/service_bindings_test.go b/cf/api/service_bindings_test.go index 5c1b0509a5..ab8c971f38 100644 --- a/cf/api/service_bindings_test.go +++ b/cf/api/service_bindings_test.go @@ -4,15 +4,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/service_brokers.go b/cf/api/service_brokers.go index d526bcf1ed..228134bb1e 100644 --- a/cf/api/service_brokers.go +++ b/cf/api/service_brokers.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceBrokerRepository diff --git a/cf/api/service_brokers_test.go b/cf/api/service_brokers_test.go index 7a6290f664..bef3a69775 100644 --- a/cf/api/service_brokers_test.go +++ b/cf/api/service_brokers_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/service_keys.go b/cf/api/service_keys.go index 285fc9dadf..294eb08453 100644 --- a/cf/api/service_keys.go +++ b/cf/api/service_keys.go @@ -6,11 +6,11 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceKeyRepository diff --git a/cf/api/service_keys_test.go b/cf/api/service_keys_test.go index b9b9cc6df6..aa33836630 100644 --- a/cf/api/service_keys_test.go +++ b/cf/api/service_keys_test.go @@ -4,19 +4,19 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - . "code.cloudfoundry.org/cli/v8/cf/api" + . "code.cloudfoundry.org/cli/v9/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_plan.go b/cf/api/service_plan.go index fa8b2515e2..f0fd410fa0 100644 --- a/cf/api/service_plan.go +++ b/cf/api/service_plan.go @@ -5,10 +5,10 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanRepository diff --git a/cf/api/service_plan_test.go b/cf/api/service_plan_test.go index 9e3c418d5b..7586ba5bec 100644 --- a/cf/api/service_plan_test.go +++ b/cf/api/service_plan_test.go @@ -5,17 +5,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_plan_visibility.go b/cf/api/service_plan_visibility.go index af858e3168..ef9d1c0668 100644 --- a/cf/api/service_plan_visibility.go +++ b/cf/api/service_plan_visibility.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServicePlanVisibilityRepository diff --git a/cf/api/service_plan_visibility_test.go b/cf/api/service_plan_visibility_test.go index 2f1aeb69b7..e237b9d3a6 100644 --- a/cf/api/service_plan_visibility_test.go +++ b/cf/api/service_plan_visibility_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_summary.go b/cf/api/service_summary.go index 9ab0767e45..ea13863efe 100644 --- a/cf/api/service_summary.go +++ b/cf/api/service_summary.go @@ -3,9 +3,9 @@ package api import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) type ServiceInstancesSummaries struct { diff --git a/cf/api/service_summary_test.go b/cf/api/service_summary_test.go index 44b9b9cc10..0640853110 100644 --- a/cf/api/service_summary_test.go +++ b/cf/api/service_summary_test.go @@ -5,15 +5,15 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/services.go b/cf/api/services.go index bf3b755cf8..65697faaa8 100644 --- a/cf/api/services.go +++ b/cf/api/services.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceRepository diff --git a/cf/api/services_test.go b/cf/api/services_test.go index 15bafd9ccb..f46ba743d7 100644 --- a/cf/api/services_test.go +++ b/cf/api/services_test.go @@ -7,19 +7,19 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/spacequotas/space_quotas.go b/cf/api/spacequotas/space_quotas.go index ae1deea717..d7952d3ffe 100644 --- a/cf/api/spacequotas/space_quotas.go +++ b/cf/api/spacequotas/space_quotas.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceQuotaRepository diff --git a/cf/api/spacequotas/space_quotas_suite_test.go b/cf/api/spacequotas/space_quotas_suite_test.go index 2bc9535515..0fe2163efa 100644 --- a/cf/api/spacequotas/space_quotas_suite_test.go +++ b/cf/api/spacequotas/space_quotas_suite_test.go @@ -1,8 +1,8 @@ package spacequotas_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/spacequotas/space_quotas_test.go b/cf/api/spacequotas/space_quotas_test.go index f64ab51ee0..bdbd613b66 100644 --- a/cf/api/spacequotas/space_quotas_test.go +++ b/cf/api/spacequotas/space_quotas_test.go @@ -5,17 +5,17 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go b/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go index 8a7a17ae8c..c5ba295341 100644 --- a/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go +++ b/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go @@ -4,8 +4,8 @@ package spacequotasfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSpaceQuotaRepository struct { @@ -130,15 +130,16 @@ func (fake *FakeSpaceQuotaRepository) AssociateSpaceWithQuota(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.AssociateSpaceWithQuotaStub + fakeReturns := fake.associateSpaceWithQuotaReturns fake.recordInvocation("AssociateSpaceWithQuota", []interface{}{arg1, arg2}) fake.associateSpaceWithQuotaMutex.Unlock() - if fake.AssociateSpaceWithQuotaStub != nil { - return fake.AssociateSpaceWithQuotaStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.associateSpaceWithQuotaReturns return fakeReturns.result1 } @@ -190,15 +191,16 @@ func (fake *FakeSpaceQuotaRepository) Create(arg1 models.SpaceQuota) error { fake.createArgsForCall = append(fake.createArgsForCall, struct { arg1 models.SpaceQuota }{arg1}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.createReturns return fakeReturns.result1 } @@ -250,15 +252,16 @@ func (fake *FakeSpaceQuotaRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -310,15 +313,16 @@ func (fake *FakeSpaceQuotaRepository) FindByGUID(arg1 string) (models.SpaceQuota fake.findByGUIDArgsForCall = append(fake.findByGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByGUIDStub + fakeReturns := fake.findByGUIDReturns fake.recordInvocation("FindByGUID", []interface{}{arg1}) fake.findByGUIDMutex.Unlock() - if fake.FindByGUIDStub != nil { - return fake.FindByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -373,15 +377,16 @@ func (fake *FakeSpaceQuotaRepository) FindByName(arg1 string) (models.SpaceQuota fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -437,15 +442,16 @@ func (fake *FakeSpaceQuotaRepository) FindByNameAndOrgGUID(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByNameAndOrgGUIDStub + fakeReturns := fake.findByNameAndOrgGUIDReturns fake.recordInvocation("FindByNameAndOrgGUID", []interface{}{arg1, arg2}) fake.findByNameAndOrgGUIDMutex.Unlock() - if fake.FindByNameAndOrgGUIDStub != nil { - return fake.FindByNameAndOrgGUIDStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameAndOrgGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -500,15 +506,16 @@ func (fake *FakeSpaceQuotaRepository) FindByOrg(arg1 string) ([]models.SpaceQuot fake.findByOrgArgsForCall = append(fake.findByOrgArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByOrgStub + fakeReturns := fake.findByOrgReturns fake.recordInvocation("FindByOrg", []interface{}{arg1}) fake.findByOrgMutex.Unlock() - if fake.FindByOrgStub != nil { - return fake.FindByOrgStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -564,15 +571,16 @@ func (fake *FakeSpaceQuotaRepository) UnassignQuotaFromSpace(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnassignQuotaFromSpaceStub + fakeReturns := fake.unassignQuotaFromSpaceReturns fake.recordInvocation("UnassignQuotaFromSpace", []interface{}{arg1, arg2}) fake.unassignQuotaFromSpaceMutex.Unlock() - if fake.UnassignQuotaFromSpaceStub != nil { - return fake.UnassignQuotaFromSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unassignQuotaFromSpaceReturns return fakeReturns.result1 } @@ -624,15 +632,16 @@ func (fake *FakeSpaceQuotaRepository) Update(arg1 models.SpaceQuota) error { fake.updateArgsForCall = append(fake.updateArgsForCall, struct { arg1 models.SpaceQuota }{arg1}) + stub := fake.UpdateStub + fakeReturns := fake.updateReturns fake.recordInvocation("Update", []interface{}{arg1}) fake.updateMutex.Unlock() - if fake.UpdateStub != nil { - return fake.UpdateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateReturns return fakeReturns.result1 } diff --git a/cf/api/spaces/spaces.go b/cf/api/spaces/spaces.go index 1c8b5fa96e..a624ad2af6 100644 --- a/cf/api/spaces/spaces.go +++ b/cf/api/spaces/spaces.go @@ -6,11 +6,11 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRepository diff --git a/cf/api/spaces/spaces_suite_test.go b/cf/api/spaces/spaces_suite_test.go index c4eef1158a..be807425db 100644 --- a/cf/api/spaces/spaces_suite_test.go +++ b/cf/api/spaces/spaces_suite_test.go @@ -1,8 +1,8 @@ package spaces_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/spaces/spaces_test.go b/cf/api/spaces/spaces_test.go index d235714707..357118d9f8 100644 --- a/cf/api/spaces/spaces_test.go +++ b/cf/api/spaces/spaces_test.go @@ -6,17 +6,17 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api/spaces" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api/spaces" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/spaces/spacesfakes/fake_space_repository.go b/cf/api/spaces/spacesfakes/fake_space_repository.go index a21308ed31..aaad96ad30 100644 --- a/cf/api/spaces/spacesfakes/fake_space_repository.go +++ b/cf/api/spaces/spacesfakes/fake_space_repository.go @@ -4,8 +4,8 @@ package spacesfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeSpaceRepository struct { @@ -121,15 +121,16 @@ func (fake *FakeSpaceRepository) Create(arg1 string, arg2 string, arg3 string) ( arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.CreateStub + fakeReturns := fake.createReturns fake.recordInvocation("Create", []interface{}{arg1, arg2, arg3}) fake.createMutex.Unlock() - if fake.CreateStub != nil { - return fake.CreateStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createReturns return fakeReturns.result1, fakeReturns.result2 } @@ -184,15 +185,16 @@ func (fake *FakeSpaceRepository) Delete(arg1 string) error { fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteStub + fakeReturns := fake.deleteReturns fake.recordInvocation("Delete", []interface{}{arg1}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { - return fake.DeleteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.deleteReturns return fakeReturns.result1 } @@ -244,15 +246,16 @@ func (fake *FakeSpaceRepository) FindByName(arg1 string) (models.Space, error) { fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -308,15 +311,16 @@ func (fake *FakeSpaceRepository) FindByNameInOrg(arg1 string, arg2 string) (mode arg1 string arg2 string }{arg1, arg2}) + stub := fake.FindByNameInOrgStub + fakeReturns := fake.findByNameInOrgReturns fake.recordInvocation("FindByNameInOrg", []interface{}{arg1, arg2}) fake.findByNameInOrgMutex.Unlock() - if fake.FindByNameInOrgStub != nil { - return fake.FindByNameInOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameInOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -371,15 +375,16 @@ func (fake *FakeSpaceRepository) ListSpaces(arg1 func(models.Space) bool) error fake.listSpacesArgsForCall = append(fake.listSpacesArgsForCall, struct { arg1 func(models.Space) bool }{arg1}) + stub := fake.ListSpacesStub + fakeReturns := fake.listSpacesReturns fake.recordInvocation("ListSpaces", []interface{}{arg1}) fake.listSpacesMutex.Unlock() - if fake.ListSpacesStub != nil { - return fake.ListSpacesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.listSpacesReturns return fakeReturns.result1 } @@ -432,15 +437,16 @@ func (fake *FakeSpaceRepository) ListSpacesFromOrg(arg1 string, arg2 func(models arg1 string arg2 func(models.Space) bool }{arg1, arg2}) + stub := fake.ListSpacesFromOrgStub + fakeReturns := fake.listSpacesFromOrgReturns fake.recordInvocation("ListSpacesFromOrg", []interface{}{arg1, arg2}) fake.listSpacesFromOrgMutex.Unlock() - if fake.ListSpacesFromOrgStub != nil { - return fake.ListSpacesFromOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.listSpacesFromOrgReturns return fakeReturns.result1 } @@ -493,15 +499,16 @@ func (fake *FakeSpaceRepository) Rename(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.RenameStub + fakeReturns := fake.renameReturns fake.recordInvocation("Rename", []interface{}{arg1, arg2}) fake.renameMutex.Unlock() - if fake.RenameStub != nil { - return fake.RenameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.renameReturns return fakeReturns.result1 } @@ -554,15 +561,16 @@ func (fake *FakeSpaceRepository) SetAllowSSH(arg1 string, arg2 bool) error { arg1 string arg2 bool }{arg1, arg2}) + stub := fake.SetAllowSSHStub + fakeReturns := fake.setAllowSSHReturns fake.recordInvocation("SetAllowSSH", []interface{}{arg1, arg2}) fake.setAllowSSHMutex.Unlock() - if fake.SetAllowSSHStub != nil { - return fake.SetAllowSSHStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setAllowSSHReturns return fakeReturns.result1 } diff --git a/cf/api/stacks/stacks.go b/cf/api/stacks/stacks.go index ae6d584312..eefbbc04a9 100644 --- a/cf/api/stacks/stacks.go +++ b/cf/api/stacks/stacks.go @@ -4,13 +4,13 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . StackRepository diff --git a/cf/api/stacks/stacks_suite_test.go b/cf/api/stacks/stacks_suite_test.go index 6e7423b53e..a57dc5255b 100644 --- a/cf/api/stacks/stacks_suite_test.go +++ b/cf/api/stacks/stacks_suite_test.go @@ -1,8 +1,8 @@ package stacks_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/api/stacks/stacks_test.go b/cf/api/stacks/stacks_test.go index ff08611890..02599c2352 100644 --- a/cf/api/stacks/stacks_test.go +++ b/cf/api/stacks/stacks_test.go @@ -4,18 +4,18 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - . "code.cloudfoundry.org/cli/v8/cf/api/stacks" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/stacks/stacksfakes/fake_stack_repository.go b/cf/api/stacks/stacksfakes/fake_stack_repository.go index fad6f0c389..a790f0891a 100644 --- a/cf/api/stacks/stacksfakes/fake_stack_repository.go +++ b/cf/api/stacks/stacksfakes/fake_stack_repository.go @@ -4,8 +4,8 @@ package stacksfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/api/stacks" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeStackRepository struct { @@ -56,15 +56,16 @@ func (fake *FakeStackRepository) FindAll() ([]models.Stack, error) { ret, specificReturn := fake.findAllReturnsOnCall[len(fake.findAllArgsForCall)] fake.findAllArgsForCall = append(fake.findAllArgsForCall, struct { }{}) + stub := fake.FindAllStub + fakeReturns := fake.findAllReturns fake.recordInvocation("FindAll", []interface{}{}) fake.findAllMutex.Unlock() - if fake.FindAllStub != nil { - return fake.FindAllStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findAllReturns return fakeReturns.result1, fakeReturns.result2 } @@ -112,15 +113,16 @@ func (fake *FakeStackRepository) FindByGUID(arg1 string) (models.Stack, error) { fake.findByGUIDArgsForCall = append(fake.findByGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByGUIDStub + fakeReturns := fake.findByGUIDReturns fake.recordInvocation("FindByGUID", []interface{}{arg1}) fake.findByGUIDMutex.Unlock() - if fake.FindByGUIDStub != nil { - return fake.FindByGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -175,15 +177,16 @@ func (fake *FakeStackRepository) FindByName(arg1 string) (models.Stack, error) { fake.findByNameArgsForCall = append(fake.findByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FindByNameStub + fakeReturns := fake.findByNameReturns fake.recordInvocation("FindByName", []interface{}{arg1}) fake.findByNameMutex.Unlock() - if fake.FindByNameStub != nil { - return fake.FindByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.findByNameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/api/user_provided_service_instances.go b/cf/api/user_provided_service_instances.go index 3431ddca8b..b6c1d1c0da 100644 --- a/cf/api/user_provided_service_instances.go +++ b/cf/api/user_provided_service_instances.go @@ -5,9 +5,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserProvidedServiceInstanceRepository diff --git a/cf/api/user_provided_service_instances_test.go b/cf/api/user_provided_service_instances_test.go index 9366a86aae..da785d7906 100644 --- a/cf/api/user_provided_service_instances_test.go +++ b/cf/api/user_provided_service_instances_test.go @@ -5,16 +5,16 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - - . "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/users.go b/cf/api/users.go index 42df9af738..61ec08d829 100644 --- a/cf/api/users.go +++ b/cf/api/users.go @@ -9,12 +9,12 @@ import ( neturl "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" ) var orgRoleToPathMap = map[models.Role]string{ diff --git a/cf/api/users_test.go b/cf/api/users_test.go index e46ae03378..d8a480efce 100644 --- a/cf/api/users_test.go +++ b/cf/api/users_test.go @@ -4,15 +4,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/appfiles/app_files.go b/cf/appfiles/app_files.go index 482bf59698..bcd5a7d4d1 100644 --- a/cf/appfiles/app_files.go +++ b/cf/appfiles/app_files.go @@ -9,7 +9,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" securejoin "github.com/cyphar/filepath-securejoin" ) diff --git a/cf/appfiles/app_files_suite_test.go b/cf/appfiles/app_files_suite_test.go index a0fd339570..364aa66830 100644 --- a/cf/appfiles/app_files_suite_test.go +++ b/cf/appfiles/app_files_suite_test.go @@ -3,8 +3,8 @@ package appfiles_test import ( "testing" - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "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 a90e18f646..4975d5be22 100644 --- a/cf/appfiles/app_files_test.go +++ b/cf/appfiles/app_files_test.go @@ -7,10 +7,10 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/appfiles" uuid "github.com/nu7hatch/gouuid" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/appfiles/appfilesfakes/fake_app_files.go b/cf/appfiles/appfilesfakes/fake_app_files.go index 0ab3d52481..12116baf03 100644 --- a/cf/appfiles/appfilesfakes/fake_app_files.go +++ b/cf/appfiles/appfilesfakes/fake_app_files.go @@ -4,8 +4,8 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/appfiles" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeAppFiles struct { @@ -68,15 +68,16 @@ func (fake *FakeAppFiles) AppFilesInDir(arg1 string) ([]models.AppFileFields, er fake.appFilesInDirArgsForCall = append(fake.appFilesInDirArgsForCall, struct { arg1 string }{arg1}) + stub := fake.AppFilesInDirStub + fakeReturns := fake.appFilesInDirReturns fake.recordInvocation("AppFilesInDir", []interface{}{arg1}) fake.appFilesInDirMutex.Unlock() - if fake.AppFilesInDirStub != nil { - return fake.AppFilesInDirStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.appFilesInDirReturns return fakeReturns.result1, fakeReturns.result2 } @@ -138,15 +139,16 @@ func (fake *FakeAppFiles) CopyFiles(arg1 []models.AppFileFields, arg2 string, ar arg2 string arg3 string }{arg1Copy, arg2, arg3}) + stub := fake.CopyFilesStub + fakeReturns := fake.copyFilesReturns fake.recordInvocation("CopyFiles", []interface{}{arg1Copy, arg2, arg3}) fake.copyFilesMutex.Unlock() - if fake.CopyFilesStub != nil { - return fake.CopyFilesStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.copyFilesReturns return fakeReturns.result1 } @@ -198,15 +200,16 @@ func (fake *FakeAppFiles) CountFiles(arg1 string) int64 { fake.countFilesArgsForCall = append(fake.countFilesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CountFilesStub + fakeReturns := fake.countFilesReturns fake.recordInvocation("CountFiles", []interface{}{arg1}) fake.countFilesMutex.Unlock() - if fake.CountFilesStub != nil { - return fake.CountFilesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.countFilesReturns return fakeReturns.result1 } @@ -259,15 +262,16 @@ func (fake *FakeAppFiles) WalkAppFiles(arg1 string, arg2 func(string, string) er arg1 string arg2 func(string, string) error }{arg1, arg2}) + stub := fake.WalkAppFilesStub + fakeReturns := fake.walkAppFilesReturns fake.recordInvocation("WalkAppFiles", []interface{}{arg1, arg2}) fake.walkAppFilesMutex.Unlock() - if fake.WalkAppFilesStub != nil { - return fake.WalkAppFilesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.walkAppFilesReturns return fakeReturns.result1 } diff --git a/cf/appfiles/appfilesfakes/fake_cf_ignore.go b/cf/appfiles/appfilesfakes/fake_cf_ignore.go index 3180cafc7f..1402b8ab5c 100644 --- a/cf/appfiles/appfilesfakes/fake_cf_ignore.go +++ b/cf/appfiles/appfilesfakes/fake_cf_ignore.go @@ -4,7 +4,7 @@ package appfilesfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/appfiles" ) type FakeCfIgnore struct { @@ -29,15 +29,16 @@ func (fake *FakeCfIgnore) FileShouldBeIgnored(arg1 string) bool { fake.fileShouldBeIgnoredArgsForCall = append(fake.fileShouldBeIgnoredArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FileShouldBeIgnoredStub + fakeReturns := fake.fileShouldBeIgnoredReturns fake.recordInvocation("FileShouldBeIgnored", []interface{}{arg1}) fake.fileShouldBeIgnoredMutex.Unlock() - if fake.FileShouldBeIgnoredStub != nil { - return fake.FileShouldBeIgnoredStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.fileShouldBeIgnoredReturns return fakeReturns.result1 } diff --git a/cf/appfiles/appfilesfakes/fake_zipper.go b/cf/appfiles/appfilesfakes/fake_zipper.go index f5c22484d8..3207fa9c02 100644 --- a/cf/appfiles/appfilesfakes/fake_zipper.go +++ b/cf/appfiles/appfilesfakes/fake_zipper.go @@ -5,7 +5,7 @@ import ( "os" "sync" - "code.cloudfoundry.org/cli/v8/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/appfiles" ) type FakeZipper struct { @@ -67,15 +67,16 @@ func (fake *FakeZipper) GetZipSize(arg1 *os.File) (int64, error) { fake.getZipSizeArgsForCall = append(fake.getZipSizeArgsForCall, struct { arg1 *os.File }{arg1}) + stub := fake.GetZipSizeStub + fakeReturns := fake.getZipSizeReturns fake.recordInvocation("GetZipSize", []interface{}{arg1}) fake.getZipSizeMutex.Unlock() - if fake.GetZipSizeStub != nil { - return fake.GetZipSizeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getZipSizeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -130,15 +131,16 @@ func (fake *FakeZipper) IsZipFile(arg1 string) bool { fake.isZipFileArgsForCall = append(fake.isZipFileArgsForCall, struct { arg1 string }{arg1}) + stub := fake.IsZipFileStub + fakeReturns := fake.isZipFileReturns fake.recordInvocation("IsZipFile", []interface{}{arg1}) fake.isZipFileMutex.Unlock() - if fake.IsZipFileStub != nil { - return fake.IsZipFileStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isZipFileReturns return fakeReturns.result1 } @@ -191,15 +193,16 @@ func (fake *FakeZipper) Unzip(arg1 string, arg2 string) error { arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnzipStub + fakeReturns := fake.unzipReturns fake.recordInvocation("Unzip", []interface{}{arg1, arg2}) fake.unzipMutex.Unlock() - if fake.UnzipStub != nil { - return fake.UnzipStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unzipReturns return fakeReturns.result1 } @@ -252,15 +255,16 @@ func (fake *FakeZipper) Zip(arg1 string, arg2 *os.File) error { arg1 string arg2 *os.File }{arg1, arg2}) + stub := fake.ZipStub + fakeReturns := fake.zipReturns fake.recordInvocation("Zip", []interface{}{arg1, arg2}) fake.zipMutex.Unlock() - if fake.ZipStub != nil { - return fake.ZipStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.zipReturns return fakeReturns.result1 } diff --git a/cf/appfiles/cf_ignore.go b/cf/appfiles/cf_ignore.go index abf37e8537..c4922dca9d 100644 --- a/cf/appfiles/cf_ignore.go +++ b/cf/appfiles/cf_ignore.go @@ -4,7 +4,7 @@ import ( "path" "strings" - "code.cloudfoundry.org/cli/v8/cf/util/glob" + "code.cloudfoundry.org/cli/v9/cf/util/glob" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CfIgnore diff --git a/cf/appfiles/cf_ignore_test.go b/cf/appfiles/cf_ignore_test.go index 3f597df10f..75838bdcac 100644 --- a/cf/appfiles/cf_ignore_test.go +++ b/cf/appfiles/cf_ignore_test.go @@ -1,7 +1,7 @@ package appfiles_test import ( - . "code.cloudfoundry.org/cli/v8/cf/appfiles" + . "code.cloudfoundry.org/cli/v9/cf/appfiles" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/appfiles/zipper.go b/cf/appfiles/zipper.go index d422e15f0b..a01e86ca77 100644 --- a/cf/appfiles/zipper.go +++ b/cf/appfiles/zipper.go @@ -9,7 +9,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/errors" "code.cloudfoundry.org/gofileutils/fileutils" securejoin "github.com/cyphar/filepath-securejoin" ) diff --git a/cf/appfiles/zipper_test.go b/cf/appfiles/zipper_test.go index bb1eed3be0..4e469e1683 100644 --- a/cf/appfiles/zipper_test.go +++ b/cf/appfiles/zipper_test.go @@ -12,7 +12,7 @@ import ( "runtime" "strings" - . "code.cloudfoundry.org/cli/v8/cf/appfiles" + . "code.cloudfoundry.org/cli/v9/cf/appfiles" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/cmd/cmd.go b/cf/cmd/cmd.go index 91d7d414e3..671a4afa33 100644 --- a/cf/cmd/cmd.go +++ b/cf/cmd/cmd.go @@ -8,21 +8,21 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commandsloader" - "code.cloudfoundry.org/cli/v8/cf/configuration" - "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" - "code.cloudfoundry.org/cli/v8/cf/util/spellcheck" - "code.cloudfoundry.org/cli/v8/plugin/rpc" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandsloader" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/util/spellcheck" + "code.cloudfoundry.org/cli/v9/plugin/rpc" netrpc "net/rpc" ) diff --git a/cf/commandregistry/command.go b/cf/commandregistry/command.go index e73ed6999f..c9e0d37c82 100644 --- a/cf/commandregistry/command.go +++ b/cf/commandregistry/command.go @@ -1,8 +1,8 @@ package commandregistry import ( - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Command diff --git a/cf/commandregistry/commandregistryfakes/fake_command.go b/cf/commandregistry/commandregistryfakes/fake_command.go index a58ee01636..37e55bbc7d 100644 --- a/cf/commandregistry/commandregistryfakes/fake_command.go +++ b/cf/commandregistry/commandregistryfakes/fake_command.go @@ -4,9 +4,9 @@ package commandregistryfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand struct { @@ -67,15 +67,16 @@ func (fake *FakeCommand) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -126,15 +127,16 @@ func (fake *FakeCommand) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -180,15 +182,16 @@ func (fake *FakeCommand) Requirements(arg1 requirements.Factory, arg2 flags.Flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -244,15 +247,16 @@ func (fake *FakeCommand) SetDependency(arg1 commandregistry.Dependency, arg2 boo arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } diff --git a/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go b/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go index 57aa9b275b..7a33ebbc7c 100644 --- a/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go +++ b/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go @@ -4,7 +4,7 @@ package commandregistryfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" ) type FakeRandomWordGenerator struct { @@ -27,15 +27,16 @@ func (fake *FakeRandomWordGenerator) Babble() string { ret, specificReturn := fake.babbleReturnsOnCall[len(fake.babbleArgsForCall)] fake.babbleArgsForCall = append(fake.babbleArgsForCall, struct { }{}) + stub := fake.BabbleStub + fakeReturns := fake.babbleReturns fake.recordInvocation("Babble", []interface{}{}) fake.babbleMutex.Unlock() - if fake.BabbleStub != nil { - return fake.BabbleStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.babbleReturns return fakeReturns.result1 } diff --git a/cf/commandregistry/dependency.go b/cf/commandregistry/dependency.go index 6633632313..8126a5172e 100644 --- a/cf/commandregistry/dependency.go +++ b/cf/commandregistry/dependency.go @@ -8,24 +8,24 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/actors/brokerbuilder" - "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/appfiles" - "code.cloudfoundry.org/cli/v8/cf/configuration" - "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/manifest" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" - "code.cloudfoundry.org/cli/v8/plugin/models" - "code.cloudfoundry.org/cli/v8/util" - "code.cloudfoundry.org/cli/v8/util/randomword" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/plugin/models" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/util/randomword" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RandomWordGenerator diff --git a/cf/commandregistry/dependency_test.go b/cf/commandregistry/dependency_test.go index 868b2f627b..5f2d94c869 100644 --- a/cf/commandregistry/dependency_test.go +++ b/cf/commandregistry/dependency_test.go @@ -1,8 +1,8 @@ package commandregistry_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" "os" diff --git a/cf/commandregistry/fakecommand/fake_command1.go b/cf/commandregistry/fakecommand/fake_command1.go index ecdf3feec6..e94046b615 100644 --- a/cf/commandregistry/fakecommand/fake_command1.go +++ b/cf/commandregistry/fakecommand/fake_command1.go @@ -3,9 +3,9 @@ package fakecommand import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand1 struct { diff --git a/cf/commandregistry/fakecommand/fake_command2.go b/cf/commandregistry/fakecommand/fake_command2.go index ecc2d35a7a..b89d1a2813 100644 --- a/cf/commandregistry/fakecommand/fake_command2.go +++ b/cf/commandregistry/fakecommand/fake_command2.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand2 struct { diff --git a/cf/commandregistry/fakecommand/fake_command_max_length_name.go b/cf/commandregistry/fakecommand/fake_command_max_length_name.go index 2f56a52afd..82a2fb2c8d 100644 --- a/cf/commandregistry/fakecommand/fake_command_max_length_name.go +++ b/cf/commandregistry/fakecommand/fake_command_max_length_name.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand3 struct { diff --git a/cf/commandregistry/registry.go b/cf/commandregistry/registry.go index c95900dfe1..c58e2ca56d 100644 --- a/cf/commandregistry/registry.go +++ b/cf/commandregistry/registry.go @@ -6,13 +6,13 @@ import ( "strings" "unicode/utf8" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" - . "code.cloudfoundry.org/cli/v8/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/terminal" ) var _ = initI18nFunc() diff --git a/cf/commandregistry/registry_test.go b/cf/commandregistry/registry_test.go index a55cb36d90..20032fc5be 100644 --- a/cf/commandregistry/registry_test.go +++ b/cf/commandregistry/registry_test.go @@ -3,13 +3,13 @@ package commandregistry_test import ( "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/commandregistry/fakecommand" + . "code.cloudfoundry.org/cli/v9/cf/commandregistry/fakecommand" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/api.go b/cf/commands/api.go index bec8a4dc57..edb9a7ae92 100644 --- a/cf/commands/api.go +++ b/cf/commands/api.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type API struct { diff --git a/cf/commands/api_test.go b/cf/commands/api_test.go index 46ad3e1e2a..1cfe115c49 100644 --- a/cf/commands/api_test.go +++ b/cf/commands/api_test.go @@ -3,20 +3,20 @@ package commands_test import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("Api", func() { diff --git a/cf/commands/application/app.go b/cf/commands/application/app.go index 7b3606f477..79b1b371f4 100644 --- a/cf/commands/application/app.go +++ b/cf/commands/application/app.go @@ -4,21 +4,21 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/plugin/models" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances" - "code.cloudfoundry.org/cli/v8/cf/api/stacks" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Displayer diff --git a/cf/commands/application/app_test.go b/cf/commands/application/app_test.go index 323c9fa357..6897b2a514 100644 --- a/cf/commands/application/app_test.go +++ b/cf/commands/application/app_test.go @@ -4,26 +4,26 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/plugin/models" - - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances/appinstancesfakes" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/plugin/models" + + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances/appinstancesfakes" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 b6cb10befe..00356164f0 100644 --- a/cf/commands/application/application_suite_test.go +++ b/cf/commands/application/application_suite_test.go @@ -1,8 +1,8 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/application/applicationfakes/fake_app_displayer.go b/cf/commands/application/applicationfakes/fake_app_displayer.go index 0bd52af24a..b5aaea7783 100644 --- a/cf/commands/application/applicationfakes/fake_app_displayer.go +++ b/cf/commands/application/applicationfakes/fake_app_displayer.go @@ -1,10 +1,10 @@ package applicationfakes import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeAppDisplayer struct { diff --git a/cf/commands/application/applicationfakes/fake_displayer.go b/cf/commands/application/applicationfakes/fake_displayer.go index f696fd2960..35e4f4dfd3 100644 --- a/cf/commands/application/applicationfakes/fake_displayer.go +++ b/cf/commands/application/applicationfakes/fake_displayer.go @@ -4,8 +4,8 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeDisplayer struct { @@ -34,15 +34,16 @@ func (fake *FakeDisplayer) ShowApp(arg1 models.Application, arg2 string, arg3 st arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ShowAppStub + fakeReturns := fake.showAppReturns fake.recordInvocation("ShowApp", []interface{}{arg1, arg2, arg3}) fake.showAppMutex.Unlock() - if fake.ShowAppStub != nil { - return fake.ShowAppStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.showAppReturns return fakeReturns.result1 } diff --git a/cf/commands/application/applicationfakes/fake_restarter.go b/cf/commands/application/applicationfakes/fake_restarter.go index 84db7da336..6d5a2e1c2d 100644 --- a/cf/commands/application/applicationfakes/fake_restarter.go +++ b/cf/commands/application/applicationfakes/fake_restarter.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeRestarter struct { @@ -84,15 +84,16 @@ func (fake *FakeRestarter) ApplicationRestart(arg1 models.Application, arg2 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ApplicationRestartStub + fakeReturns := fake.applicationRestartReturns fake.recordInvocation("ApplicationRestart", []interface{}{arg1, arg2, arg3}) fake.applicationRestartMutex.Unlock() - if fake.ApplicationRestartStub != nil { - return fake.ApplicationRestartStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.applicationRestartReturns return fakeReturns.result1 } @@ -144,15 +145,16 @@ func (fake *FakeRestarter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -203,15 +205,16 @@ func (fake *FakeRestarter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -257,15 +260,16 @@ func (fake *FakeRestarter) Requirements(arg1 requirements.Factory, arg2 flags.Fl arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -321,15 +325,16 @@ func (fake *FakeRestarter) SetDependency(arg1 commandregistry.Dependency, arg2 b arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } diff --git a/cf/commands/application/applicationfakes/fake_staging_watcher.go b/cf/commands/application/applicationfakes/fake_staging_watcher.go index ec28e0e45f..18fd2f8890 100644 --- a/cf/commands/application/applicationfakes/fake_staging_watcher.go +++ b/cf/commands/application/applicationfakes/fake_staging_watcher.go @@ -4,8 +4,8 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeStagingWatcher struct { @@ -38,15 +38,16 @@ func (fake *FakeStagingWatcher) WatchStaging(arg1 models.Application, arg2 strin arg3 string arg4 func(app models.Application) (models.Application, error) }{arg1, arg2, arg3, arg4}) + stub := fake.WatchStagingStub + fakeReturns := fake.watchStagingReturns fake.recordInvocation("WatchStaging", []interface{}{arg1, arg2, arg3, arg4}) fake.watchStagingMutex.Unlock() - if fake.WatchStagingStub != nil { - return fake.WatchStagingStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.watchStagingReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/commands/application/applicationfakes/fake_starter.go b/cf/commands/application/applicationfakes/fake_starter.go index 4a4b6cdbe8..e99908db8f 100644 --- a/cf/commands/application/applicationfakes/fake_starter.go +++ b/cf/commands/application/applicationfakes/fake_starter.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeStarter struct { @@ -91,15 +91,16 @@ func (fake *FakeStarter) ApplicationStart(arg1 models.Application, arg2 string, arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ApplicationStartStub + fakeReturns := fake.applicationStartReturns fake.recordInvocation("ApplicationStart", []interface{}{arg1, arg2, arg3}) fake.applicationStartMutex.Unlock() - if fake.ApplicationStartStub != nil { - return fake.ApplicationStartStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.applicationStartReturns return fakeReturns.result1, fakeReturns.result2 } @@ -154,15 +155,16 @@ func (fake *FakeStarter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -213,15 +215,16 @@ func (fake *FakeStarter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -267,15 +270,16 @@ func (fake *FakeStarter) Requirements(arg1 requirements.Factory, arg2 flags.Flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -331,15 +335,16 @@ func (fake *FakeStarter) SetDependency(arg1 commandregistry.Dependency, arg2 boo arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } @@ -390,9 +395,10 @@ func (fake *FakeStarter) SetStartTimeoutInSeconds(arg1 int) { fake.setStartTimeoutInSecondsArgsForCall = append(fake.setStartTimeoutInSecondsArgsForCall, struct { arg1 int }{arg1}) + stub := fake.SetStartTimeoutInSecondsStub fake.recordInvocation("SetStartTimeoutInSeconds", []interface{}{arg1}) fake.setStartTimeoutInSecondsMutex.Unlock() - if fake.SetStartTimeoutInSecondsStub != nil { + if stub != nil { fake.SetStartTimeoutInSecondsStub(arg1) } } diff --git a/cf/commands/application/applicationfakes/fake_stopper.go b/cf/commands/application/applicationfakes/fake_stopper.go index 7675328321..003ec6265b 100644 --- a/cf/commands/application/applicationfakes/fake_stopper.go +++ b/cf/commands/application/applicationfakes/fake_stopper.go @@ -4,11 +4,11 @@ package applicationfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeStopper struct { @@ -86,15 +86,16 @@ func (fake *FakeStopper) ApplicationStop(arg1 models.Application, arg2 string, a arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ApplicationStopStub + fakeReturns := fake.applicationStopReturns fake.recordInvocation("ApplicationStop", []interface{}{arg1, arg2, arg3}) fake.applicationStopMutex.Unlock() - if fake.ApplicationStopStub != nil { - return fake.ApplicationStopStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.applicationStopReturns return fakeReturns.result1, fakeReturns.result2 } @@ -149,15 +150,16 @@ func (fake *FakeStopper) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -208,15 +210,16 @@ func (fake *FakeStopper) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -262,15 +265,16 @@ func (fake *FakeStopper) Requirements(arg1 requirements.Factory, arg2 flags.Flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -326,15 +330,16 @@ func (fake *FakeStopper) SetDependency(arg1 commandregistry.Dependency, arg2 boo arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } diff --git a/cf/commands/application/apps.go b/cf/commands/application/apps.go index 9b2e828e17..a627ffdc1f 100644 --- a/cf/commands/application/apps.go +++ b/cf/commands/application/apps.go @@ -3,18 +3,18 @@ package application import ( "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" ) type ListApps struct { diff --git a/cf/commands/application/apps_test.go b/cf/commands/application/apps_test.go index 81d0cfa91b..5e58761c52 100644 --- a/cf/commands/application/apps_test.go +++ b/cf/commands/application/apps_test.go @@ -1,25 +1,25 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("list-apps command", func() { diff --git a/cf/commands/application/copy_source.go b/cf/commands/application/copy_source.go index 82801ad7fc..98e1e7381a 100644 --- a/cf/commands/application/copy_source.go +++ b/cf/commands/application/copy_source.go @@ -5,18 +5,18 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CopySource struct { diff --git a/cf/commands/application/copy_source_test.go b/cf/commands/application/copy_source_test.go index 9556a66ead..626f71a19e 100644 --- a/cf/commands/application/copy_source_test.go +++ b/cf/commands/application/copy_source_test.go @@ -1,24 +1,24 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/api/copyapplicationsource/copyapplicationsourcefakes" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/api/copyapplicationsource/copyapplicationsourcefakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/delete.go b/cf/commands/application/delete.go index 620e017032..22502e9854 100644 --- a/cf/commands/application/delete.go +++ b/cf/commands/application/delete.go @@ -1,15 +1,15 @@ package application import ( - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteApp struct { diff --git a/cf/commands/application/delete_test.go b/cf/commands/application/delete_test.go index 0e74875d22..83a0d9290c 100644 --- a/cf/commands/application/delete_test.go +++ b/cf/commands/application/delete_test.go @@ -1,21 +1,21 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete app command", func() { diff --git a/cf/commands/application/disable_ssh.go b/cf/commands/application/disable_ssh.go index 1a7e0d6387..38520d7f4c 100644 --- a/cf/commands/application/disable_ssh.go +++ b/cf/commands/application/disable_ssh.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DisableSSH struct { diff --git a/cf/commands/application/disable_ssh_test.go b/cf/commands/application/disable_ssh_test.go index 880242c7f8..36af702ab2 100644 --- a/cf/commands/application/disable_ssh_test.go +++ b/cf/commands/application/disable_ssh_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/enable_ssh.go b/cf/commands/application/enable_ssh.go index 9deb7401b4..181f20d2a8 100644 --- a/cf/commands/application/enable_ssh.go +++ b/cf/commands/application/enable_ssh.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type EnableSSH struct { diff --git a/cf/commands/application/enable_ssh_test.go b/cf/commands/application/enable_ssh_test.go index b11da7c945..9a0beedddb 100644 --- a/cf/commands/application/enable_ssh_test.go +++ b/cf/commands/application/enable_ssh_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/env.go b/cf/commands/application/env.go index 82a3a16734..c04bfa9689 100644 --- a/cf/commands/application/env.go +++ b/cf/commands/application/env.go @@ -5,15 +5,15 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Env struct { diff --git a/cf/commands/application/env_test.go b/cf/commands/application/env_test.go index 3f7561e4d1..2a9c6e92eb 100644 --- a/cf/commands/application/env_test.go +++ b/cf/commands/application/env_test.go @@ -1,18 +1,18 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/events.go b/cf/commands/application/events.go index d144a9e538..19f30b49f8 100644 --- a/cf/commands/application/events.go +++ b/cf/commands/application/events.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/appevents" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/appevents" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Events struct { diff --git a/cf/commands/application/events_test.go b/cf/commands/application/events_test.go index ba30cf6219..da335caad7 100644 --- a/cf/commands/application/events_test.go +++ b/cf/commands/application/events_test.go @@ -4,19 +4,19 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - - "code.cloudfoundry.org/cli/v8/cf/api/appevents/appeventsfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + + "code.cloudfoundry.org/cli/v9/cf/api/appevents/appeventsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/files.go b/cf/commands/application/files.go index bf29118af7..a779f77c14 100644 --- a/cf/commands/application/files.go +++ b/cf/commands/application/files.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/appfiles" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/appfiles" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Files struct { diff --git a/cf/commands/application/files_test.go b/cf/commands/application/files_test.go index 307a0316eb..973d2aeb33 100644 --- a/cf/commands/application/files_test.go +++ b/cf/commands/application/files_test.go @@ -3,19 +3,19 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/appfiles/appfilesfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/appfiles/appfilesfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/get_health_check.go b/cf/commands/application/get_health_check.go index 9b8a0d20e1..157ee39e1d 100644 --- a/cf/commands/application/get_health_check.go +++ b/cf/commands/application/get_health_check.go @@ -3,14 +3,14 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type GetHealthCheck struct { diff --git a/cf/commands/application/get_health_check_test.go b/cf/commands/application/get_health_check_test.go index 5550b25916..795b3897e6 100644 --- a/cf/commands/application/get_health_check_test.go +++ b/cf/commands/application/get_health_check_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/logs.go b/cf/commands/application/logs.go index e9de3a3395..1dc990a8ec 100644 --- a/cf/commands/application/logs.go +++ b/cf/commands/application/logs.go @@ -4,15 +4,15 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/v8/cf/api/logs" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Logs struct { diff --git a/cf/commands/application/logs_test.go b/cf/commands/application/logs_test.go index 20af94a799..db241013d4 100644 --- a/cf/commands/application/logs_test.go +++ b/cf/commands/application/logs_test.go @@ -1,19 +1,19 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/logs" - "code.cloudfoundry.org/cli/v8/cf/api/logs/logsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs/logsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/push.go b/cf/commands/application/push.go index 1e1726bef8..96b2fc2549 100644 --- a/cf/commands/application/push.go +++ b/cf/commands/application/push.go @@ -8,24 +8,24 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/api/stacks" - "code.cloudfoundry.org/cli/v8/cf/appfiles" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/manifest" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/appfiles" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Push struct { diff --git a/cf/commands/application/push_test.go b/cf/commands/application/push_test.go index ca6e01d0af..974d41c019 100644 --- a/cf/commands/application/push_test.go +++ b/cf/commands/application/push_test.go @@ -5,31 +5,31 @@ import ( "path/filepath" "syscall" - "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/v8/cf/appfiles/appfilesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commandregistry/commandregistryfakes" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/v8/cf/commands/service/servicefakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/manifest" - "code.cloudfoundry.org/cli/v8/cf/manifest/manifestfakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v9/cf/appfiles/appfilesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry/commandregistryfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/service/servicefakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/manifest/manifestfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/cf/commands/application/rename.go b/cf/commands/application/rename.go index afb49cc5a1..7337099054 100644 --- a/cf/commands/application/rename.go +++ b/cf/commands/application/rename.go @@ -3,14 +3,14 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameApp struct { diff --git a/cf/commands/application/rename_test.go b/cf/commands/application/rename_test.go index 03691b9ffb..c9df5d258a 100644 --- a/cf/commands/application/rename_test.go +++ b/cf/commands/application/rename_test.go @@ -1,17 +1,17 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/restage.go b/cf/commands/application/restage.go index c969e973af..01a4a63198 100644 --- a/cf/commands/application/restage.go +++ b/cf/commands/application/restage.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Restage struct { diff --git a/cf/commands/application/restage_test.go b/cf/commands/application/restage_test.go index bc20b3b9b0..d9bd76c343 100644 --- a/cf/commands/application/restage_test.go +++ b/cf/commands/application/restage_test.go @@ -1,18 +1,18 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/restart.go b/cf/commands/application/restart.go index cf9f8cf5d7..99db808f42 100644 --- a/cf/commands/application/restart.go +++ b/cf/commands/application/restart.go @@ -3,13 +3,13 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Restarter diff --git a/cf/commands/application/restart_app_instance.go b/cf/commands/application/restart_app_instance.go index db544a1eb8..b0e9464a25 100644 --- a/cf/commands/application/restart_app_instance.go +++ b/cf/commands/application/restart_app_instance.go @@ -5,13 +5,13 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RestartAppInstance struct { diff --git a/cf/commands/application/restart_app_instance_test.go b/cf/commands/application/restart_app_instance_test.go index ffe4d9dbba..d7cfcd6e21 100644 --- a/cf/commands/application/restart_app_instance_test.go +++ b/cf/commands/application/restart_app_instance_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances/appinstancesfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances/appinstancesfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 49f18fab89..9a4bb43966 100644 --- a/cf/commands/application/restart_test.go +++ b/cf/commands/application/restart_test.go @@ -3,18 +3,18 @@ package application_test import ( "os" - "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/scale.go b/cf/commands/application/scale.go index 05485e10d7..e333b9f55d 100644 --- a/cf/commands/application/scale.go +++ b/cf/commands/application/scale.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Scale struct { diff --git a/cf/commands/application/scale_test.go b/cf/commands/application/scale_test.go index 131b88be0f..2a41b990ad 100644 --- a/cf/commands/application/scale_test.go +++ b/cf/commands/application/scale_test.go @@ -1,20 +1,20 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("scale command", func() { diff --git a/cf/commands/application/set_env.go b/cf/commands/application/set_env.go index 104e61b8b9..05563fe0a3 100644 --- a/cf/commands/application/set_env.go +++ b/cf/commands/application/set_env.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetEnv struct { diff --git a/cf/commands/application/set_env_test.go b/cf/commands/application/set_env_test.go index 526f208709..d3b071301f 100644 --- a/cf/commands/application/set_env_test.go +++ b/cf/commands/application/set_env_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/set_health_check.go b/cf/commands/application/set_health_check.go index 50ecaf9039..61158d1aea 100644 --- a/cf/commands/application/set_health_check.go +++ b/cf/commands/application/set_health_check.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetHealthCheck struct { diff --git a/cf/commands/application/set_health_check_test.go b/cf/commands/application/set_health_check_test.go index 234a321ff5..d31ca22f74 100644 --- a/cf/commands/application/set_health_check_test.go +++ b/cf/commands/application/set_health_check_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/ssh.go b/cf/commands/application/ssh.go index 931a062521..6774fcdb03 100644 --- a/cf/commands/application/ssh.go +++ b/cf/commands/application/ssh.go @@ -8,17 +8,17 @@ import ( "golang.org/x/crypto/ssh" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/requirements" - sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" - "code.cloudfoundry.org/cli/v8/cf/ssh/options" - sshTerminal "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/requirements" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" + sshTerminal "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SSH struct { diff --git a/cf/commands/application/ssh_enabled.go b/cf/commands/application/ssh_enabled.go index d49e209af2..0c70c21aff 100644 --- a/cf/commands/application/ssh_enabled.go +++ b/cf/commands/application/ssh_enabled.go @@ -3,12 +3,12 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SSHEnabled struct { diff --git a/cf/commands/application/ssh_enabled_test.go b/cf/commands/application/ssh_enabled_test.go index d41c3e00e3..225ac0703a 100644 --- a/cf/commands/application/ssh_enabled_test.go +++ b/cf/commands/application/ssh_enabled_test.go @@ -1,16 +1,16 @@ package application_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 38993dff18..18bccaff48 100644 --- a/cf/commands/application/ssh_test.go +++ b/cf/commands/application/ssh_test.go @@ -6,22 +6,22 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/commandsfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/ssh/sshfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/commandsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/ssh/sshfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/start.go b/cf/commands/application/start.go index 3abeb405ab..4a5efaf353 100644 --- a/cf/commands/application/start.go +++ b/cf/commands/application/start.go @@ -10,17 +10,17 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/api/logs" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) const ( diff --git a/cf/commands/application/start_test.go b/cf/commands/application/start_test.go index 67f5feb874..8f3d492688 100644 --- a/cf/commands/application/start_test.go +++ b/cf/commands/application/start_test.go @@ -5,26 +5,26 @@ import ( "runtime" "time" - . "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/commands/application/applicationfakes" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - - "code.cloudfoundry.org/cli/v8/cf/api/appinstances/appinstancesfakes" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/logs" - "code.cloudfoundry.org/cli/v8/cf/api/logs/logsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + + "code.cloudfoundry.org/cli/v9/cf/api/appinstances/appinstancesfakes" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/logs" + "code.cloudfoundry.org/cli/v9/cf/api/logs/logsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" "sync" diff --git a/cf/commands/application/stop.go b/cf/commands/application/stop.go index fa260899f4..aa2fcf9b60 100644 --- a/cf/commands/application/stop.go +++ b/cf/commands/application/stop.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Stopper diff --git a/cf/commands/application/stop_test.go b/cf/commands/application/stop_test.go index 391e7711ff..d7bd49ae60 100644 --- a/cf/commands/application/stop_test.go +++ b/cf/commands/application/stop_test.go @@ -3,18 +3,18 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/unset_env.go b/cf/commands/application/unset_env.go index 92b261ff8a..1554b5f4f3 100644 --- a/cf/commands/application/unset_env.go +++ b/cf/commands/application/unset_env.go @@ -3,15 +3,15 @@ package application import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsetEnv struct { diff --git a/cf/commands/application/unset_env_test.go b/cf/commands/application/unset_env_test.go index 640801fe5f..38f433a4e3 100644 --- a/cf/commands/application/unset_env_test.go +++ b/cf/commands/application/unset_env_test.go @@ -3,17 +3,17 @@ package application_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/auth.go b/cf/commands/auth.go index 7e294a0f3e..90752f511b 100644 --- a/cf/commands/auth.go +++ b/cf/commands/auth.go @@ -3,14 +3,14 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Authenticate struct { diff --git a/cf/commands/auth_test.go b/cf/commands/auth_test.go index 26b14b1aaf..868a384848 100644 --- a/cf/commands/auth_test.go +++ b/cf/commands/auth_test.go @@ -3,22 +3,22 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("auth command", func() { diff --git a/cf/commands/buildpack/buildpack_suite_test.go b/cf/commands/buildpack/buildpack_suite_test.go index 8b93e4ee8e..b1a9368e4a 100644 --- a/cf/commands/buildpack/buildpack_suite_test.go +++ b/cf/commands/buildpack/buildpack_suite_test.go @@ -1,8 +1,8 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/buildpack/buildpacks.go b/cf/commands/buildpack/buildpacks.go index 33f657ecd6..b39505c1b8 100644 --- a/cf/commands/buildpack/buildpacks.go +++ b/cf/commands/buildpack/buildpacks.go @@ -4,14 +4,14 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListBuildpacks struct { diff --git a/cf/commands/buildpack/buildpacks_test.go b/cf/commands/buildpack/buildpacks_test.go index b4d9f1e926..fde1abeda5 100644 --- a/cf/commands/buildpack/buildpacks_test.go +++ b/cf/commands/buildpack/buildpacks_test.go @@ -1,17 +1,17 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commands/buildpack" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/buildpack" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/buildpack/create_buildpack.go b/cf/commands/buildpack/create_buildpack.go index 5aff5c7e46..f42ab132d5 100644 --- a/cf/commands/buildpack/create_buildpack.go +++ b/cf/commands/buildpack/create_buildpack.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateBuildpack struct { diff --git a/cf/commands/buildpack/create_buildpack_test.go b/cf/commands/buildpack/create_buildpack_test.go index 38ca11c1ab..a249cb3786 100644 --- a/cf/commands/buildpack/create_buildpack_test.go +++ b/cf/commands/buildpack/create_buildpack_test.go @@ -3,16 +3,16 @@ package buildpack_test import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/buildpack/delete_buildpack.go b/cf/commands/buildpack/delete_buildpack.go index 3d49ce1f1b..a417a477dd 100644 --- a/cf/commands/buildpack/delete_buildpack.go +++ b/cf/commands/buildpack/delete_buildpack.go @@ -3,14 +3,14 @@ package buildpack import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteBuildpack struct { diff --git a/cf/commands/buildpack/delete_buildpack_test.go b/cf/commands/buildpack/delete_buildpack_test.go index 8a80e69666..58d7192186 100644 --- a/cf/commands/buildpack/delete_buildpack_test.go +++ b/cf/commands/buildpack/delete_buildpack_test.go @@ -1,18 +1,18 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-buildpack command", func() { diff --git a/cf/commands/buildpack/rename_buildpack.go b/cf/commands/buildpack/rename_buildpack.go index cc3ca0fa11..5166e8270f 100644 --- a/cf/commands/buildpack/rename_buildpack.go +++ b/cf/commands/buildpack/rename_buildpack.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameBuildpack struct { diff --git a/cf/commands/buildpack/rename_buildpack_test.go b/cf/commands/buildpack/rename_buildpack_test.go index 17449c44c0..96559d61b8 100644 --- a/cf/commands/buildpack/rename_buildpack_test.go +++ b/cf/commands/buildpack/rename_buildpack_test.go @@ -1,18 +1,18 @@ package buildpack_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("rename-buildpack command", func() { diff --git a/cf/commands/buildpack/update_buildpack.go b/cf/commands/buildpack/update_buildpack.go index 121e2ba019..12083a32c1 100644 --- a/cf/commands/buildpack/update_buildpack.go +++ b/cf/commands/buildpack/update_buildpack.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateBuildpack struct { diff --git a/cf/commands/buildpack/update_buildpack_test.go b/cf/commands/buildpack/update_buildpack_test.go index 591eb1c75b..40971f1241 100644 --- a/cf/commands/buildpack/update_buildpack_test.go +++ b/cf/commands/buildpack/update_buildpack_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 d2f20fe01f..a31de4866c 100644 --- a/cf/commands/commands_suite_test.go +++ b/cf/commands/commands_suite_test.go @@ -1,9 +1,9 @@ package commands_test import ( - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/cf/commands/commandsfakes/fake_sshcode_getter.go b/cf/commands/commandsfakes/fake_sshcode_getter.go index ff6d9a42ba..a1cb6b212d 100644 --- a/cf/commands/commandsfakes/fake_sshcode_getter.go +++ b/cf/commands/commandsfakes/fake_sshcode_getter.go @@ -4,10 +4,10 @@ package commandsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeSSHCodeGetter struct { @@ -80,15 +80,16 @@ func (fake *FakeSSHCodeGetter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -139,15 +140,16 @@ func (fake *FakeSSHCodeGetter) Get() (string, error) { ret, specificReturn := fake.getReturnsOnCall[len(fake.getArgsForCall)] fake.getArgsForCall = append(fake.getArgsForCall, struct { }{}) + stub := fake.GetStub + fakeReturns := fake.getReturns fake.recordInvocation("Get", []interface{}{}) fake.getMutex.Unlock() - if fake.GetStub != nil { - return fake.GetStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getReturns return fakeReturns.result1, fakeReturns.result2 } @@ -194,15 +196,16 @@ func (fake *FakeSSHCodeGetter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -248,15 +251,16 @@ func (fake *FakeSSHCodeGetter) Requirements(arg1 requirements.Factory, arg2 flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -312,15 +316,16 @@ func (fake *FakeSSHCodeGetter) SetDependency(arg1 commandregistry.Dependency, ar arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } diff --git a/cf/commands/config.go b/cf/commands/config.go index ffceaecae6..cf64e108af 100644 --- a/cf/commands/config.go +++ b/cf/commands/config.go @@ -4,13 +4,13 @@ import ( "errors" "sort" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ConfigCommands struct { diff --git a/cf/commands/config_test.go b/cf/commands/config_test.go index 6d9b4f84e2..c2cca9bacd 100644 --- a/cf/commands/config_test.go +++ b/cf/commands/config_test.go @@ -1,14 +1,14 @@ package commands_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/create_app_manifest.go b/cf/commands/create_app_manifest.go index 3be17b30f6..0653aacb8b 100644 --- a/cf/commands/create_app_manifest.go +++ b/cf/commands/create_app_manifest.go @@ -6,18 +6,18 @@ import ( "os" "sort" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/appinstances" - "code.cloudfoundry.org/cli/v8/cf/api/stacks" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/manifest" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/appinstances" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateAppManifest struct { diff --git a/cf/commands/create_app_manifest_test.go b/cf/commands/create_app_manifest_test.go index 06902be18c..0e8bee8e97 100644 --- a/cf/commands/create_app_manifest_test.go +++ b/cf/commands/create_app_manifest_test.go @@ -4,23 +4,23 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/manifest/manifestfakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/manifest/manifestfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "os" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" uuid "github.com/nu7hatch/gouuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/curl.go b/cf/commands/curl.go index ed53cd2350..aaf848c99f 100644 --- a/cf/commands/curl.go +++ b/cf/commands/curl.go @@ -10,17 +10,17 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/cf/flagcontext" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - cfErrors "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cfErrors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type Curl struct { diff --git a/cf/commands/curl_test.go b/cf/commands/curl_test.go index 4de1023c19..7e52189dcd 100644 --- a/cf/commands/curl_test.go +++ b/cf/commands/curl_test.go @@ -5,19 +5,19 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "code.cloudfoundry.org/gofileutils/fileutils" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/trace" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/create_domain.go b/cf/commands/domain/create_domain.go index 1b2bbf090d..eab8994016 100644 --- a/cf/commands/domain/create_domain.go +++ b/cf/commands/domain/create_domain.go @@ -3,13 +3,13 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateDomain struct { diff --git a/cf/commands/domain/create_domain_test.go b/cf/commands/domain/create_domain_test.go index 69e960f55c..94ae481c16 100644 --- a/cf/commands/domain/create_domain_test.go +++ b/cf/commands/domain/create_domain_test.go @@ -1,17 +1,17 @@ package domain_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/create_shared_domain.go b/cf/commands/domain/create_shared_domain.go index fb3a8871f6..3ee10ec504 100644 --- a/cf/commands/domain/create_shared_domain.go +++ b/cf/commands/domain/create_shared_domain.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateSharedDomain struct { diff --git a/cf/commands/domain/create_shared_domain_test.go b/cf/commands/domain/create_shared_domain_test.go index 04129e75c0..0fdd062f44 100644 --- a/cf/commands/domain/create_shared_domain_test.go +++ b/cf/commands/domain/create_shared_domain_test.go @@ -3,20 +3,20 @@ package domain_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/cf/commands/domain" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/domain" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/delete_domain.go b/cf/commands/domain/delete_domain.go index db7d43387f..c8e5064952 100644 --- a/cf/commands/domain/delete_domain.go +++ b/cf/commands/domain/delete_domain.go @@ -3,14 +3,14 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteDomain struct { diff --git a/cf/commands/domain/delete_domain_test.go b/cf/commands/domain/delete_domain_test.go index 2a73296fe1..863152c69c 100644 --- a/cf/commands/domain/delete_domain_test.go +++ b/cf/commands/domain/delete_domain_test.go @@ -1,20 +1,20 @@ package domain_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-domain command", func() { diff --git a/cf/commands/domain/delete_shared_domain.go b/cf/commands/domain/delete_shared_domain.go index 9cd4d9048c..a0c9ff3ad0 100644 --- a/cf/commands/domain/delete_shared_domain.go +++ b/cf/commands/domain/delete_shared_domain.go @@ -3,14 +3,14 @@ package domain import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteSharedDomain struct { diff --git a/cf/commands/domain/delete_shared_domain_test.go b/cf/commands/domain/delete_shared_domain_test.go index 4eb18b779e..db131d629f 100644 --- a/cf/commands/domain/delete_shared_domain_test.go +++ b/cf/commands/domain/delete_shared_domain_test.go @@ -1,18 +1,18 @@ package domain_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 28f90a83a6..71cc47baf9 100644 --- a/cf/commands/domain/domain_suite_test.go +++ b/cf/commands/domain/domain_suite_test.go @@ -1,8 +1,8 @@ package domain_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/domain/domains.go b/cf/commands/domain/domains.go index b62bc116d0..2342248529 100644 --- a/cf/commands/domain/domains.go +++ b/cf/commands/domain/domains.go @@ -3,14 +3,14 @@ package domain import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListDomains struct { diff --git a/cf/commands/domain/domains_test.go b/cf/commands/domain/domains_test.go index c1ff8d8cf8..7b837603dd 100644 --- a/cf/commands/domain/domains_test.go +++ b/cf/commands/domain/domains_test.go @@ -3,21 +3,21 @@ package domain_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/cf/commands/domain" + "code.cloudfoundry.org/cli/v9/cf/commands/domain" . "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 b387681840..e605137a91 100644 --- a/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go +++ b/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go @@ -1,8 +1,8 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/environmentvariablegroup/running_environment_variable_group.go b/cf/commands/environmentvariablegroup/running_environment_variable_group.go index c1e210dd83..dafda77a9d 100644 --- a/cf/commands/environmentvariablegroup/running_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/running_environment_variable_group.go @@ -3,14 +3,14 @@ package environmentvariablegroup import ( "sort" - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RunningEnvironmentVariableGroup struct { diff --git a/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go index bbc8f3855c..ee4d0ef900 100644 --- a/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go @@ -1,18 +1,18 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go b/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go index 10911a5aaf..cabcc1ba80 100644 --- a/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/set_running_environment_variable_group.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetRunningEnvironmentVariableGroup struct { 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 8c66fe9f8d..de807f019d 100644 --- a/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go @@ -1,16 +1,16 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go index 084e488507..5fa9fba119 100644 --- a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetStagingEnvironmentVariableGroup struct { 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 dac48a7c4a..24c016874f 100644 --- a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go @@ -1,16 +1,16 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - cf_errors "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/staging_environment_variable_group.go b/cf/commands/environmentvariablegroup/staging_environment_variable_group.go index f6d0ecbb59..50865691e5 100644 --- a/cf/commands/environmentvariablegroup/staging_environment_variable_group.go +++ b/cf/commands/environmentvariablegroup/staging_environment_variable_group.go @@ -3,14 +3,14 @@ package environmentvariablegroup import ( "sort" - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type StagingEnvironmentVariableGroup struct { diff --git a/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go index d2e109d37a..600058497e 100644 --- a/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go @@ -1,18 +1,18 @@ package environmentvariablegroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/disable_feature_flag.go b/cf/commands/featureflag/disable_feature_flag.go index c4d1e719b9..388f7f6f63 100644 --- a/cf/commands/featureflag/disable_feature_flag.go +++ b/cf/commands/featureflag/disable_feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DisableFeatureFlag struct { diff --git a/cf/commands/featureflag/disable_feature_flag_test.go b/cf/commands/featureflag/disable_feature_flag_test.go index f94304a86d..e22a578116 100644 --- a/cf/commands/featureflag/disable_feature_flag_test.go +++ b/cf/commands/featureflag/disable_feature_flag_test.go @@ -3,15 +3,15 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/enable_feature_flag.go b/cf/commands/featureflag/enable_feature_flag.go index 3493fbd52e..8e597bbce9 100644 --- a/cf/commands/featureflag/enable_feature_flag.go +++ b/cf/commands/featureflag/enable_feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type EnableFeatureFlag struct { diff --git a/cf/commands/featureflag/enable_feature_flag_test.go b/cf/commands/featureflag/enable_feature_flag_test.go index 203780e883..3ae1251aef 100644 --- a/cf/commands/featureflag/enable_feature_flag_test.go +++ b/cf/commands/featureflag/enable_feature_flag_test.go @@ -3,15 +3,15 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/feature_flag.go b/cf/commands/featureflag/feature_flag.go index 14df38e35a..0eea09cc67 100644 --- a/cf/commands/featureflag/feature_flag.go +++ b/cf/commands/featureflag/feature_flag.go @@ -3,13 +3,13 @@ package featureflag import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ShowFeatureFlag struct { diff --git a/cf/commands/featureflag/feature_flag_test.go b/cf/commands/featureflag/feature_flag_test.go index f32622b49a..7fec142fcf 100644 --- a/cf/commands/featureflag/feature_flag_test.go +++ b/cf/commands/featureflag/feature_flag_test.go @@ -3,16 +3,16 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/feature_flags.go b/cf/commands/featureflag/feature_flags.go index fa0a7c2176..5d631623fe 100644 --- a/cf/commands/featureflag/feature_flags.go +++ b/cf/commands/featureflag/feature_flags.go @@ -1,13 +1,13 @@ package featureflag import ( - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListFeatureFlags struct { diff --git a/cf/commands/featureflag/feature_flags_test.go b/cf/commands/featureflag/feature_flags_test.go index e564e6ad5b..08c1e3d082 100644 --- a/cf/commands/featureflag/feature_flags_test.go +++ b/cf/commands/featureflag/feature_flags_test.go @@ -3,18 +3,18 @@ package featureflag_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/featureflag" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/featureflag" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "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 9b6f42effc..68814bf5da 100644 --- a/cf/commands/featureflag/featureflag_suite_test.go +++ b/cf/commands/featureflag/featureflag_suite_test.go @@ -1,8 +1,8 @@ package featureflag_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/help.go b/cf/commands/help.go index 0a6366786a..84a1830606 100644 --- a/cf/commands/help.go +++ b/cf/commands/help.go @@ -4,14 +4,14 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/help" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/help" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type Help struct { diff --git a/cf/commands/help_test.go b/cf/commands/help_test.go index 17f84a5090..6e7aeb0c6d 100644 --- a/cf/commands/help_test.go +++ b/cf/commands/help_test.go @@ -3,16 +3,16 @@ package commands_test import ( "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/commandsloader" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/plugin" - - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/commandsloader" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/plugin" + + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/cf/commands/login.go b/cf/commands/login.go index 1f2fd7a9aa..520dfffda2 100644 --- a/cf/commands/login.go +++ b/cf/commands/login.go @@ -4,20 +4,20 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) const maxLoginTries = 3 diff --git a/cf/commands/login_test.go b/cf/commands/login_test.go index 04542d6d38..1cf57dff6d 100644 --- a/cf/commands/login_test.go +++ b/cf/commands/login_test.go @@ -3,21 +3,21 @@ package commands_test import ( "strconv" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("Login Command", func() { diff --git a/cf/commands/logout.go b/cf/commands/logout.go index 2b2dc6373b..69691b5f07 100644 --- a/cf/commands/logout.go +++ b/cf/commands/logout.go @@ -1,12 +1,12 @@ package commands import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Logout struct { diff --git a/cf/commands/logout_test.go b/cf/commands/logout_test.go index d45c21067f..ae9bc1fbe5 100644 --- a/cf/commands/logout_test.go +++ b/cf/commands/logout_test.go @@ -1,12 +1,12 @@ package commands_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/oauth_token.go b/cf/commands/oauth_token.go index e2fc11de24..3770e2387b 100644 --- a/cf/commands/oauth_token.go +++ b/cf/commands/oauth_token.go @@ -1,14 +1,14 @@ package commands import ( - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type OAuthToken struct { diff --git a/cf/commands/oauth_token_test.go b/cf/commands/oauth_token_test.go index 9d21b5c141..191a119838 100644 --- a/cf/commands/oauth_token_test.go +++ b/cf/commands/oauth_token_test.go @@ -3,20 +3,20 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" "os" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/create_org.go b/cf/commands/organization/create_org.go index e9c37c1b1d..04ddf5a1b9 100644 --- a/cf/commands/organization/create_org.go +++ b/cf/commands/organization/create_org.go @@ -3,19 +3,19 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateOrg struct { diff --git a/cf/commands/organization/create_org_test.go b/cf/commands/organization/create_org_test.go index f912d2c2e2..eea5366448 100644 --- a/cf/commands/organization/create_org_test.go +++ b/cf/commands/organization/create_org_test.go @@ -1,22 +1,22 @@ package organization_test import ( - "code.cloudfoundry.org/cli/v8/cf/commands/user/userfakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/user/userfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/delete_org.go b/cf/commands/organization/delete_org.go index 6a2f1f3798..5982e22dbd 100644 --- a/cf/commands/organization/delete_org.go +++ b/cf/commands/organization/delete_org.go @@ -3,15 +3,15 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteOrg struct { diff --git a/cf/commands/organization/delete_org_test.go b/cf/commands/organization/delete_org_test.go index beaf416fca..aed14009e4 100644 --- a/cf/commands/organization/delete_org_test.go +++ b/cf/commands/organization/delete_org_test.go @@ -1,19 +1,19 @@ package organization_test import ( - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/org.go b/cf/commands/organization/org.go index 08365f833a..6a57fc2057 100644 --- a/cf/commands/organization/org.go +++ b/cf/commands/organization/org.go @@ -5,16 +5,16 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type ShowOrg struct { diff --git a/cf/commands/organization/org_test.go b/cf/commands/organization/org_test.go index 0237c1bb5c..1d89fc2c45 100644 --- a/cf/commands/organization/org_test.go +++ b/cf/commands/organization/org_test.go @@ -1,18 +1,18 @@ package organization_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commands/organization" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commands/organization" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 23cc24193f..2d0b51549f 100644 --- a/cf/commands/organization/organization_suite_test.go +++ b/cf/commands/organization/organization_suite_test.go @@ -1,8 +1,8 @@ package organization_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/organization/orgs.go b/cf/commands/organization/orgs.go index 86e5ce8dc8..c54b423a90 100644 --- a/cf/commands/organization/orgs.go +++ b/cf/commands/organization/orgs.go @@ -3,15 +3,15 @@ package organization import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) const orgLimit = 0 diff --git a/cf/commands/organization/orgs_test.go b/cf/commands/organization/orgs_test.go index bbe42e981a..7285bacfeb 100644 --- a/cf/commands/organization/orgs_test.go +++ b/cf/commands/organization/orgs_test.go @@ -3,23 +3,23 @@ package organization_test import ( "os" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/commands/organization" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/organization" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("orgs command", func() { diff --git a/cf/commands/organization/rename_org.go b/cf/commands/organization/rename_org.go index 5ae28e0042..54ac7e36e4 100644 --- a/cf/commands/organization/rename_org.go +++ b/cf/commands/organization/rename_org.go @@ -3,13 +3,13 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameOrg struct { diff --git a/cf/commands/organization/rename_org_test.go b/cf/commands/organization/rename_org_test.go index ae507c61de..98776fb734 100644 --- a/cf/commands/organization/rename_org_test.go +++ b/cf/commands/organization/rename_org_test.go @@ -1,19 +1,19 @@ package organization_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("rename-org command", func() { diff --git a/cf/commands/organization/set_quota.go b/cf/commands/organization/set_quota.go index 6eb0b766e5..eb17e82bc5 100644 --- a/cf/commands/organization/set_quota.go +++ b/cf/commands/organization/set_quota.go @@ -3,13 +3,13 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetQuota struct { diff --git a/cf/commands/organization/set_quota_test.go b/cf/commands/organization/set_quota_test.go index 56271a5a49..2d6f9de4c0 100644 --- a/cf/commands/organization/set_quota_test.go +++ b/cf/commands/organization/set_quota_test.go @@ -1,17 +1,17 @@ package organization_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/share_private_domain.go b/cf/commands/organization/share_private_domain.go index 99b19e6acc..bce59a4414 100644 --- a/cf/commands/organization/share_private_domain.go +++ b/cf/commands/organization/share_private_domain.go @@ -3,14 +3,14 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SharePrivateDomain struct { diff --git a/cf/commands/organization/unshare_private_domain.go b/cf/commands/organization/unshare_private_domain.go index 2ab0eb147e..12ebe7f1f6 100644 --- a/cf/commands/organization/unshare_private_domain.go +++ b/cf/commands/organization/unshare_private_domain.go @@ -3,14 +3,14 @@ package organization import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsharePrivateDomain struct { diff --git a/cf/commands/passwd.go b/cf/commands/passwd.go index fcfb2ed224..c23e200634 100644 --- a/cf/commands/passwd.go +++ b/cf/commands/passwd.go @@ -1,14 +1,14 @@ package commands import ( - "code.cloudfoundry.org/cli/v8/cf/api/password" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/password" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Password struct { diff --git a/cf/commands/passwd_test.go b/cf/commands/passwd_test.go index 911b662958..f584f08121 100644 --- a/cf/commands/passwd_test.go +++ b/cf/commands/passwd_test.go @@ -1,19 +1,19 @@ package commands_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("password command", func() { diff --git a/cf/commands/plugin/install_plugin.go b/cf/commands/plugin/install_plugin.go index e8ee1844c0..fd86ce8609 100644 --- a/cf/commands/plugin/install_plugin.go +++ b/cf/commands/plugin/install_plugin.go @@ -8,21 +8,21 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/actors/plugininstaller" - "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/downloader" - "code.cloudfoundry.org/cli/v8/plugin" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/cf/actors/plugininstaller" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/downloader" + "code.cloudfoundry.org/cli/v9/plugin" + "code.cloudfoundry.org/cli/v9/util" "code.cloudfoundry.org/gofileutils/fileutils" - pluginRPCService "code.cloudfoundry.org/cli/v8/plugin/rpc" + pluginRPCService "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type PluginInstall struct { diff --git a/cf/commands/plugin/install_plugin_test.go b/cf/commands/plugin/install_plugin_test.go index f9d22d80dc..3d62c2e932 100644 --- a/cf/commands/plugin/install_plugin_test.go +++ b/cf/commands/plugin/install_plugin_test.go @@ -10,25 +10,25 @@ import ( "runtime" "sync" - "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo/pluginrepofakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commandregistry/commandregistryfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/utilfakes" - "code.cloudfoundry.org/cli/v8/plugin" - - clipr "code.cloudfoundry.org/cli/v8-plugin-repo/web" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo/pluginrepofakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry/commandregistryfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/utilfakes" + "code.cloudfoundry.org/cli/v9/plugin" + + clipr "code.cloudfoundry.org/cli-plugin-repo/web" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 54a1a3931d..9e1ff6ea9b 100644 --- a/cf/commands/plugin/plugin_suite_test.go +++ b/cf/commands/plugin/plugin_suite_test.go @@ -3,10 +3,10 @@ package plugin_test import ( "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/commands/plugin" - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v9/cf/commands/plugin" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/plugin/plugins.go b/cf/commands/plugin/plugins.go index ad5cd0ad18..320d1f7225 100644 --- a/cf/commands/plugin/plugins.go +++ b/cf/commands/plugin/plugins.go @@ -4,14 +4,14 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/util" - "code.cloudfoundry.org/cli/v8/util/sorting" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/util/sorting" ) type Plugins struct { diff --git a/cf/commands/plugin/plugins_test.go b/cf/commands/plugin/plugins_test.go index 5425c22c2b..b708f40ddc 100644 --- a/cf/commands/plugin/plugins_test.go +++ b/cf/commands/plugin/plugins_test.go @@ -3,16 +3,16 @@ package plugin_test import ( "net/rpc" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - plugincmd "code.cloudfoundry.org/cli/v8/cf/commands/plugin" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig/pluginconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + plugincmd "code.cloudfoundry.org/cli/v9/cf/commands/plugin" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/plugin/uninstall_plugin.go b/cf/commands/plugin/uninstall_plugin.go index 92ce488e04..62a5eb8039 100644 --- a/cf/commands/plugin/uninstall_plugin.go +++ b/cf/commands/plugin/uninstall_plugin.go @@ -8,13 +8,13 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - rpcService "code.cloudfoundry.org/cli/v8/plugin/rpc" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + rpcService "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type PluginUninstall struct { diff --git a/cf/commands/plugin/uninstall_plugin_test.go b/cf/commands/plugin/uninstall_plugin_test.go index df350e51ee..4368a0ce7b 100644 --- a/cf/commands/plugin/uninstall_plugin_test.go +++ b/cf/commands/plugin/uninstall_plugin_test.go @@ -5,17 +5,17 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration" - "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" "code.cloudfoundry.org/gofileutils/fileutils" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/pluginrepo/add_plugin_repo.go b/cf/commands/pluginrepo/add_plugin_repo.go index d5f699f1d8..d24b91972c 100644 --- a/cf/commands/pluginrepo/add_plugin_repo.go +++ b/cf/commands/pluginrepo/add_plugin_repo.go @@ -10,16 +10,16 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type AddPluginRepo struct { diff --git a/cf/commands/pluginrepo/add_plugin_repo_test.go b/cf/commands/pluginrepo/add_plugin_repo_test.go index 0577cce61b..10ed6d7172 100644 --- a/cf/commands/pluginrepo/add_plugin_repo_test.go +++ b/cf/commands/pluginrepo/add_plugin_repo_test.go @@ -5,15 +5,15 @@ import ( "net/http" "net/http/httptest" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/list_plugin_repos.go b/cf/commands/pluginrepo/list_plugin_repos.go index 179a2c0a11..bd396df661 100644 --- a/cf/commands/pluginrepo/list_plugin_repos.go +++ b/cf/commands/pluginrepo/list_plugin_repos.go @@ -1,13 +1,13 @@ package pluginrepo import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ListPluginRepos struct { diff --git a/cf/commands/pluginrepo/list_plugin_repos_test.go b/cf/commands/pluginrepo/list_plugin_repos_test.go index 34573931ff..31dbbf44be 100644 --- a/cf/commands/pluginrepo/list_plugin_repos_test.go +++ b/cf/commands/pluginrepo/list_plugin_repos_test.go @@ -1,16 +1,16 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 c1ebd911a8..9a493a28b8 100644 --- a/cf/commands/pluginrepo/plugin_repo_suite_test.go +++ b/cf/commands/pluginrepo/plugin_repo_suite_test.go @@ -1,9 +1,9 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/v8/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/remove_plugin_repo.go b/cf/commands/pluginrepo/remove_plugin_repo.go index 7a6b544f78..5e406a637a 100644 --- a/cf/commands/pluginrepo/remove_plugin_repo.go +++ b/cf/commands/pluginrepo/remove_plugin_repo.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type RemovePluginRepo struct { diff --git a/cf/commands/pluginrepo/remove_plugin_repo_test.go b/cf/commands/pluginrepo/remove_plugin_repo_test.go index ef2e41b129..5fda18ecda 100644 --- a/cf/commands/pluginrepo/remove_plugin_repo_test.go +++ b/cf/commands/pluginrepo/remove_plugin_repo_test.go @@ -1,15 +1,15 @@ package pluginrepo_test import ( - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/pluginrepo/repo_plugins.go b/cf/commands/pluginrepo/repo_plugins.go index a2966c1b6e..163ed5136f 100644 --- a/cf/commands/pluginrepo/repo_plugins.go +++ b/cf/commands/pluginrepo/repo_plugins.go @@ -4,17 +4,17 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type RepoPlugins struct { diff --git a/cf/commands/pluginrepo/repo_plugins_test.go b/cf/commands/pluginrepo/repo_plugins_test.go index f9a41651d2..72e6062dec 100644 --- a/cf/commands/pluginrepo/repo_plugins_test.go +++ b/cf/commands/pluginrepo/repo_plugins_test.go @@ -1,20 +1,20 @@ package pluginrepo_test import ( - "code.cloudfoundry.org/cli/v8/cf/actors/pluginrepo/pluginrepofakes" - "code.cloudfoundry.org/cli/v8/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/actors/pluginrepo/pluginrepofakes" + "code.cloudfoundry.org/cli/v9/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - clipr "code.cloudfoundry.org/cli/v8-plugin-repo/web" + clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/create_quota.go b/cf/commands/quota/create_quota.go index d5733ec927..0dfac3e50b 100644 --- a/cf/commands/quota/create_quota.go +++ b/cf/commands/quota/create_quota.go @@ -5,17 +5,17 @@ import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateQuota struct { diff --git a/cf/commands/quota/create_quota_test.go b/cf/commands/quota/create_quota_test.go index 824d58760a..4954df696d 100644 --- a/cf/commands/quota/create_quota_test.go +++ b/cf/commands/quota/create_quota_test.go @@ -1,24 +1,24 @@ package quota_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "encoding/json" - "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/commands/quota" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commands/quota" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" ) var _ = Describe("create-quota command", func() { diff --git a/cf/commands/quota/delete_quota.go b/cf/commands/quota/delete_quota.go index cd77cbbf25..a41fd2f1b9 100644 --- a/cf/commands/quota/delete_quota.go +++ b/cf/commands/quota/delete_quota.go @@ -3,14 +3,14 @@ package quota import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteQuota struct { diff --git a/cf/commands/quota/delete_quota_test.go b/cf/commands/quota/delete_quota_test.go index 3ba0f048eb..7728af8ddd 100644 --- a/cf/commands/quota/delete_quota_test.go +++ b/cf/commands/quota/delete_quota_test.go @@ -1,18 +1,18 @@ package quota_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/quota.go b/cf/commands/quota/quota.go index e8ff2ee310..d2cd2e1bed 100644 --- a/cf/commands/quota/quota.go +++ b/cf/commands/quota/quota.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type showQuota struct { diff --git a/cf/commands/quota/quota_suite_test.go b/cf/commands/quota/quota_suite_test.go index 3a9948a836..017ecf35a4 100644 --- a/cf/commands/quota/quota_suite_test.go +++ b/cf/commands/quota/quota_suite_test.go @@ -1,8 +1,8 @@ package quota_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/quota/quota_test.go b/cf/commands/quota/quota_test.go index dcdba474fd..2589b89da8 100644 --- a/cf/commands/quota/quota_test.go +++ b/cf/commands/quota/quota_test.go @@ -4,18 +4,18 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("quota", func() { diff --git a/cf/commands/quota/quotas.go b/cf/commands/quota/quotas.go index bee2a80087..0f9ff7c309 100644 --- a/cf/commands/quota/quotas.go +++ b/cf/commands/quota/quotas.go @@ -4,16 +4,16 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListQuotas struct { diff --git a/cf/commands/quota/quotas_test.go b/cf/commands/quota/quotas_test.go index 9adec4fd71..987d1780bc 100644 --- a/cf/commands/quota/quotas_test.go +++ b/cf/commands/quota/quotas_test.go @@ -1,21 +1,21 @@ package quota_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/v8/cf/commands/quota" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/terminal" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/quota" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/update_quota.go b/cf/commands/quota/update_quota.go index 4a159215d7..2244dbafa1 100644 --- a/cf/commands/quota/update_quota.go +++ b/cf/commands/quota/update_quota.go @@ -6,14 +6,14 @@ import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/cf/api/quotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateQuota struct { diff --git a/cf/commands/quota/update_quota_test.go b/cf/commands/quota/update_quota_test.go index df369d573a..1b99a15027 100644 --- a/cf/commands/quota/update_quota_test.go +++ b/cf/commands/quota/update_quota_test.go @@ -1,23 +1,23 @@ package quota_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/quotas/quotasfakes" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - cmdsQuota "code.cloudfoundry.org/cli/v8/cf/commands/quota" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + cmdsQuota "code.cloudfoundry.org/cli/v9/cf/commands/quota" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "encoding/json" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/check_route.go b/cf/commands/route/check_route.go index 4788ab890b..5feeb99cb2 100644 --- a/cf/commands/route/check_route.go +++ b/cf/commands/route/check_route.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CheckRoute struct { diff --git a/cf/commands/route/check_route_test.go b/cf/commands/route/check_route_test.go index 89f49677e9..8122055c8e 100644 --- a/cf/commands/route/check_route_test.go +++ b/cf/commands/route/check_route_test.go @@ -3,20 +3,20 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/create_route.go b/cf/commands/route/create_route.go index 87a73ff09a..0e4844be20 100644 --- a/cf/commands/route/create_route.go +++ b/cf/commands/route/create_route.go @@ -3,14 +3,14 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Creator diff --git a/cf/commands/route/create_route_test.go b/cf/commands/route/create_route_test.go index e5ea63c64d..c596a5efbf 100644 --- a/cf/commands/route/create_route_test.go +++ b/cf/commands/route/create_route_test.go @@ -3,19 +3,19 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/route/delete_orphaned_routes.go b/cf/commands/route/delete_orphaned_routes.go index ee12115034..624bd7a67a 100644 --- a/cf/commands/route/delete_orphaned_routes.go +++ b/cf/commands/route/delete_orphaned_routes.go @@ -3,14 +3,14 @@ package route import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteOrphanedRoutes struct { diff --git a/cf/commands/route/delete_orphaned_routes_test.go b/cf/commands/route/delete_orphaned_routes_test.go index c887547eb8..7744fa65c3 100644 --- a/cf/commands/route/delete_orphaned_routes_test.go +++ b/cf/commands/route/delete_orphaned_routes_test.go @@ -1,19 +1,19 @@ package route_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/delete_route.go b/cf/commands/route/delete_route.go index 07f9cec6f6..52fb1bab87 100644 --- a/cf/commands/route/delete_route.go +++ b/cf/commands/route/delete_route.go @@ -3,15 +3,15 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteRoute struct { diff --git a/cf/commands/route/delete_route_test.go b/cf/commands/route/delete_route_test.go index 455c359797..56d2dc4ca3 100644 --- a/cf/commands/route/delete_route_test.go +++ b/cf/commands/route/delete_route_test.go @@ -3,21 +3,21 @@ package route_test import ( "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/map_route.go b/cf/commands/route/map_route.go index f8a21354b5..438b795659 100644 --- a/cf/commands/route/map_route.go +++ b/cf/commands/route/map_route.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type MapRoute struct { diff --git a/cf/commands/route/map_route_test.go b/cf/commands/route/map_route_test.go index 573d8e505e..206bba7e58 100644 --- a/cf/commands/route/map_route_test.go +++ b/cf/commands/route/map_route_test.go @@ -3,23 +3,23 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/commands/route/routefakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/commands/route/routefakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 1afd5fa0a3..c936cf6fcb 100644 --- a/cf/commands/route/route_suite_test.go +++ b/cf/commands/route/route_suite_test.go @@ -1,8 +1,8 @@ package route_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/route/routefakes/fake_creator.go b/cf/commands/route/routefakes/fake_creator.go index 9996eef3b3..ed13094f87 100644 --- a/cf/commands/route/routefakes/fake_creator.go +++ b/cf/commands/route/routefakes/fake_creator.go @@ -4,8 +4,8 @@ package routefakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeCreator struct { @@ -42,15 +42,16 @@ func (fake *FakeCreator) CreateRoute(arg1 string, arg2 string, arg3 int, arg4 bo arg5 models.DomainFields arg6 models.SpaceFields }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.CreateRouteStub + fakeReturns := fake.createRouteReturns fake.recordInvocation("CreateRoute", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) fake.createRouteMutex.Unlock() - if fake.CreateRouteStub != nil { - return fake.CreateRouteStub(arg1, arg2, arg3, arg4, arg5, arg6) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createRouteReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/commands/route/routefakes/old_fake_route_creator.go b/cf/commands/route/routefakes/old_fake_route_creator.go index fcadde7ba0..f1ec9a6e0a 100644 --- a/cf/commands/route/routefakes/old_fake_route_creator.go +++ b/cf/commands/route/routefakes/old_fake_route_creator.go @@ -3,11 +3,11 @@ package routefakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type OldFakeRouteCreator struct { diff --git a/cf/commands/route/routes.go b/cf/commands/route/routes.go index dcd5513171..4e28356aa7 100644 --- a/cf/commands/route/routes.go +++ b/cf/commands/route/routes.go @@ -5,15 +5,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListRoutes struct { diff --git a/cf/commands/route/routes_test.go b/cf/commands/route/routes_test.go index 57f1195fc2..b0bc900e98 100644 --- a/cf/commands/route/routes_test.go +++ b/cf/commands/route/routes_test.go @@ -3,22 +3,22 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/terminal" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("routes command", func() { diff --git a/cf/commands/route/unmap_route.go b/cf/commands/route/unmap_route.go index 355d9ddf57..748a885947 100644 --- a/cf/commands/route/unmap_route.go +++ b/cf/commands/route/unmap_route.go @@ -3,13 +3,13 @@ package route import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnmapRoute struct { diff --git a/cf/commands/route/unmap_route_test.go b/cf/commands/route/unmap_route_test.go index 9c3d11582b..49b50b67f3 100644 --- a/cf/commands/route/unmap_route_test.go +++ b/cf/commands/route/unmap_route_test.go @@ -3,22 +3,22 @@ package route_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/routergroups/router_groups.go b/cf/commands/routergroups/router_groups.go index a3f3a39827..8b6510c765 100644 --- a/cf/commands/routergroups/router_groups.go +++ b/cf/commands/routergroups/router_groups.go @@ -3,14 +3,14 @@ package routergroups import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RouterGroups struct { diff --git a/cf/commands/routergroups/router_groups_test.go b/cf/commands/routergroups/router_groups_test.go index bf1d7f5f25..00e92a49a3 100644 --- a/cf/commands/routergroups/router_groups_test.go +++ b/cf/commands/routergroups/router_groups_test.go @@ -3,18 +3,18 @@ package routergroups_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commands/routergroups" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/routergroups" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 6b3262689c..0dac586dcf 100644 --- a/cf/commands/routergroups/routergroups_suite_test.go +++ b/cf/commands/routergroups/routergroups_suite_test.go @@ -1,8 +1,8 @@ package routergroups_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/securitygroup/bind_running_security_group.go b/cf/commands/securitygroup/bind_running_security_group.go index 8d337fef36..b3293ac0e2 100644 --- a/cf/commands/securitygroup/bind_running_security_group.go +++ b/cf/commands/securitygroup/bind_running_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type bindToRunningGroup struct { diff --git a/cf/commands/securitygroup/bind_running_security_group_test.go b/cf/commands/securitygroup/bind_running_security_group_test.go index 0a7605c6b0..210edfafaa 100644 --- a/cf/commands/securitygroup/bind_running_security_group_test.go +++ b/cf/commands/securitygroup/bind_running_security_group_test.go @@ -3,18 +3,18 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running/runningfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running/runningfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/bind_security_group.go b/cf/commands/securitygroup/bind_security_group.go index d62bdfc619..a323bc5cfe 100644 --- a/cf/commands/securitygroup/bind_security_group.go +++ b/cf/commands/securitygroup/bind_security_group.go @@ -3,17 +3,17 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - sgbinder "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + sgbinder "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type BindSecurityGroup struct { diff --git a/cf/commands/securitygroup/bind_security_group_test.go b/cf/commands/securitygroup/bind_security_group_test.go index 1c4bf383d9..15fadb2721 100644 --- a/cf/commands/securitygroup/bind_security_group_test.go +++ b/cf/commands/securitygroup/bind_security_group_test.go @@ -1,21 +1,21 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces/spacesfakes" - spacesapifakes "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces/spacesfakes" + spacesapifakes "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/bind_staging_security_group.go b/cf/commands/securitygroup/bind_staging_security_group.go index dc14cec886..b5f0b9c69e 100644 --- a/cf/commands/securitygroup/bind_staging_security_group.go +++ b/cf/commands/securitygroup/bind_staging_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type bindToStagingGroup struct { diff --git a/cf/commands/securitygroup/bind_staging_security_group_test.go b/cf/commands/securitygroup/bind_staging_security_group_test.go index 011ac8caf5..4a3a3d5bb3 100644 --- a/cf/commands/securitygroup/bind_staging_security_group_test.go +++ b/cf/commands/securitygroup/bind_staging_security_group_test.go @@ -3,18 +3,18 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging/stagingfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging/stagingfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/create_security_group.go b/cf/commands/securitygroup/create_security_group.go index 315b8c9400..c01eb65bd9 100644 --- a/cf/commands/securitygroup/create_security_group.go +++ b/cf/commands/securitygroup/create_security_group.go @@ -3,16 +3,16 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) type CreateSecurityGroup struct { diff --git a/cf/commands/securitygroup/create_security_group_test.go b/cf/commands/securitygroup/create_security_group_test.go index 2b6cb84c59..4c4fb892ff 100644 --- a/cf/commands/securitygroup/create_security_group_test.go +++ b/cf/commands/securitygroup/create_security_group_test.go @@ -4,17 +4,17 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/delete_security_group.go b/cf/commands/securitygroup/delete_security_group.go index d912c58eab..9f24efc3a0 100644 --- a/cf/commands/securitygroup/delete_security_group.go +++ b/cf/commands/securitygroup/delete_security_group.go @@ -3,14 +3,14 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteSecurityGroup struct { diff --git a/cf/commands/securitygroup/delete_security_group_test.go b/cf/commands/securitygroup/delete_security_group_test.go index d5acac43aa..3b1e97a95f 100644 --- a/cf/commands/securitygroup/delete_security_group_test.go +++ b/cf/commands/securitygroup/delete_security_group_test.go @@ -1,18 +1,18 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/running_security_groups.go b/cf/commands/securitygroup/running_security_groups.go index fc1b4af4a2..463a1ba47e 100644 --- a/cf/commands/securitygroup/running_security_groups.go +++ b/cf/commands/securitygroup/running_security_groups.go @@ -1,13 +1,13 @@ package securitygroup import ( - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type listRunningSecurityGroups struct { diff --git a/cf/commands/securitygroup/running_security_groups_test.go b/cf/commands/securitygroup/running_security_groups_test.go index d1d3017948..274f5a6cd1 100644 --- a/cf/commands/securitygroup/running_security_groups_test.go +++ b/cf/commands/securitygroup/running_security_groups_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running/runningfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running/runningfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/security_group.go b/cf/commands/securitygroup/security_group.go index fa5cfb79b0..98f4d824e7 100644 --- a/cf/commands/securitygroup/security_group.go +++ b/cf/commands/securitygroup/security_group.go @@ -4,14 +4,14 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ShowSecurityGroup struct { diff --git a/cf/commands/securitygroup/security_group_test.go b/cf/commands/securitygroup/security_group_test.go index 690e2277a9..9c8de883e8 100644 --- a/cf/commands/securitygroup/security_group_test.go +++ b/cf/commands/securitygroup/security_group_test.go @@ -1,18 +1,18 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/security_groups.go b/cf/commands/securitygroup/security_groups.go index 3e9515fdec..b10f08a900 100644 --- a/cf/commands/securitygroup/security_groups.go +++ b/cf/commands/securitygroup/security_groups.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SecurityGroups struct { diff --git a/cf/commands/securitygroup/security_groups_test.go b/cf/commands/securitygroup/security_groups_test.go index 8c288505be..fd2f3f79a2 100644 --- a/cf/commands/securitygroup/security_groups_test.go +++ b/cf/commands/securitygroup/security_groups_test.go @@ -1,20 +1,20 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commands/securitygroup" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/securitygroup" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/staging_security_groups.go b/cf/commands/securitygroup/staging_security_groups.go index be4c6e7eab..e1e0abd81b 100644 --- a/cf/commands/securitygroup/staging_security_groups.go +++ b/cf/commands/securitygroup/staging_security_groups.go @@ -1,13 +1,13 @@ package securitygroup import ( - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type listStagingSecurityGroups struct { diff --git a/cf/commands/securitygroup/staging_security_groups_test.go b/cf/commands/securitygroup/staging_security_groups_test.go index 23feb1a0fb..9409fd243f 100644 --- a/cf/commands/securitygroup/staging_security_groups_test.go +++ b/cf/commands/securitygroup/staging_security_groups_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging/stagingfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging/stagingfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 92a8043bbc..8e40366e26 100644 --- a/cf/commands/securitygroup/suite_test.go +++ b/cf/commands/securitygroup/suite_test.go @@ -1,8 +1,8 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/securitygroup/unbind_running_security_group.go b/cf/commands/securitygroup/unbind_running_security_group.go index 25c6080175..ed5a9c5caf 100644 --- a/cf/commands/securitygroup/unbind_running_security_group.go +++ b/cf/commands/securitygroup/unbind_running_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type unbindFromRunningGroup struct { diff --git a/cf/commands/securitygroup/unbind_running_security_group_test.go b/cf/commands/securitygroup/unbind_running_security_group_test.go index a88725e1ee..0d4d0d4f82 100644 --- a/cf/commands/securitygroup/unbind_running_security_group_test.go +++ b/cf/commands/securitygroup/unbind_running_security_group_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/running/runningfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/running/runningfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/unbind_security_group.go b/cf/commands/securitygroup/unbind_security_group.go index d56a34bf69..1d9e047d38 100644 --- a/cf/commands/securitygroup/unbind_security_group.go +++ b/cf/commands/securitygroup/unbind_security_group.go @@ -3,16 +3,16 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - sgbinder "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + sgbinder "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnbindSecurityGroup struct { diff --git a/cf/commands/securitygroup/unbind_security_group_test.go b/cf/commands/securitygroup/unbind_security_group_test.go index e9db0e205c..d31963f194 100644 --- a/cf/commands/securitygroup/unbind_security_group_test.go +++ b/cf/commands/securitygroup/unbind_security_group_test.go @@ -3,20 +3,20 @@ package securitygroup_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/spaces/spacesfakes" - spacesapifakes "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/spaces/spacesfakes" + spacesapifakes "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/unbind_staging_security_group.go b/cf/commands/securitygroup/unbind_staging_security_group.go index a81ed3f353..fa8963d362 100644 --- a/cf/commands/securitygroup/unbind_staging_security_group.go +++ b/cf/commands/securitygroup/unbind_staging_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type unbindFromStagingGroup struct { diff --git a/cf/commands/securitygroup/unbind_staging_security_group_test.go b/cf/commands/securitygroup/unbind_staging_security_group_test.go index 1d4f942bce..9d725f5cd0 100644 --- a/cf/commands/securitygroup/unbind_staging_security_group_test.go +++ b/cf/commands/securitygroup/unbind_staging_security_group_test.go @@ -1,19 +1,19 @@ package securitygroup_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/defaults/staging/stagingfakes" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/defaults/staging/stagingfakes" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/update_security_group.go b/cf/commands/securitygroup/update_security_group.go index c43e0d9821..1a2291420c 100644 --- a/cf/commands/securitygroup/update_security_group.go +++ b/cf/commands/securitygroup/update_security_group.go @@ -3,15 +3,15 @@ package securitygroup import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) type UpdateSecurityGroup struct { diff --git a/cf/commands/securitygroup/update_security_group_test.go b/cf/commands/securitygroup/update_security_group_test.go index cfbd9da6f1..4fab724894 100644 --- a/cf/commands/securitygroup/update_security_group_test.go +++ b/cf/commands/securitygroup/update_security_group_test.go @@ -4,18 +4,18 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/v8/cf/api/securitygroups/securitygroupsfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/bind_route_service.go b/cf/commands/service/bind_route_service.go index 4818f339c3..db121b41fb 100644 --- a/cf/commands/service/bind_route_service.go +++ b/cf/commands/service/bind_route_service.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flagcontext" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type BindRouteService struct { diff --git a/cf/commands/service/bind_route_service_test.go b/cf/commands/service/bind_route_service_test.go index 631b01513d..2e343d50b2 100644 --- a/cf/commands/service/bind_route_service_test.go +++ b/cf/commands/service/bind_route_service_test.go @@ -5,20 +5,20 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/bind_service.go b/cf/commands/service/bind_service.go index aec4cd7c4a..383000e7ff 100644 --- a/cf/commands/service/bind_service.go +++ b/cf/commands/service/bind_service.go @@ -3,17 +3,17 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Binder diff --git a/cf/commands/service/bind_service_test.go b/cf/commands/service/bind_service_test.go index c0c2065c99..7c895c7fd0 100644 --- a/cf/commands/service/bind_service_test.go +++ b/cf/commands/service/bind_service_test.go @@ -5,20 +5,20 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("bind-service command", func() { diff --git a/cf/commands/service/create_service.go b/cf/commands/service/create_service.go index e1a7510d70..500af1b507 100644 --- a/cf/commands/service/create_service.go +++ b/cf/commands/service/create_service.go @@ -3,18 +3,18 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/uihelpers" - "code.cloudfoundry.org/cli/v8/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) type CreateService struct { diff --git a/cf/commands/service/create_service_test.go b/cf/commands/service/create_service_test.go index 59cb61572d..af85efa244 100644 --- a/cf/commands/service/create_service_test.go +++ b/cf/commands/service/create_service_test.go @@ -5,24 +5,24 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("create-service command", func() { diff --git a/cf/commands/service/create_user_provided_service.go b/cf/commands/service/create_user_provided_service.go index bf3ec4a7a0..0ededa8884 100644 --- a/cf/commands/service/create_user_provided_service.go +++ b/cf/commands/service/create_user_provided_service.go @@ -4,19 +4,19 @@ import ( "encoding/json" "strings" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/flagcontext" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateUserProvidedService struct { diff --git a/cf/commands/service/create_user_provided_service_test.go b/cf/commands/service/create_user_provided_service_test.go index e37564419f..55886ae2e4 100644 --- a/cf/commands/service/create_user_provided_service_test.go +++ b/cf/commands/service/create_user_provided_service_test.go @@ -5,19 +5,19 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/delete_service.go b/cf/commands/service/delete_service.go index a4356e6da1..3be842e397 100644 --- a/cf/commands/service/delete_service.go +++ b/cf/commands/service/delete_service.go @@ -3,14 +3,14 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteService struct { diff --git a/cf/commands/service/delete_service_test.go b/cf/commands/service/delete_service_test.go index f757112c49..a00fe2ba95 100644 --- a/cf/commands/service/delete_service_test.go +++ b/cf/commands/service/delete_service_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-service command", func() { diff --git a/cf/commands/service/marketplace.go b/cf/commands/service/marketplace.go index 3d563c0ab4..53f6e47662 100644 --- a/cf/commands/service/marketplace.go +++ b/cf/commands/service/marketplace.go @@ -6,15 +6,15 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type MarketplaceServices struct { diff --git a/cf/commands/service/marketplace_test.go b/cf/commands/service/marketplace_test.go index 42f7f85a94..437baa003b 100644 --- a/cf/commands/service/marketplace_test.go +++ b/cf/commands/service/marketplace_test.go @@ -1,21 +1,21 @@ package service_test import ( - "code.cloudfoundry.org/cli/v8/cf/actors/servicebuilder/servicebuilderfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("marketplace command", func() { diff --git a/cf/commands/service/migrate_service_instances.go b/cf/commands/service/migrate_service_instances.go index 9b626954f9..44839d21e5 100644 --- a/cf/commands/service/migrate_service_instances.go +++ b/cf/commands/service/migrate_service_instances.go @@ -3,17 +3,17 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type MigrateServiceInstances struct { diff --git a/cf/commands/service/migrate_service_instances_test.go b/cf/commands/service/migrate_service_instances_test.go index 050a14849a..27ba1bdd0c 100644 --- a/cf/commands/service/migrate_service_instances_test.go +++ b/cf/commands/service/migrate_service_instances_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("migrating service instances from v1 to v2", func() { diff --git a/cf/commands/service/purge_service_instance.go b/cf/commands/service/purge_service_instance.go index 56a90e4869..af14b3531b 100644 --- a/cf/commands/service/purge_service_instance.go +++ b/cf/commands/service/purge_service_instance.go @@ -3,13 +3,13 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type PurgeServiceInstance struct { diff --git a/cf/commands/service/purge_service_instance_test.go b/cf/commands/service/purge_service_instance_test.go index e8c2cb9643..2cc4ff3beb 100644 --- a/cf/commands/service/purge_service_instance_test.go +++ b/cf/commands/service/purge_service_instance_test.go @@ -3,21 +3,21 @@ package service_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - cferrors "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + cferrors "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/service/purge_service_offering.go b/cf/commands/service/purge_service_offering.go index de11a529cd..3fa6345d34 100644 --- a/cf/commands/service/purge_service_offering.go +++ b/cf/commands/service/purge_service_offering.go @@ -3,15 +3,15 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type PurgeServiceOffering struct { diff --git a/cf/commands/service/purge_service_offering_test.go b/cf/commands/service/purge_service_offering_test.go index 3b4c777ebf..e79db24320 100644 --- a/cf/commands/service/purge_service_offering_test.go +++ b/cf/commands/service/purge_service_offering_test.go @@ -1,20 +1,20 @@ package service_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/rename_service.go b/cf/commands/service/rename_service.go index e3e8461d6a..b8366085e6 100644 --- a/cf/commands/service/rename_service.go +++ b/cf/commands/service/rename_service.go @@ -3,15 +3,15 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameService struct { diff --git a/cf/commands/service/rename_service_test.go b/cf/commands/service/rename_service_test.go index ac043a6777..3b8f3d3b82 100644 --- a/cf/commands/service/rename_service_test.go +++ b/cf/commands/service/rename_service_test.go @@ -1,17 +1,17 @@ package service_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/service.go b/cf/commands/service/service.go index d4f19f5e2a..152b4bb9ee 100644 --- a/cf/commands/service/service.go +++ b/cf/commands/service/service.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type ShowService struct { diff --git a/cf/commands/service/service_suite_test.go b/cf/commands/service/service_suite_test.go index c089fb54b4..8d5fd5093d 100644 --- a/cf/commands/service/service_suite_test.go +++ b/cf/commands/service/service_suite_test.go @@ -1,8 +1,8 @@ package service_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/service/service_test.go b/cf/commands/service/service_test.go index 5df35ba828..92f89c4cc9 100644 --- a/cf/commands/service/service_test.go +++ b/cf/commands/service/service_test.go @@ -1,21 +1,21 @@ package service_test import ( - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/servicefakes/fake_app_binder.go b/cf/commands/service/servicefakes/fake_app_binder.go index 748e437417..2cc47f05e4 100644 --- a/cf/commands/service/servicefakes/fake_app_binder.go +++ b/cf/commands/service/servicefakes/fake_app_binder.go @@ -1,10 +1,10 @@ package servicefakes import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type OldFakeAppBinder struct { diff --git a/cf/commands/service/servicefakes/fake_binder.go b/cf/commands/service/servicefakes/fake_binder.go index 52b5ebc9ae..bd99537e27 100644 --- a/cf/commands/service/servicefakes/fake_binder.go +++ b/cf/commands/service/servicefakes/fake_binder.go @@ -4,8 +4,8 @@ package servicefakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeBinder struct { @@ -34,15 +34,16 @@ func (fake *FakeBinder) BindApplication(arg1 models.Application, arg2 models.Ser arg2 models.ServiceInstance arg3 map[string]interface{} }{arg1, arg2, arg3}) + stub := fake.BindApplicationStub + fakeReturns := fake.bindApplicationReturns fake.recordInvocation("BindApplication", []interface{}{arg1, arg2, arg3}) fake.bindApplicationMutex.Unlock() - if fake.BindApplicationStub != nil { - return fake.BindApplicationStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.bindApplicationReturns return fakeReturns.result1 } diff --git a/cf/commands/service/servicefakes/fake_route_service_unbinder.go b/cf/commands/service/servicefakes/fake_route_service_unbinder.go index fe7d6575fd..af812457a6 100644 --- a/cf/commands/service/servicefakes/fake_route_service_unbinder.go +++ b/cf/commands/service/servicefakes/fake_route_service_unbinder.go @@ -4,8 +4,8 @@ package servicefakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeRouteServiceUnbinder struct { @@ -32,15 +32,16 @@ func (fake *FakeRouteServiceUnbinder) UnbindRoute(arg1 models.Route, arg2 models arg1 models.Route arg2 models.ServiceInstance }{arg1, arg2}) + stub := fake.UnbindRouteStub + fakeReturns := fake.unbindRouteReturns fake.recordInvocation("UnbindRoute", []interface{}{arg1, arg2}) fake.unbindRouteMutex.Unlock() - if fake.UnbindRouteStub != nil { - return fake.UnbindRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.unbindRouteReturns return fakeReturns.result1 } diff --git a/cf/commands/service/services.go b/cf/commands/service/services.go index 0c8a04732c..5ba3c77a43 100644 --- a/cf/commands/service/services.go +++ b/cf/commands/service/services.go @@ -3,15 +3,15 @@ package service import ( "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/plugin/models" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListServices struct { diff --git a/cf/commands/service/services_test.go b/cf/commands/service/services_test.go index b7fa202c08..f20d608f21 100644 --- a/cf/commands/service/services_test.go +++ b/cf/commands/service/services_test.go @@ -3,23 +3,23 @@ package service_test import ( "os" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" - - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - - "code.cloudfoundry.org/cli/v8/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + + "code.cloudfoundry.org/cli/v9/cf/commands/service" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/unbind_route_service.go b/cf/commands/service/unbind_route_service.go index 6e650da219..bab252e5c7 100644 --- a/cf/commands/service/unbind_route_service.go +++ b/cf/commands/service/unbind_route_service.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouteServiceUnbinder diff --git a/cf/commands/service/unbind_route_service_test.go b/cf/commands/service/unbind_route_service_test.go index 65a5068b15..92adade5c9 100644 --- a/cf/commands/service/unbind_route_service_test.go +++ b/cf/commands/service/unbind_route_service_test.go @@ -3,20 +3,20 @@ package service_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/unbind_service.go b/cf/commands/service/unbind_service.go index eeb67a4dc7..066a58e5be 100644 --- a/cf/commands/service/unbind_service.go +++ b/cf/commands/service/unbind_service.go @@ -3,13 +3,13 @@ package service import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnbindService struct { diff --git a/cf/commands/service/unbind_service_test.go b/cf/commands/service/unbind_service_test.go index 8aa2a9b5b9..79c7b06169 100644 --- a/cf/commands/service/unbind_service_test.go +++ b/cf/commands/service/unbind_service_test.go @@ -1,19 +1,19 @@ package service_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("unbind-service command", func() { diff --git a/cf/commands/service/update_service.go b/cf/commands/service/update_service.go index 6b9f2019bc..8f55bc8f27 100644 --- a/cf/commands/service/update_service.go +++ b/cf/commands/service/update_service.go @@ -1,21 +1,21 @@ package service import ( - "code.cloudfoundry.org/cli/v8/cf/uihelpers" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" "errors" "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" ) type UpdateService struct { diff --git a/cf/commands/service/update_service_test.go b/cf/commands/service/update_service_test.go index 6548f5d0c3..3da9d90ea2 100644 --- a/cf/commands/service/update_service_test.go +++ b/cf/commands/service/update_service_test.go @@ -5,20 +5,20 @@ import ( "io/ioutil" "os" - planbuilderfakes "code.cloudfoundry.org/cli/v8/cf/actors/planbuilder/planbuilderfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + planbuilderfakes "code.cloudfoundry.org/cli/v9/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("update-service command", func() { diff --git a/cf/commands/service/update_user_provided_service.go b/cf/commands/service/update_user_provided_service.go index 50772b9ee4..0eb11e3c37 100644 --- a/cf/commands/service/update_user_provided_service.go +++ b/cf/commands/service/update_user_provided_service.go @@ -6,17 +6,17 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/flagcontext" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/uihelpers" - - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/uihelpers" + + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateUserProvidedService struct { diff --git a/cf/commands/service/update_user_provided_service_test.go b/cf/commands/service/update_user_provided_service_test.go index bcf516ab00..60230987dd 100644 --- a/cf/commands/service/update_user_provided_service_test.go +++ b/cf/commands/service/update_user_provided_service_test.go @@ -5,20 +5,20 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/disable_service_access.go b/cf/commands/serviceaccess/disable_service_access.go index 712e57c80a..332fb0e116 100644 --- a/cf/commands/serviceaccess/disable_service_access.go +++ b/cf/commands/serviceaccess/disable_service_access.go @@ -3,14 +3,14 @@ package serviceaccess import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DisableServiceAccess struct { diff --git a/cf/commands/serviceaccess/disable_service_access_test.go b/cf/commands/serviceaccess/disable_service_access_test.go index 07d346da24..c8fb17adb1 100644 --- a/cf/commands/serviceaccess/disable_service_access_test.go +++ b/cf/commands/serviceaccess/disable_service_access_test.go @@ -3,16 +3,16 @@ package serviceaccess_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/enable_service_access.go b/cf/commands/serviceaccess/enable_service_access.go index bb8a12a543..238193f128 100644 --- a/cf/commands/serviceaccess/enable_service_access.go +++ b/cf/commands/serviceaccess/enable_service_access.go @@ -3,15 +3,15 @@ package serviceaccess import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type EnableServiceAccess struct { diff --git a/cf/commands/serviceaccess/enable_service_access_test.go b/cf/commands/serviceaccess/enable_service_access_test.go index 4a8223000a..507d91f965 100644 --- a/cf/commands/serviceaccess/enable_service_access_test.go +++ b/cf/commands/serviceaccess/enable_service_access_test.go @@ -3,17 +3,17 @@ package serviceaccess_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/service_access.go b/cf/commands/serviceaccess/service_access.go index 77c0ce5fb0..c8e74cbf61 100644 --- a/cf/commands/serviceaccess/service_access.go +++ b/cf/commands/serviceaccess/service_access.go @@ -4,15 +4,15 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/actors" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/actors" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ServiceAccess struct { diff --git a/cf/commands/serviceaccess/service_access_test.go b/cf/commands/serviceaccess/service_access_test.go index 74bb134834..1a86f20e3e 100644 --- a/cf/commands/serviceaccess/service_access_test.go +++ b/cf/commands/serviceaccess/service_access_test.go @@ -4,20 +4,20 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/v8/cf/actors/actorsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/serviceaccess" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/serviceaccess" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 a1fd82a962..cdee22395a 100644 --- a/cf/commands/serviceaccess/serviceaccess_suite_test.go +++ b/cf/commands/serviceaccess/serviceaccess_suite_test.go @@ -1,8 +1,8 @@ package serviceaccess_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/serviceauthtoken/create_service_auth_token.go b/cf/commands/serviceauthtoken/create_service_auth_token.go index 7b8fdeadb6..6e162a200a 100644 --- a/cf/commands/serviceauthtoken/create_service_auth_token.go +++ b/cf/commands/serviceauthtoken/create_service_auth_token.go @@ -3,15 +3,15 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/create_service_auth_token_test.go b/cf/commands/serviceauthtoken/create_service_auth_token_test.go index ecb5297b85..8caa20ce63 100644 --- a/cf/commands/serviceauthtoken/create_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/create_service_auth_token_test.go @@ -1,17 +1,17 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceauthtoken/delete_service_auth_token.go b/cf/commands/serviceauthtoken/delete_service_auth_token.go index 7206bc9018..168b55f0fb 100644 --- a/cf/commands/serviceauthtoken/delete_service_auth_token.go +++ b/cf/commands/serviceauthtoken/delete_service_auth_token.go @@ -3,16 +3,16 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/delete_service_auth_token_test.go b/cf/commands/serviceauthtoken/delete_service_auth_token_test.go index 90080b775f..92d0e372a2 100644 --- a/cf/commands/serviceauthtoken/delete_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/delete_service_auth_token_test.go @@ -1,21 +1,21 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-service-auth-token command", func() { diff --git a/cf/commands/serviceauthtoken/service_auth_tokens.go b/cf/commands/serviceauthtoken/service_auth_tokens.go index c592dba41b..6e200a8604 100644 --- a/cf/commands/serviceauthtoken/service_auth_tokens.go +++ b/cf/commands/serviceauthtoken/service_auth_tokens.go @@ -1,14 +1,14 @@ package serviceauthtoken import ( - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListServiceAuthTokens struct { diff --git a/cf/commands/serviceauthtoken/service_auth_tokens_test.go b/cf/commands/serviceauthtoken/service_auth_tokens_test.go index 188b2c18f2..918102a148 100644 --- a/cf/commands/serviceauthtoken/service_auth_tokens_test.go +++ b/cf/commands/serviceauthtoken/service_auth_tokens_test.go @@ -1,19 +1,19 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commands/serviceauthtoken" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/serviceauthtoken" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 dee6aa7910..00ff866a9d 100644 --- a/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go +++ b/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go @@ -1,8 +1,8 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/serviceauthtoken/update_service_auth_token.go b/cf/commands/serviceauthtoken/update_service_auth_token.go index 42b6f50906..240ea35be2 100644 --- a/cf/commands/serviceauthtoken/update_service_auth_token.go +++ b/cf/commands/serviceauthtoken/update_service_auth_token.go @@ -3,14 +3,14 @@ package serviceauthtoken import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateServiceAuthTokenFields struct { diff --git a/cf/commands/serviceauthtoken/update_service_auth_token_test.go b/cf/commands/serviceauthtoken/update_service_auth_token_test.go index c29490d586..6029c09145 100644 --- a/cf/commands/serviceauthtoken/update_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/update_service_auth_token_test.go @@ -1,17 +1,17 @@ package serviceauthtoken_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/create_service_broker.go b/cf/commands/servicebroker/create_service_broker.go index 1fdccee90e..944f93ae39 100644 --- a/cf/commands/servicebroker/create_service_broker.go +++ b/cf/commands/servicebroker/create_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateServiceBroker struct { diff --git a/cf/commands/servicebroker/create_service_broker_test.go b/cf/commands/servicebroker/create_service_broker_test.go index c06f9056fc..e24e0e40c9 100644 --- a/cf/commands/servicebroker/create_service_broker_test.go +++ b/cf/commands/servicebroker/create_service_broker_test.go @@ -3,18 +3,18 @@ package servicebroker_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/servicebroker" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/servicebroker" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/delete_service_broker.go b/cf/commands/servicebroker/delete_service_broker.go index 35cc4f551b..29fc4b2829 100644 --- a/cf/commands/servicebroker/delete_service_broker.go +++ b/cf/commands/servicebroker/delete_service_broker.go @@ -3,14 +3,14 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteServiceBroker struct { diff --git a/cf/commands/servicebroker/delete_service_broker_test.go b/cf/commands/servicebroker/delete_service_broker_test.go index a9bf55ec95..1f7d2b2e21 100644 --- a/cf/commands/servicebroker/delete_service_broker_test.go +++ b/cf/commands/servicebroker/delete_service_broker_test.go @@ -1,17 +1,17 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/rename_service_broker.go b/cf/commands/servicebroker/rename_service_broker.go index 25558d3061..c0a4541643 100644 --- a/cf/commands/servicebroker/rename_service_broker.go +++ b/cf/commands/servicebroker/rename_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameServiceBroker struct { diff --git a/cf/commands/servicebroker/rename_service_broker_test.go b/cf/commands/servicebroker/rename_service_broker_test.go index 939d12498a..2ee7e27adc 100644 --- a/cf/commands/servicebroker/rename_service_broker_test.go +++ b/cf/commands/servicebroker/rename_service_broker_test.go @@ -1,16 +1,16 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/service_brokers.go b/cf/commands/servicebroker/service_brokers.go index d2c20847f0..16c963135d 100644 --- a/cf/commands/servicebroker/service_brokers.go +++ b/cf/commands/servicebroker/service_brokers.go @@ -3,14 +3,14 @@ package servicebroker import ( "sort" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListServiceBrokers struct { diff --git a/cf/commands/servicebroker/service_brokers_test.go b/cf/commands/servicebroker/service_brokers_test.go index 18948f48ce..4dc3c475fd 100644 --- a/cf/commands/servicebroker/service_brokers_test.go +++ b/cf/commands/servicebroker/service_brokers_test.go @@ -3,23 +3,23 @@ package servicebroker_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "strings" - "code.cloudfoundry.org/cli/v8/cf/commands/servicebroker" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands/servicebroker" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("service-brokers command", func() { diff --git a/cf/commands/servicebroker/servicebroker_suite_test.go b/cf/commands/servicebroker/servicebroker_suite_test.go index a2a5a19307..49d781aed6 100644 --- a/cf/commands/servicebroker/servicebroker_suite_test.go +++ b/cf/commands/servicebroker/servicebroker_suite_test.go @@ -1,8 +1,8 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicebroker/update_service_broker.go b/cf/commands/servicebroker/update_service_broker.go index bf713c1400..9bab61bcc7 100644 --- a/cf/commands/servicebroker/update_service_broker.go +++ b/cf/commands/servicebroker/update_service_broker.go @@ -3,13 +3,13 @@ package servicebroker import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateServiceBroker struct { diff --git a/cf/commands/servicebroker/update_service_broker_test.go b/cf/commands/servicebroker/update_service_broker_test.go index 8da871cbb2..1797e0d324 100644 --- a/cf/commands/servicebroker/update_service_broker_test.go +++ b/cf/commands/servicebroker/update_service_broker_test.go @@ -1,19 +1,19 @@ package servicebroker_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("update-service-broker command", func() { diff --git a/cf/commands/servicekey/create_service_key.go b/cf/commands/servicekey/create_service_key.go index c6f1b1c1f6..c16ef94e55 100644 --- a/cf/commands/servicekey/create_service_key.go +++ b/cf/commands/servicekey/create_service_key.go @@ -3,16 +3,16 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/util/json" - - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/util/json" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type CreateServiceKey struct { diff --git a/cf/commands/servicekey/create_service_key_test.go b/cf/commands/servicekey/create_service_key_test.go index e90eadb814..d2e32040d1 100644 --- a/cf/commands/servicekey/create_service_key_test.go +++ b/cf/commands/servicekey/create_service_key_test.go @@ -4,19 +4,19 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/delete_service_key.go b/cf/commands/servicekey/delete_service_key.go index c2fec0e559..3237d392fb 100644 --- a/cf/commands/servicekey/delete_service_key.go +++ b/cf/commands/servicekey/delete_service_key.go @@ -3,15 +3,15 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type DeleteServiceKey struct { diff --git a/cf/commands/servicekey/delete_service_key_test.go b/cf/commands/servicekey/delete_service_key_test.go index 5bc7ff1563..79110927ed 100644 --- a/cf/commands/servicekey/delete_service_key_test.go +++ b/cf/commands/servicekey/delete_service_key_test.go @@ -1,19 +1,19 @@ package servicekey_test import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/service_key.go b/cf/commands/servicekey/service_key.go index 96624da661..002df9aae8 100644 --- a/cf/commands/servicekey/service_key.go +++ b/cf/commands/servicekey/service_key.go @@ -4,15 +4,15 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ServiceKey struct { diff --git a/cf/commands/servicekey/service_key_test.go b/cf/commands/servicekey/service_key_test.go index e7d3fdcaba..e49524f59c 100644 --- a/cf/commands/servicekey/service_key_test.go +++ b/cf/commands/servicekey/service_key_test.go @@ -1,19 +1,19 @@ package servicekey_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/servicekey/service_keys.go b/cf/commands/servicekey/service_keys.go index 7d7ee2a0b9..377e85b3da 100644 --- a/cf/commands/servicekey/service_keys.go +++ b/cf/commands/servicekey/service_keys.go @@ -3,14 +3,14 @@ package servicekey import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ServiceKeys struct { diff --git a/cf/commands/servicekey/service_keys_test.go b/cf/commands/servicekey/service_keys_test.go index 5165daad9d..5a1dcd9a54 100644 --- a/cf/commands/servicekey/service_keys_test.go +++ b/cf/commands/servicekey/service_keys_test.go @@ -3,18 +3,18 @@ package servicekey_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 c6c7919aca..81f9b5f380 100644 --- a/cf/commands/servicekey/servicekey_suite_test.go +++ b/cf/commands/servicekey/servicekey_suite_test.go @@ -3,8 +3,8 @@ package servicekey_test import ( "testing" - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/space/allow_space_ssh.go b/cf/commands/space/allow_space_ssh.go index 180dfd2e0b..97968be2a6 100644 --- a/cf/commands/space/allow_space_ssh.go +++ b/cf/commands/space/allow_space_ssh.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type AllowSpaceSSH struct { diff --git a/cf/commands/space/allow_space_ssh_test.go b/cf/commands/space/allow_space_ssh_test.go index 330d966f44..793cc9a9e0 100644 --- a/cf/commands/space/allow_space_ssh_test.go +++ b/cf/commands/space/allow_space_ssh_test.go @@ -3,17 +3,17 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/create_space.go b/cf/commands/space/create_space.go index 0e29f2d100..7d189a3d98 100644 --- a/cf/commands/space/create_space.go +++ b/cf/commands/space/create_space.go @@ -3,20 +3,20 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateSpace struct { diff --git a/cf/commands/space/create_space_test.go b/cf/commands/space/create_space_test.go index a86eeed6d0..27c1b46cab 100644 --- a/cf/commands/space/create_space_test.go +++ b/cf/commands/space/create_space_test.go @@ -1,23 +1,23 @@ package space_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/delete_space.go b/cf/commands/space/delete_space.go index 370d1fa578..c724b772b8 100644 --- a/cf/commands/space/delete_space.go +++ b/cf/commands/space/delete_space.go @@ -3,16 +3,16 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteSpace struct { diff --git a/cf/commands/space/delete_space_test.go b/cf/commands/space/delete_space_test.go index de7236b632..fe800f6647 100644 --- a/cf/commands/space/delete_space_test.go +++ b/cf/commands/space/delete_space_test.go @@ -3,20 +3,20 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-space command", func() { diff --git a/cf/commands/space/disallow_space_ssh.go b/cf/commands/space/disallow_space_ssh.go index 840e3eef56..8bc85e08cb 100644 --- a/cf/commands/space/disallow_space_ssh.go +++ b/cf/commands/space/disallow_space_ssh.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DisallowSpaceSSH struct { diff --git a/cf/commands/space/disallow_space_ssh_test.go b/cf/commands/space/disallow_space_ssh_test.go index b5356f96f9..86b8cd2c2b 100644 --- a/cf/commands/space/disallow_space_ssh_test.go +++ b/cf/commands/space/disallow_space_ssh_test.go @@ -3,17 +3,17 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/rename_space.go b/cf/commands/space/rename_space.go index e6a03e764d..2bf5e96346 100644 --- a/cf/commands/space/rename_space.go +++ b/cf/commands/space/rename_space.go @@ -3,13 +3,13 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type RenameSpace struct { diff --git a/cf/commands/space/rename_space_test.go b/cf/commands/space/rename_space_test.go index 5ff5d43ae9..fc0c42e9f9 100644 --- a/cf/commands/space/rename_space_test.go +++ b/cf/commands/space/rename_space_test.go @@ -3,19 +3,19 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("rename-space command", func() { diff --git a/cf/commands/space/space.go b/cf/commands/space/space.go index d777b6f1b5..fde7ea219b 100644 --- a/cf/commands/space/space.go +++ b/cf/commands/space/space.go @@ -4,17 +4,17 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/plugin/models" - - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ShowSpace struct { diff --git a/cf/commands/space/space_ssh_allowed.go b/cf/commands/space/space_ssh_allowed.go index fe86fda48c..4ccef502ba 100644 --- a/cf/commands/space/space_ssh_allowed.go +++ b/cf/commands/space/space_ssh_allowed.go @@ -3,13 +3,13 @@ package space import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SSHAllowed struct { diff --git a/cf/commands/space/space_ssh_allowed_test.go b/cf/commands/space/space_ssh_allowed_test.go index ddc3ca7c95..94c94547af 100644 --- a/cf/commands/space/space_ssh_allowed_test.go +++ b/cf/commands/space/space_ssh_allowed_test.go @@ -3,13 +3,13 @@ package space_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "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 ac4e524c32..a193ad0d49 100644 --- a/cf/commands/space/space_suite_test.go +++ b/cf/commands/space/space_suite_test.go @@ -1,8 +1,8 @@ package space_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/space/space_test.go b/cf/commands/space/space_test.go index 025e7a8548..6b80538b18 100644 --- a/cf/commands/space/space_test.go +++ b/cf/commands/space/space_test.go @@ -1,22 +1,22 @@ package space_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commands/space" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commands/space" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("space command", func() { diff --git a/cf/commands/space/spaces.go b/cf/commands/space/spaces.go index bd88551534..a11a382822 100644 --- a/cf/commands/space/spaces.go +++ b/cf/commands/space/spaces.go @@ -3,15 +3,15 @@ package space import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type ListSpaces struct { diff --git a/cf/commands/space/spaces_test.go b/cf/commands/space/spaces_test.go index 426532a5c0..9d29309836 100644 --- a/cf/commands/space/spaces_test.go +++ b/cf/commands/space/spaces_test.go @@ -4,21 +4,21 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" - - "code.cloudfoundry.org/cli/v8/cf/commands/space" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" + + "code.cloudfoundry.org/cli/v9/cf/commands/space" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/create_space_quota.go b/cf/commands/spacequota/create_space_quota.go index a9ffa7fa32..441ee7e0bc 100644 --- a/cf/commands/spacequota/create_space_quota.go +++ b/cf/commands/spacequota/create_space_quota.go @@ -5,17 +5,17 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateSpaceQuota struct { diff --git a/cf/commands/spacequota/create_space_quota_test.go b/cf/commands/spacequota/create_space_quota_test.go index 2675257e3e..3b9d30a4f8 100644 --- a/cf/commands/spacequota/create_space_quota_test.go +++ b/cf/commands/spacequota/create_space_quota_test.go @@ -3,21 +3,21 @@ package spacequota_test import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - - "code.cloudfoundry.org/cli/v8/cf/api/resources" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commands/spacequota" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + + "code.cloudfoundry.org/cli/v9/cf/api/resources" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/delete_space_quota.go b/cf/commands/spacequota/delete_space_quota.go index 63287a5a1a..569cf31603 100644 --- a/cf/commands/spacequota/delete_space_quota.go +++ b/cf/commands/spacequota/delete_space_quota.go @@ -3,15 +3,15 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type DeleteSpaceQuota struct { diff --git a/cf/commands/spacequota/delete_space_quota_test.go b/cf/commands/spacequota/delete_space_quota_test.go index eaff703925..29b7689601 100644 --- a/cf/commands/spacequota/delete_space_quota_test.go +++ b/cf/commands/spacequota/delete_space_quota_test.go @@ -1,19 +1,19 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/set_space_quota.go b/cf/commands/spacequota/set_space_quota.go index 2069fd2140..45ac3ff70d 100644 --- a/cf/commands/spacequota/set_space_quota.go +++ b/cf/commands/spacequota/set_space_quota.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SetSpaceQuota struct { diff --git a/cf/commands/spacequota/set_space_quota_test.go b/cf/commands/spacequota/set_space_quota_test.go index 9d8cb51aaa..49bcf19ada 100644 --- a/cf/commands/spacequota/set_space_quota_test.go +++ b/cf/commands/spacequota/set_space_quota_test.go @@ -1,19 +1,19 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commands/spacequota" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/space_quota.go b/cf/commands/spacequota/space_quota.go index 3f3a0224fa..08351e8269 100644 --- a/cf/commands/spacequota/space_quota.go +++ b/cf/commands/spacequota/space_quota.go @@ -3,14 +3,14 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type SpaceQuota struct { diff --git a/cf/commands/spacequota/space_quota_test.go b/cf/commands/spacequota/space_quota_test.go index c8a40f9da8..d6fbc93a5f 100644 --- a/cf/commands/spacequota/space_quota_test.go +++ b/cf/commands/spacequota/space_quota_test.go @@ -1,18 +1,18 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/space_quotas.go b/cf/commands/spacequota/space_quotas.go index 40baae6cef..30021e83f8 100644 --- a/cf/commands/spacequota/space_quotas.go +++ b/cf/commands/spacequota/space_quotas.go @@ -4,14 +4,14 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListSpaceQuotas struct { diff --git a/cf/commands/spacequota/space_quotas_test.go b/cf/commands/spacequota/space_quotas_test.go index 58ec0a231a..d06d55ed14 100644 --- a/cf/commands/spacequota/space_quotas_test.go +++ b/cf/commands/spacequota/space_quotas_test.go @@ -1,20 +1,20 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - "code.cloudfoundry.org/cli/v8/cf/commands/spacequota" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v9/cf/commands/spacequota" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 821c0186f8..9e3f67b332 100644 --- a/cf/commands/spacequota/spacequota_suite_test.go +++ b/cf/commands/spacequota/spacequota_suite_test.go @@ -1,8 +1,8 @@ package spacequota_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/spacequota/unset_space_quota.go b/cf/commands/spacequota/unset_space_quota.go index 7fcdfc09dc..a466bf446e 100644 --- a/cf/commands/spacequota/unset_space_quota.go +++ b/cf/commands/spacequota/unset_space_quota.go @@ -3,14 +3,14 @@ package spacequota import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsetSpaceQuota struct { diff --git a/cf/commands/spacequota/unset_space_quota_test.go b/cf/commands/spacequota/unset_space_quota_test.go index 1938e840e0..413b4c4b03 100644 --- a/cf/commands/spacequota/unset_space_quota_test.go +++ b/cf/commands/spacequota/unset_space_quota_test.go @@ -3,18 +3,18 @@ package spacequota_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/update_space_quota.go b/cf/commands/spacequota/update_space_quota.go index 716e250feb..ccedea96c1 100644 --- a/cf/commands/spacequota/update_space_quota.go +++ b/cf/commands/spacequota/update_space_quota.go @@ -6,14 +6,14 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UpdateSpaceQuota struct { diff --git a/cf/commands/spacequota/update_space_quota_test.go b/cf/commands/spacequota/update_space_quota_test.go index f9eb0a253c..d1bdecbd7d 100644 --- a/cf/commands/spacequota/update_space_quota_test.go +++ b/cf/commands/spacequota/update_space_quota_test.go @@ -3,17 +3,17 @@ package spacequota_test import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/cf/api/spacequotas/spacequotasfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/ssh_code.go b/cf/commands/ssh_code.go index 75fca00045..8226dc5407 100644 --- a/cf/commands/ssh_code.go +++ b/cf/commands/ssh_code.go @@ -3,14 +3,14 @@ package commands import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHCodeGetter diff --git a/cf/commands/ssh_code_test.go b/cf/commands/ssh_code_test.go index 15cf61a112..98cb48b787 100644 --- a/cf/commands/ssh_code_test.go +++ b/cf/commands/ssh_code_test.go @@ -3,19 +3,19 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/stack.go b/cf/commands/stack.go index e064aec817..6630e5f419 100644 --- a/cf/commands/stack.go +++ b/cf/commands/stack.go @@ -3,13 +3,13 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/stacks" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListStack struct { diff --git a/cf/commands/stack_test.go b/cf/commands/stack_test.go index f62822eb59..a755e9b575 100644 --- a/cf/commands/stack_test.go +++ b/cf/commands/stack_test.go @@ -3,20 +3,20 @@ package commands_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("stack command", func() { diff --git a/cf/commands/stacks.go b/cf/commands/stacks.go index d7606b2d3a..81f581a580 100644 --- a/cf/commands/stacks.go +++ b/cf/commands/stacks.go @@ -1,13 +1,13 @@ package commands import ( - "code.cloudfoundry.org/cli/v8/cf/api/stacks" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/stacks" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ListStacks struct { diff --git a/cf/commands/stacks_test.go b/cf/commands/stacks_test.go index b45c23f5f2..d2377d5212 100644 --- a/cf/commands/stacks_test.go +++ b/cf/commands/stacks_test.go @@ -1,21 +1,21 @@ package commands_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/stacks/stacksfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/commands" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("stacks command", func() { diff --git a/cf/commands/target.go b/cf/commands/target.go index d52960c55e..37c15de910 100644 --- a/cf/commands/target.go +++ b/cf/commands/target.go @@ -3,16 +3,16 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type Target struct { diff --git a/cf/commands/target_test.go b/cf/commands/target_test.go index 2480c13df9..e71c77d8ca 100644 --- a/cf/commands/target_test.go +++ b/cf/commands/target_test.go @@ -1,24 +1,24 @@ package commands_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/cf/commands" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commands" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("target command", func() { diff --git a/cf/commands/user/create_user.go b/cf/commands/user/create_user.go index f198019e7b..6fedde5d67 100644 --- a/cf/commands/user/create_user.go +++ b/cf/commands/user/create_user.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type CreateUser struct { diff --git a/cf/commands/user/create_user_test.go b/cf/commands/user/create_user_test.go index 38351dce55..8fc9eba588 100644 --- a/cf/commands/user/create_user_test.go +++ b/cf/commands/user/create_user_test.go @@ -1,19 +1,19 @@ package user_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("Create user command", func() { diff --git a/cf/commands/user/delete_user.go b/cf/commands/user/delete_user.go index 980a5d47cd..09def376fd 100644 --- a/cf/commands/user/delete_user.go +++ b/cf/commands/user/delete_user.go @@ -3,14 +3,14 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type DeleteUser struct { diff --git a/cf/commands/user/delete_user_test.go b/cf/commands/user/delete_user_test.go index 43608c313f..99c9d4ed05 100644 --- a/cf/commands/user/delete_user_test.go +++ b/cf/commands/user/delete_user_test.go @@ -1,20 +1,20 @@ package user_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("delete-user command", func() { diff --git a/cf/commands/user/org_users.go b/cf/commands/user/org_users.go index 158473c288..af17c0b807 100644 --- a/cf/commands/user/org_users.go +++ b/cf/commands/user/org_users.go @@ -3,16 +3,16 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/actors/userprint" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/actors/userprint" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type OrgUsers struct { diff --git a/cf/commands/user/org_users_test.go b/cf/commands/user/org_users_test.go index 4e83195456..b6365ddc1b 100644 --- a/cf/commands/user/org_users_test.go +++ b/cf/commands/user/org_users_test.go @@ -1,23 +1,23 @@ package user_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("org-users command", func() { diff --git a/cf/commands/user/set_org_role.go b/cf/commands/user/set_org_role.go index 9137bb8158..817939836f 100644 --- a/cf/commands/user/set_org_role.go +++ b/cf/commands/user/set_org_role.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrgRoleSetter diff --git a/cf/commands/user/set_org_role_test.go b/cf/commands/user/set_org_role_test.go index a19140fe1c..b96f7cff98 100644 --- a/cf/commands/user/set_org_role_test.go +++ b/cf/commands/user/set_org_role_test.go @@ -3,20 +3,20 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/set_space_role.go b/cf/commands/user/set_space_role.go index e8ba7636f1..56a333a7aa 100644 --- a/cf/commands/user/set_space_role.go +++ b/cf/commands/user/set_space_role.go @@ -3,17 +3,17 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRoleSetter diff --git a/cf/commands/user/set_space_role_test.go b/cf/commands/user/set_space_role_test.go index e6323cfb1f..2c6077e7cc 100644 --- a/cf/commands/user/set_space_role_test.go +++ b/cf/commands/user/set_space_role_test.go @@ -3,21 +3,21 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/space_users.go b/cf/commands/user/space_users.go index 8e10855326..863302183d 100644 --- a/cf/commands/user/space_users.go +++ b/cf/commands/user/space_users.go @@ -3,17 +3,17 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/actors/userprint" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/actors/userprint" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin/models" ) type SpaceUsers struct { diff --git a/cf/commands/user/space_users_test.go b/cf/commands/user/space_users_test.go index 5faba3b843..31b7a137df 100644 --- a/cf/commands/user/space_users_test.go +++ b/cf/commands/user/space_users_test.go @@ -3,24 +3,24 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) var _ = Describe("space-users command", func() { diff --git a/cf/commands/user/unset_org_role.go b/cf/commands/user/unset_org_role.go index f5cd3c8841..101ad6e94c 100644 --- a/cf/commands/user/unset_org_role.go +++ b/cf/commands/user/unset_org_role.go @@ -3,15 +3,15 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsetOrgRole struct { diff --git a/cf/commands/user/unset_org_role_test.go b/cf/commands/user/unset_org_role_test.go index 829c512d7d..60fa1f4ce6 100644 --- a/cf/commands/user/unset_org_role_test.go +++ b/cf/commands/user/unset_org_role_test.go @@ -3,20 +3,20 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - testapi "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + testapi "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/unset_space_role.go b/cf/commands/user/unset_space_role.go index bca44206f0..849091a4bc 100644 --- a/cf/commands/user/unset_space_role.go +++ b/cf/commands/user/unset_space_role.go @@ -3,16 +3,16 @@ package user import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags" - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type UnsetSpaceRole struct { diff --git a/cf/commands/user/unset_space_role_test.go b/cf/commands/user/unset_space_role_test.go index f475b0fcaa..2e731585b3 100644 --- a/cf/commands/user/unset_space_role_test.go +++ b/cf/commands/user/unset_space_role_test.go @@ -3,21 +3,21 @@ package user_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" - - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/api/featureflags/featureflagsfakes" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" - - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 444c4c2b0f..565fd889b0 100644 --- a/cf/commands/user/user_suite_test.go +++ b/cf/commands/user/user_suite_test.go @@ -1,8 +1,8 @@ package user_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/commands/user/userfakes/fake_org_role_setter.go b/cf/commands/user/userfakes/fake_org_role_setter.go index 4aab543899..aee75374a7 100644 --- a/cf/commands/user/userfakes/fake_org_role_setter.go +++ b/cf/commands/user/userfakes/fake_org_role_setter.go @@ -4,11 +4,11 @@ package userfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeOrgRoleSetter struct { @@ -83,15 +83,16 @@ func (fake *FakeOrgRoleSetter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -142,15 +143,16 @@ func (fake *FakeOrgRoleSetter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -196,15 +198,16 @@ func (fake *FakeOrgRoleSetter) Requirements(arg1 requirements.Factory, arg2 flag arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -260,15 +263,16 @@ func (fake *FakeOrgRoleSetter) SetDependency(arg1 commandregistry.Dependency, ar arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } @@ -323,15 +327,16 @@ func (fake *FakeOrgRoleSetter) SetOrgRole(arg1 string, arg2 models.Role, arg3 st arg3 string arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.SetOrgRoleStub + fakeReturns := fake.setOrgRoleReturns fake.recordInvocation("SetOrgRole", []interface{}{arg1, arg2, arg3, arg4}) fake.setOrgRoleMutex.Unlock() - if fake.SetOrgRoleStub != nil { - return fake.SetOrgRoleStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.setOrgRoleReturns return fakeReturns.result1 } diff --git a/cf/commands/user/userfakes/fake_space_role_setter.go b/cf/commands/user/userfakes/fake_space_role_setter.go index 11d6dc746e..2245ca3728 100644 --- a/cf/commands/user/userfakes/fake_space_role_setter.go +++ b/cf/commands/user/userfakes/fake_space_role_setter.go @@ -4,11 +4,11 @@ package userfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands/user" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeSpaceRoleSetter struct { @@ -85,15 +85,16 @@ func (fake *FakeSpaceRoleSetter) Execute(arg1 flags.FlagContext) error { fake.executeArgsForCall = append(fake.executeArgsForCall, struct { arg1 flags.FlagContext }{arg1}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -144,15 +145,16 @@ func (fake *FakeSpaceRoleSetter) MetaData() commandregistry.CommandMetadata { ret, specificReturn := fake.metaDataReturnsOnCall[len(fake.metaDataArgsForCall)] fake.metaDataArgsForCall = append(fake.metaDataArgsForCall, struct { }{}) + stub := fake.MetaDataStub + fakeReturns := fake.metaDataReturns fake.recordInvocation("MetaData", []interface{}{}) fake.metaDataMutex.Unlock() - if fake.MetaDataStub != nil { - return fake.MetaDataStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.metaDataReturns return fakeReturns.result1 } @@ -198,15 +200,16 @@ func (fake *FakeSpaceRoleSetter) Requirements(arg1 requirements.Factory, arg2 fl arg1 requirements.Factory arg2 flags.FlagContext }{arg1, arg2}) + stub := fake.RequirementsStub + fakeReturns := fake.requirementsReturns fake.recordInvocation("Requirements", []interface{}{arg1, arg2}) fake.requirementsMutex.Unlock() - if fake.RequirementsStub != nil { - return fake.RequirementsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requirementsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -262,15 +265,16 @@ func (fake *FakeSpaceRoleSetter) SetDependency(arg1 commandregistry.Dependency, arg1 commandregistry.Dependency arg2 bool }{arg1, arg2}) + stub := fake.SetDependencyStub + fakeReturns := fake.setDependencyReturns fake.recordInvocation("SetDependency", []interface{}{arg1, arg2}) fake.setDependencyMutex.Unlock() - if fake.SetDependencyStub != nil { - return fake.SetDependencyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setDependencyReturns return fakeReturns.result1 } @@ -327,15 +331,16 @@ func (fake *FakeSpaceRoleSetter) SetSpaceRole(arg1 models.Space, arg2 string, ar arg5 string arg6 string }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.SetSpaceRoleStub + fakeReturns := fake.setSpaceRoleReturns fake.recordInvocation("SetSpaceRole", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) fake.setSpaceRoleMutex.Unlock() - if fake.SetSpaceRoleStub != nil { - return fake.SetSpaceRoleStub(arg1, arg2, arg3, arg4, arg5, arg6) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6) } if specificReturn { return ret.result1 } - fakeReturns := fake.setSpaceRoleReturns return fakeReturns.result1 } diff --git a/cf/commands/version.go b/cf/commands/version.go index e954e07c96..663e1c7166 100644 --- a/cf/commands/version.go +++ b/cf/commands/version.go @@ -3,13 +3,13 @@ package commands import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/version" ) type Version struct { diff --git a/cf/commands/version_test.go b/cf/commands/version_test.go index c1afb54bfe..c1d884922d 100644 --- a/cf/commands/version_test.go +++ b/cf/commands/version_test.go @@ -1,13 +1,13 @@ package commands_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/flags" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/v8/cf" + "code.cloudfoundry.org/cli/v9/cf" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commandsloader/commands_loader.go b/cf/commandsloader/commands_loader.go index 7de27cfd18..54a4435220 100644 --- a/cf/commandsloader/commands_loader.go +++ b/cf/commandsloader/commands_loader.go @@ -1,27 +1,27 @@ package commandsloader import ( - "code.cloudfoundry.org/cli/v8/cf/commands" - "code.cloudfoundry.org/cli/v8/cf/commands/application" - "code.cloudfoundry.org/cli/v8/cf/commands/buildpack" - "code.cloudfoundry.org/cli/v8/cf/commands/domain" - "code.cloudfoundry.org/cli/v8/cf/commands/environmentvariablegroup" - "code.cloudfoundry.org/cli/v8/cf/commands/featureflag" - "code.cloudfoundry.org/cli/v8/cf/commands/organization" - "code.cloudfoundry.org/cli/v8/cf/commands/plugin" - "code.cloudfoundry.org/cli/v8/cf/commands/pluginrepo" - "code.cloudfoundry.org/cli/v8/cf/commands/quota" - "code.cloudfoundry.org/cli/v8/cf/commands/route" - "code.cloudfoundry.org/cli/v8/cf/commands/routergroups" - "code.cloudfoundry.org/cli/v8/cf/commands/securitygroup" - "code.cloudfoundry.org/cli/v8/cf/commands/service" - "code.cloudfoundry.org/cli/v8/cf/commands/serviceaccess" - "code.cloudfoundry.org/cli/v8/cf/commands/serviceauthtoken" - "code.cloudfoundry.org/cli/v8/cf/commands/servicebroker" - "code.cloudfoundry.org/cli/v8/cf/commands/servicekey" - "code.cloudfoundry.org/cli/v8/cf/commands/space" - "code.cloudfoundry.org/cli/v8/cf/commands/spacequota" - "code.cloudfoundry.org/cli/v8/cf/commands/user" + "code.cloudfoundry.org/cli/v9/cf/commands" + "code.cloudfoundry.org/cli/v9/cf/commands/application" + "code.cloudfoundry.org/cli/v9/cf/commands/buildpack" + "code.cloudfoundry.org/cli/v9/cf/commands/domain" + "code.cloudfoundry.org/cli/v9/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v9/cf/commands/featureflag" + "code.cloudfoundry.org/cli/v9/cf/commands/organization" + "code.cloudfoundry.org/cli/v9/cf/commands/plugin" + "code.cloudfoundry.org/cli/v9/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v9/cf/commands/quota" + "code.cloudfoundry.org/cli/v9/cf/commands/route" + "code.cloudfoundry.org/cli/v9/cf/commands/routergroups" + "code.cloudfoundry.org/cli/v9/cf/commands/securitygroup" + "code.cloudfoundry.org/cli/v9/cf/commands/service" + "code.cloudfoundry.org/cli/v9/cf/commands/serviceaccess" + "code.cloudfoundry.org/cli/v9/cf/commands/serviceauthtoken" + "code.cloudfoundry.org/cli/v9/cf/commands/servicebroker" + "code.cloudfoundry.org/cli/v9/cf/commands/servicekey" + "code.cloudfoundry.org/cli/v9/cf/commands/space" + "code.cloudfoundry.org/cli/v9/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v9/cf/commands/user" ) /******************* diff --git a/cf/commandsloader/commands_loader_test.go b/cf/commandsloader/commands_loader_test.go index b543a0729a..9e11abb8b5 100644 --- a/cf/commandsloader/commands_loader_test.go +++ b/cf/commandsloader/commands_loader_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/commandsloader" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/commandsloader" . "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 cfb392a479..3167f87444 100644 --- a/cf/configuration/config_disk_persistor_test.go +++ b/cf/configuration/config_disk_persistor_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - . "code.cloudfoundry.org/cli/v8/cf/configuration" + . "code.cloudfoundry.org/cli/v9/cf/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/configurationfakes/fake_data_interface.go b/cf/configuration/configurationfakes/fake_data_interface.go index 0fbaeb44c9..d8d436af34 100644 --- a/cf/configuration/configurationfakes/fake_data_interface.go +++ b/cf/configuration/configurationfakes/fake_data_interface.go @@ -4,7 +4,7 @@ package configurationfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration" ) type FakeDataInterface struct { @@ -40,15 +40,16 @@ func (fake *FakeDataInterface) JSONMarshalV3() ([]byte, error) { ret, specificReturn := fake.jSONMarshalV3ReturnsOnCall[len(fake.jSONMarshalV3ArgsForCall)] fake.jSONMarshalV3ArgsForCall = append(fake.jSONMarshalV3ArgsForCall, struct { }{}) + stub := fake.JSONMarshalV3Stub + fakeReturns := fake.jSONMarshalV3Returns fake.recordInvocation("JSONMarshalV3", []interface{}{}) fake.jSONMarshalV3Mutex.Unlock() - if fake.JSONMarshalV3Stub != nil { - return fake.JSONMarshalV3Stub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.jSONMarshalV3Returns return fakeReturns.result1, fakeReturns.result2 } @@ -101,15 +102,16 @@ func (fake *FakeDataInterface) JSONUnmarshalV3(arg1 []byte) error { fake.jSONUnmarshalV3ArgsForCall = append(fake.jSONUnmarshalV3ArgsForCall, struct { arg1 []byte }{arg1Copy}) + stub := fake.JSONUnmarshalV3Stub + fakeReturns := fake.jSONUnmarshalV3Returns fake.recordInvocation("JSONUnmarshalV3", []interface{}{arg1Copy}) fake.jSONUnmarshalV3Mutex.Unlock() - if fake.JSONUnmarshalV3Stub != nil { - return fake.JSONUnmarshalV3Stub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.jSONUnmarshalV3Returns return fakeReturns.result1 } diff --git a/cf/configuration/configurationfakes/fake_persistor.go b/cf/configuration/configurationfakes/fake_persistor.go index 2eb88364f4..6ebfccfba8 100644 --- a/cf/configuration/configurationfakes/fake_persistor.go +++ b/cf/configuration/configurationfakes/fake_persistor.go @@ -4,7 +4,7 @@ package configurationfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration" ) type FakePersistor struct { @@ -52,9 +52,10 @@ func (fake *FakePersistor) Delete() { fake.deleteMutex.Lock() fake.deleteArgsForCall = append(fake.deleteArgsForCall, struct { }{}) + stub := fake.DeleteStub fake.recordInvocation("Delete", []interface{}{}) fake.deleteMutex.Unlock() - if fake.DeleteStub != nil { + if stub != nil { fake.DeleteStub() } } @@ -76,15 +77,16 @@ func (fake *FakePersistor) Exists() bool { ret, specificReturn := fake.existsReturnsOnCall[len(fake.existsArgsForCall)] fake.existsArgsForCall = append(fake.existsArgsForCall, struct { }{}) + stub := fake.ExistsStub + fakeReturns := fake.existsReturns fake.recordInvocation("Exists", []interface{}{}) fake.existsMutex.Unlock() - if fake.ExistsStub != nil { - return fake.ExistsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.existsReturns return fakeReturns.result1 } @@ -129,15 +131,16 @@ func (fake *FakePersistor) Load(arg1 configuration.DataInterface) error { fake.loadArgsForCall = append(fake.loadArgsForCall, struct { arg1 configuration.DataInterface }{arg1}) + stub := fake.LoadStub + fakeReturns := fake.loadReturns fake.recordInvocation("Load", []interface{}{arg1}) fake.loadMutex.Unlock() - if fake.LoadStub != nil { - return fake.LoadStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.loadReturns return fakeReturns.result1 } @@ -189,15 +192,16 @@ func (fake *FakePersistor) Save(arg1 configuration.DataInterface) error { fake.saveArgsForCall = append(fake.saveArgsForCall, struct { arg1 configuration.DataInterface }{arg1}) + stub := fake.SaveStub + fakeReturns := fake.saveReturns fake.recordInvocation("Save", []interface{}{arg1}) fake.saveMutex.Unlock() - if fake.SaveStub != nil { - return fake.SaveStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.saveReturns return fakeReturns.result1 } diff --git a/cf/configuration/coreconfig/access_token_test.go b/cf/configuration/coreconfig/access_token_test.go index 0e5277ef17..5b8056cab8 100644 --- a/cf/configuration/coreconfig/access_token_test.go +++ b/cf/configuration/coreconfig/access_token_test.go @@ -1,7 +1,7 @@ package coreconfig_test import ( - . "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/api_config_refresher.go b/cf/configuration/coreconfig/api_config_refresher.go index 7923669764..b96a529eea 100644 --- a/cf/configuration/coreconfig/api_config_refresher.go +++ b/cf/configuration/coreconfig/api_config_refresher.go @@ -3,7 +3,7 @@ package coreconfig import ( "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . EndpointRepository diff --git a/cf/configuration/coreconfig/api_config_refresher_test.go b/cf/configuration/coreconfig/api_config_refresher_test.go index 59034b598c..082c901ab4 100644 --- a/cf/configuration/coreconfig/api_config_refresher_test.go +++ b/cf/configuration/coreconfig/api_config_refresher_test.go @@ -1,11 +1,11 @@ package coreconfig_test import ( - . "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v9/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/config_data.go b/cf/configuration/coreconfig/config_data.go index dfed4c0b5d..7eb4dd8dd1 100644 --- a/cf/configuration/coreconfig/config_data.go +++ b/cf/configuration/coreconfig/config_data.go @@ -3,8 +3,8 @@ package coreconfig import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type AuthPromptType string diff --git a/cf/configuration/coreconfig/config_data_test.go b/cf/configuration/coreconfig/config_data_test.go index 07cf8b89c2..33d48309cf 100644 --- a/cf/configuration/coreconfig/config_data_test.go +++ b/cf/configuration/coreconfig/config_data_test.go @@ -1,8 +1,8 @@ package coreconfig_test import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/configuration/coreconfig/config_repository.go b/cf/configuration/coreconfig/config_repository.go index 4e7a90e3d5..60e1f59ae2 100644 --- a/cf/configuration/coreconfig/config_repository.go +++ b/cf/configuration/coreconfig/config_repository.go @@ -4,9 +4,9 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" ) diff --git a/cf/configuration/coreconfig/config_repository_test.go b/cf/configuration/coreconfig/config_repository_test.go index ed6447787a..0031bfb0bc 100644 --- a/cf/configuration/coreconfig/config_repository_test.go +++ b/cf/configuration/coreconfig/config_repository_test.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/configuration" - "code.cloudfoundry.org/cli/v8/cf/configuration/configurationfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/configurationfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go b/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go index f8d378fd26..34b423c821 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go @@ -4,7 +4,7 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" ) type FakeEndpointRepository struct { @@ -33,15 +33,16 @@ func (fake *FakeEndpointRepository) GetCCInfo(arg1 string) (*coreconfig.CCInfo, fake.getCCInfoArgsForCall = append(fake.getCCInfoArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetCCInfoStub + fakeReturns := fake.getCCInfoReturns fake.recordInvocation("GetCCInfo", []interface{}{arg1}) fake.getCCInfoMutex.Unlock() - if fake.GetCCInfoStub != nil { - return fake.GetCCInfoStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getCCInfoReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go b/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go index b1eecae3f1..0cf961ce5d 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go @@ -4,9 +4,9 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "github.com/blang/semver/v4" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + semver "github.com/blang/semver/v4" ) type FakeReadWriter struct { @@ -480,15 +480,16 @@ func (fake *FakeReadWriter) APIEndpoint() string { ret, specificReturn := fake.aPIEndpointReturnsOnCall[len(fake.aPIEndpointArgsForCall)] fake.aPIEndpointArgsForCall = append(fake.aPIEndpointArgsForCall, struct { }{}) + stub := fake.APIEndpointStub + fakeReturns := fake.aPIEndpointReturns fake.recordInvocation("APIEndpoint", []interface{}{}) fake.aPIEndpointMutex.Unlock() - if fake.APIEndpointStub != nil { - return fake.APIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIEndpointReturns return fakeReturns.result1 } @@ -532,15 +533,16 @@ func (fake *FakeReadWriter) APIVersion() string { ret, specificReturn := fake.aPIVersionReturnsOnCall[len(fake.aPIVersionArgsForCall)] fake.aPIVersionArgsForCall = append(fake.aPIVersionArgsForCall, struct { }{}) + stub := fake.APIVersionStub + fakeReturns := fake.aPIVersionReturns fake.recordInvocation("APIVersion", []interface{}{}) fake.aPIVersionMutex.Unlock() - if fake.APIVersionStub != nil { - return fake.APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIVersionReturns return fakeReturns.result1 } @@ -584,15 +586,16 @@ func (fake *FakeReadWriter) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -636,15 +639,16 @@ func (fake *FakeReadWriter) AsyncTimeout() uint { ret, specificReturn := fake.asyncTimeoutReturnsOnCall[len(fake.asyncTimeoutArgsForCall)] fake.asyncTimeoutArgsForCall = append(fake.asyncTimeoutArgsForCall, struct { }{}) + stub := fake.AsyncTimeoutStub + fakeReturns := fake.asyncTimeoutReturns fake.recordInvocation("AsyncTimeout", []interface{}{}) fake.asyncTimeoutMutex.Unlock() - if fake.AsyncTimeoutStub != nil { - return fake.AsyncTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.asyncTimeoutReturns return fakeReturns.result1 } @@ -688,15 +692,16 @@ func (fake *FakeReadWriter) AuthenticationEndpoint() string { ret, specificReturn := fake.authenticationEndpointReturnsOnCall[len(fake.authenticationEndpointArgsForCall)] fake.authenticationEndpointArgsForCall = append(fake.authenticationEndpointArgsForCall, struct { }{}) + stub := fake.AuthenticationEndpointStub + fakeReturns := fake.authenticationEndpointReturns fake.recordInvocation("AuthenticationEndpoint", []interface{}{}) fake.authenticationEndpointMutex.Unlock() - if fake.AuthenticationEndpointStub != nil { - return fake.AuthenticationEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.authenticationEndpointReturns return fakeReturns.result1 } @@ -740,15 +745,16 @@ func (fake *FakeReadWriter) CLIVersion() string { ret, specificReturn := fake.cLIVersionReturnsOnCall[len(fake.cLIVersionArgsForCall)] fake.cLIVersionArgsForCall = append(fake.cLIVersionArgsForCall, struct { }{}) + stub := fake.CLIVersionStub + fakeReturns := fake.cLIVersionReturns fake.recordInvocation("CLIVersion", []interface{}{}) fake.cLIVersionMutex.Unlock() - if fake.CLIVersionStub != nil { - return fake.CLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cLIVersionReturns return fakeReturns.result1 } @@ -791,9 +797,10 @@ func (fake *FakeReadWriter) ClearSession() { fake.clearSessionMutex.Lock() fake.clearSessionArgsForCall = append(fake.clearSessionArgsForCall, struct { }{}) + stub := fake.ClearSessionStub fake.recordInvocation("ClearSession", []interface{}{}) fake.clearSessionMutex.Unlock() - if fake.ClearSessionStub != nil { + if stub != nil { fake.ClearSessionStub() } } @@ -815,15 +822,16 @@ func (fake *FakeReadWriter) ColorEnabled() string { ret, specificReturn := fake.colorEnabledReturnsOnCall[len(fake.colorEnabledArgsForCall)] fake.colorEnabledArgsForCall = append(fake.colorEnabledArgsForCall, struct { }{}) + stub := fake.ColorEnabledStub + fakeReturns := fake.colorEnabledReturns fake.recordInvocation("ColorEnabled", []interface{}{}) fake.colorEnabledMutex.Unlock() - if fake.ColorEnabledStub != nil { - return fake.ColorEnabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.colorEnabledReturns return fakeReturns.result1 } @@ -867,15 +875,16 @@ func (fake *FakeReadWriter) DopplerEndpoint() string { ret, specificReturn := fake.dopplerEndpointReturnsOnCall[len(fake.dopplerEndpointArgsForCall)] fake.dopplerEndpointArgsForCall = append(fake.dopplerEndpointArgsForCall, struct { }{}) + stub := fake.DopplerEndpointStub + fakeReturns := fake.dopplerEndpointReturns fake.recordInvocation("DopplerEndpoint", []interface{}{}) fake.dopplerEndpointMutex.Unlock() - if fake.DopplerEndpointStub != nil { - return fake.DopplerEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dopplerEndpointReturns return fakeReturns.result1 } @@ -919,15 +928,16 @@ func (fake *FakeReadWriter) HasAPIEndpoint() bool { ret, specificReturn := fake.hasAPIEndpointReturnsOnCall[len(fake.hasAPIEndpointArgsForCall)] fake.hasAPIEndpointArgsForCall = append(fake.hasAPIEndpointArgsForCall, struct { }{}) + stub := fake.HasAPIEndpointStub + fakeReturns := fake.hasAPIEndpointReturns fake.recordInvocation("HasAPIEndpoint", []interface{}{}) fake.hasAPIEndpointMutex.Unlock() - if fake.HasAPIEndpointStub != nil { - return fake.HasAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasAPIEndpointReturns return fakeReturns.result1 } @@ -971,15 +981,16 @@ func (fake *FakeReadWriter) HasOrganization() bool { ret, specificReturn := fake.hasOrganizationReturnsOnCall[len(fake.hasOrganizationArgsForCall)] fake.hasOrganizationArgsForCall = append(fake.hasOrganizationArgsForCall, struct { }{}) + stub := fake.HasOrganizationStub + fakeReturns := fake.hasOrganizationReturns fake.recordInvocation("HasOrganization", []interface{}{}) fake.hasOrganizationMutex.Unlock() - if fake.HasOrganizationStub != nil { - return fake.HasOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasOrganizationReturns return fakeReturns.result1 } @@ -1023,15 +1034,16 @@ func (fake *FakeReadWriter) HasSpace() bool { ret, specificReturn := fake.hasSpaceReturnsOnCall[len(fake.hasSpaceArgsForCall)] fake.hasSpaceArgsForCall = append(fake.hasSpaceArgsForCall, struct { }{}) + stub := fake.HasSpaceStub + fakeReturns := fake.hasSpaceReturns fake.recordInvocation("HasSpace", []interface{}{}) fake.hasSpaceMutex.Unlock() - if fake.HasSpaceStub != nil { - return fake.HasSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasSpaceReturns return fakeReturns.result1 } @@ -1075,15 +1087,16 @@ func (fake *FakeReadWriter) IsLoggedIn() bool { ret, specificReturn := fake.isLoggedInReturnsOnCall[len(fake.isLoggedInArgsForCall)] fake.isLoggedInArgsForCall = append(fake.isLoggedInArgsForCall, struct { }{}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1 } @@ -1128,15 +1141,16 @@ func (fake *FakeReadWriter) IsMinAPIVersion(arg1 semver.Version) bool { fake.isMinAPIVersionArgsForCall = append(fake.isMinAPIVersionArgsForCall, struct { arg1 semver.Version }{arg1}) + stub := fake.IsMinAPIVersionStub + fakeReturns := fake.isMinAPIVersionReturns fake.recordInvocation("IsMinAPIVersion", []interface{}{arg1}) fake.isMinAPIVersionMutex.Unlock() - if fake.IsMinAPIVersionStub != nil { - return fake.IsMinAPIVersionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinAPIVersionReturns return fakeReturns.result1 } @@ -1188,15 +1202,16 @@ func (fake *FakeReadWriter) IsMinCLIVersion(arg1 string) bool { fake.isMinCLIVersionArgsForCall = append(fake.isMinCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.IsMinCLIVersionStub + fakeReturns := fake.isMinCLIVersionReturns fake.recordInvocation("IsMinCLIVersion", []interface{}{arg1}) fake.isMinCLIVersionMutex.Unlock() - if fake.IsMinCLIVersionStub != nil { - return fake.IsMinCLIVersionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinCLIVersionReturns return fakeReturns.result1 } @@ -1247,15 +1262,16 @@ func (fake *FakeReadWriter) IsSSLDisabled() bool { ret, specificReturn := fake.isSSLDisabledReturnsOnCall[len(fake.isSSLDisabledArgsForCall)] fake.isSSLDisabledArgsForCall = append(fake.isSSLDisabledArgsForCall, struct { }{}) + stub := fake.IsSSLDisabledStub + fakeReturns := fake.isSSLDisabledReturns fake.recordInvocation("IsSSLDisabled", []interface{}{}) fake.isSSLDisabledMutex.Unlock() - if fake.IsSSLDisabledStub != nil { - return fake.IsSSLDisabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isSSLDisabledReturns return fakeReturns.result1 } @@ -1299,15 +1315,16 @@ func (fake *FakeReadWriter) Locale() string { ret, specificReturn := fake.localeReturnsOnCall[len(fake.localeArgsForCall)] fake.localeArgsForCall = append(fake.localeArgsForCall, struct { }{}) + stub := fake.LocaleStub + fakeReturns := fake.localeReturns fake.recordInvocation("Locale", []interface{}{}) fake.localeMutex.Unlock() - if fake.LocaleStub != nil { - return fake.LocaleStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.localeReturns return fakeReturns.result1 } @@ -1351,15 +1368,16 @@ func (fake *FakeReadWriter) LogCacheEndpoint() string { ret, specificReturn := fake.logCacheEndpointReturnsOnCall[len(fake.logCacheEndpointArgsForCall)] fake.logCacheEndpointArgsForCall = append(fake.logCacheEndpointArgsForCall, struct { }{}) + stub := fake.LogCacheEndpointStub + fakeReturns := fake.logCacheEndpointReturns fake.recordInvocation("LogCacheEndpoint", []interface{}{}) fake.logCacheEndpointMutex.Unlock() - if fake.LogCacheEndpointStub != nil { - return fake.LogCacheEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.logCacheEndpointReturns return fakeReturns.result1 } @@ -1403,15 +1421,16 @@ func (fake *FakeReadWriter) MinCLIVersion() string { ret, specificReturn := fake.minCLIVersionReturnsOnCall[len(fake.minCLIVersionArgsForCall)] fake.minCLIVersionArgsForCall = append(fake.minCLIVersionArgsForCall, struct { }{}) + stub := fake.MinCLIVersionStub + fakeReturns := fake.minCLIVersionReturns fake.recordInvocation("MinCLIVersion", []interface{}{}) fake.minCLIVersionMutex.Unlock() - if fake.MinCLIVersionStub != nil { - return fake.MinCLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.minCLIVersionReturns return fakeReturns.result1 } @@ -1455,15 +1474,16 @@ func (fake *FakeReadWriter) MinRecommendedCLIVersion() string { ret, specificReturn := fake.minRecommendedCLIVersionReturnsOnCall[len(fake.minRecommendedCLIVersionArgsForCall)] fake.minRecommendedCLIVersionArgsForCall = append(fake.minRecommendedCLIVersionArgsForCall, struct { }{}) + stub := fake.MinRecommendedCLIVersionStub + fakeReturns := fake.minRecommendedCLIVersionReturns fake.recordInvocation("MinRecommendedCLIVersion", []interface{}{}) fake.minRecommendedCLIVersionMutex.Unlock() - if fake.MinRecommendedCLIVersionStub != nil { - return fake.MinRecommendedCLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.minRecommendedCLIVersionReturns return fakeReturns.result1 } @@ -1507,15 +1527,16 @@ func (fake *FakeReadWriter) OrganizationFields() models.OrganizationFields { ret, specificReturn := fake.organizationFieldsReturnsOnCall[len(fake.organizationFieldsArgsForCall)] fake.organizationFieldsArgsForCall = append(fake.organizationFieldsArgsForCall, struct { }{}) + stub := fake.OrganizationFieldsStub + fakeReturns := fake.organizationFieldsReturns fake.recordInvocation("OrganizationFields", []interface{}{}) fake.organizationFieldsMutex.Unlock() - if fake.OrganizationFieldsStub != nil { - return fake.OrganizationFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.organizationFieldsReturns return fakeReturns.result1 } @@ -1559,15 +1580,16 @@ func (fake *FakeReadWriter) PluginRepos() []models.PluginRepo { ret, specificReturn := fake.pluginReposReturnsOnCall[len(fake.pluginReposArgsForCall)] fake.pluginReposArgsForCall = append(fake.pluginReposArgsForCall, struct { }{}) + stub := fake.PluginReposStub + fakeReturns := fake.pluginReposReturns fake.recordInvocation("PluginRepos", []interface{}{}) fake.pluginReposMutex.Unlock() - if fake.PluginReposStub != nil { - return fake.PluginReposStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginReposReturns return fakeReturns.result1 } @@ -1611,15 +1633,16 @@ func (fake *FakeReadWriter) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -1663,15 +1686,16 @@ func (fake *FakeReadWriter) RoutingAPIEndpoint() string { ret, specificReturn := fake.routingAPIEndpointReturnsOnCall[len(fake.routingAPIEndpointArgsForCall)] fake.routingAPIEndpointArgsForCall = append(fake.routingAPIEndpointArgsForCall, struct { }{}) + stub := fake.RoutingAPIEndpointStub + fakeReturns := fake.routingAPIEndpointReturns fake.recordInvocation("RoutingAPIEndpoint", []interface{}{}) fake.routingAPIEndpointMutex.Unlock() - if fake.RoutingAPIEndpointStub != nil { - return fake.RoutingAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.routingAPIEndpointReturns return fakeReturns.result1 } @@ -1715,15 +1739,16 @@ func (fake *FakeReadWriter) SSHOAuthClient() string { ret, specificReturn := fake.sSHOAuthClientReturnsOnCall[len(fake.sSHOAuthClientArgsForCall)] fake.sSHOAuthClientArgsForCall = append(fake.sSHOAuthClientArgsForCall, struct { }{}) + stub := fake.SSHOAuthClientStub + fakeReturns := fake.sSHOAuthClientReturns fake.recordInvocation("SSHOAuthClient", []interface{}{}) fake.sSHOAuthClientMutex.Unlock() - if fake.SSHOAuthClientStub != nil { - return fake.SSHOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.sSHOAuthClientReturns return fakeReturns.result1 } @@ -1767,9 +1792,10 @@ func (fake *FakeReadWriter) SetAPIEndpoint(arg1 string) { fake.setAPIEndpointArgsForCall = append(fake.setAPIEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAPIEndpointStub fake.recordInvocation("SetAPIEndpoint", []interface{}{arg1}) fake.setAPIEndpointMutex.Unlock() - if fake.SetAPIEndpointStub != nil { + if stub != nil { fake.SetAPIEndpointStub(arg1) } } @@ -1798,9 +1824,10 @@ func (fake *FakeReadWriter) SetAPIVersion(arg1 string) { fake.setAPIVersionArgsForCall = append(fake.setAPIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAPIVersionStub fake.recordInvocation("SetAPIVersion", []interface{}{arg1}) fake.setAPIVersionMutex.Unlock() - if fake.SetAPIVersionStub != nil { + if stub != nil { fake.SetAPIVersionStub(arg1) } } @@ -1829,9 +1856,10 @@ func (fake *FakeReadWriter) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -1860,9 +1888,10 @@ func (fake *FakeReadWriter) SetAsyncTimeout(arg1 uint) { fake.setAsyncTimeoutArgsForCall = append(fake.setAsyncTimeoutArgsForCall, struct { arg1 uint }{arg1}) + stub := fake.SetAsyncTimeoutStub fake.recordInvocation("SetAsyncTimeout", []interface{}{arg1}) fake.setAsyncTimeoutMutex.Unlock() - if fake.SetAsyncTimeoutStub != nil { + if stub != nil { fake.SetAsyncTimeoutStub(arg1) } } @@ -1891,9 +1920,10 @@ func (fake *FakeReadWriter) SetAuthenticationEndpoint(arg1 string) { fake.setAuthenticationEndpointArgsForCall = append(fake.setAuthenticationEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAuthenticationEndpointStub fake.recordInvocation("SetAuthenticationEndpoint", []interface{}{arg1}) fake.setAuthenticationEndpointMutex.Unlock() - if fake.SetAuthenticationEndpointStub != nil { + if stub != nil { fake.SetAuthenticationEndpointStub(arg1) } } @@ -1922,9 +1952,10 @@ func (fake *FakeReadWriter) SetCLIVersion(arg1 string) { fake.setCLIVersionArgsForCall = append(fake.setCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetCLIVersionStub fake.recordInvocation("SetCLIVersion", []interface{}{arg1}) fake.setCLIVersionMutex.Unlock() - if fake.SetCLIVersionStub != nil { + if stub != nil { fake.SetCLIVersionStub(arg1) } } @@ -1953,9 +1984,10 @@ func (fake *FakeReadWriter) SetColorEnabled(arg1 string) { fake.setColorEnabledArgsForCall = append(fake.setColorEnabledArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetColorEnabledStub fake.recordInvocation("SetColorEnabled", []interface{}{arg1}) fake.setColorEnabledMutex.Unlock() - if fake.SetColorEnabledStub != nil { + if stub != nil { fake.SetColorEnabledStub(arg1) } } @@ -1984,9 +2016,10 @@ func (fake *FakeReadWriter) SetDopplerEndpoint(arg1 string) { fake.setDopplerEndpointArgsForCall = append(fake.setDopplerEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetDopplerEndpointStub fake.recordInvocation("SetDopplerEndpoint", []interface{}{arg1}) fake.setDopplerEndpointMutex.Unlock() - if fake.SetDopplerEndpointStub != nil { + if stub != nil { fake.SetDopplerEndpointStub(arg1) } } @@ -2015,9 +2048,10 @@ func (fake *FakeReadWriter) SetLocale(arg1 string) { fake.setLocaleArgsForCall = append(fake.setLocaleArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetLocaleStub fake.recordInvocation("SetLocale", []interface{}{arg1}) fake.setLocaleMutex.Unlock() - if fake.SetLocaleStub != nil { + if stub != nil { fake.SetLocaleStub(arg1) } } @@ -2046,9 +2080,10 @@ func (fake *FakeReadWriter) SetLogCacheEndpoint(arg1 string) { fake.setLogCacheEndpointArgsForCall = append(fake.setLogCacheEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetLogCacheEndpointStub fake.recordInvocation("SetLogCacheEndpoint", []interface{}{arg1}) fake.setLogCacheEndpointMutex.Unlock() - if fake.SetLogCacheEndpointStub != nil { + if stub != nil { fake.SetLogCacheEndpointStub(arg1) } } @@ -2077,9 +2112,10 @@ func (fake *FakeReadWriter) SetMinCLIVersion(arg1 string) { fake.setMinCLIVersionArgsForCall = append(fake.setMinCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetMinCLIVersionStub fake.recordInvocation("SetMinCLIVersion", []interface{}{arg1}) fake.setMinCLIVersionMutex.Unlock() - if fake.SetMinCLIVersionStub != nil { + if stub != nil { fake.SetMinCLIVersionStub(arg1) } } @@ -2108,9 +2144,10 @@ func (fake *FakeReadWriter) SetMinRecommendedCLIVersion(arg1 string) { fake.setMinRecommendedCLIVersionArgsForCall = append(fake.setMinRecommendedCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetMinRecommendedCLIVersionStub fake.recordInvocation("SetMinRecommendedCLIVersion", []interface{}{arg1}) fake.setMinRecommendedCLIVersionMutex.Unlock() - if fake.SetMinRecommendedCLIVersionStub != nil { + if stub != nil { fake.SetMinRecommendedCLIVersionStub(arg1) } } @@ -2139,9 +2176,10 @@ func (fake *FakeReadWriter) SetOrganizationFields(arg1 models.OrganizationFields fake.setOrganizationFieldsArgsForCall = append(fake.setOrganizationFieldsArgsForCall, struct { arg1 models.OrganizationFields }{arg1}) + stub := fake.SetOrganizationFieldsStub fake.recordInvocation("SetOrganizationFields", []interface{}{arg1}) fake.setOrganizationFieldsMutex.Unlock() - if fake.SetOrganizationFieldsStub != nil { + if stub != nil { fake.SetOrganizationFieldsStub(arg1) } } @@ -2170,9 +2208,10 @@ func (fake *FakeReadWriter) SetPluginRepo(arg1 models.PluginRepo) { fake.setPluginRepoArgsForCall = append(fake.setPluginRepoArgsForCall, struct { arg1 models.PluginRepo }{arg1}) + stub := fake.SetPluginRepoStub fake.recordInvocation("SetPluginRepo", []interface{}{arg1}) fake.setPluginRepoMutex.Unlock() - if fake.SetPluginRepoStub != nil { + if stub != nil { fake.SetPluginRepoStub(arg1) } } @@ -2201,9 +2240,10 @@ func (fake *FakeReadWriter) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } @@ -2232,9 +2272,10 @@ func (fake *FakeReadWriter) SetRoutingAPIEndpoint(arg1 string) { fake.setRoutingAPIEndpointArgsForCall = append(fake.setRoutingAPIEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRoutingAPIEndpointStub fake.recordInvocation("SetRoutingAPIEndpoint", []interface{}{arg1}) fake.setRoutingAPIEndpointMutex.Unlock() - if fake.SetRoutingAPIEndpointStub != nil { + if stub != nil { fake.SetRoutingAPIEndpointStub(arg1) } } @@ -2263,9 +2304,10 @@ func (fake *FakeReadWriter) SetSSHOAuthClient(arg1 string) { fake.setSSHOAuthClientArgsForCall = append(fake.setSSHOAuthClientArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetSSHOAuthClientStub fake.recordInvocation("SetSSHOAuthClient", []interface{}{arg1}) fake.setSSHOAuthClientMutex.Unlock() - if fake.SetSSHOAuthClientStub != nil { + if stub != nil { fake.SetSSHOAuthClientStub(arg1) } } @@ -2294,9 +2336,10 @@ func (fake *FakeReadWriter) SetSSLDisabled(arg1 bool) { fake.setSSLDisabledArgsForCall = append(fake.setSSLDisabledArgsForCall, struct { arg1 bool }{arg1}) + stub := fake.SetSSLDisabledStub fake.recordInvocation("SetSSLDisabled", []interface{}{arg1}) fake.setSSLDisabledMutex.Unlock() - if fake.SetSSLDisabledStub != nil { + if stub != nil { fake.SetSSLDisabledStub(arg1) } } @@ -2325,9 +2368,10 @@ func (fake *FakeReadWriter) SetSpaceFields(arg1 models.SpaceFields) { fake.setSpaceFieldsArgsForCall = append(fake.setSpaceFieldsArgsForCall, struct { arg1 models.SpaceFields }{arg1}) + stub := fake.SetSpaceFieldsStub fake.recordInvocation("SetSpaceFields", []interface{}{arg1}) fake.setSpaceFieldsMutex.Unlock() - if fake.SetSpaceFieldsStub != nil { + if stub != nil { fake.SetSpaceFieldsStub(arg1) } } @@ -2356,9 +2400,10 @@ func (fake *FakeReadWriter) SetTrace(arg1 string) { fake.setTraceArgsForCall = append(fake.setTraceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetTraceStub fake.recordInvocation("SetTrace", []interface{}{arg1}) fake.setTraceMutex.Unlock() - if fake.SetTraceStub != nil { + if stub != nil { fake.SetTraceStub(arg1) } } @@ -2387,9 +2432,10 @@ func (fake *FakeReadWriter) SetUAAGrantType(arg1 string) { fake.setUAAGrantTypeArgsForCall = append(fake.setUAAGrantTypeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAGrantTypeStub fake.recordInvocation("SetUAAGrantType", []interface{}{arg1}) fake.setUAAGrantTypeMutex.Unlock() - if fake.SetUAAGrantTypeStub != nil { + if stub != nil { fake.SetUAAGrantTypeStub(arg1) } } @@ -2418,9 +2464,10 @@ func (fake *FakeReadWriter) SetUAAOAuthClient(arg1 string) { fake.setUAAOAuthClientArgsForCall = append(fake.setUAAOAuthClientArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAOAuthClientStub fake.recordInvocation("SetUAAOAuthClient", []interface{}{arg1}) fake.setUAAOAuthClientMutex.Unlock() - if fake.SetUAAOAuthClientStub != nil { + if stub != nil { fake.SetUAAOAuthClientStub(arg1) } } @@ -2449,9 +2496,10 @@ func (fake *FakeReadWriter) SetUAAOAuthClientSecret(arg1 string) { fake.setUAAOAuthClientSecretArgsForCall = append(fake.setUAAOAuthClientSecretArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAOAuthClientSecretStub fake.recordInvocation("SetUAAOAuthClientSecret", []interface{}{arg1}) fake.setUAAOAuthClientSecretMutex.Unlock() - if fake.SetUAAOAuthClientSecretStub != nil { + if stub != nil { fake.SetUAAOAuthClientSecretStub(arg1) } } @@ -2480,9 +2528,10 @@ func (fake *FakeReadWriter) SetUaaEndpoint(arg1 string) { fake.setUaaEndpointArgsForCall = append(fake.setUaaEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUaaEndpointStub fake.recordInvocation("SetUaaEndpoint", []interface{}{arg1}) fake.setUaaEndpointMutex.Unlock() - if fake.SetUaaEndpointStub != nil { + if stub != nil { fake.SetUaaEndpointStub(arg1) } } @@ -2511,15 +2560,16 @@ func (fake *FakeReadWriter) SpaceFields() models.SpaceFields { ret, specificReturn := fake.spaceFieldsReturnsOnCall[len(fake.spaceFieldsArgsForCall)] fake.spaceFieldsArgsForCall = append(fake.spaceFieldsArgsForCall, struct { }{}) + stub := fake.SpaceFieldsStub + fakeReturns := fake.spaceFieldsReturns fake.recordInvocation("SpaceFields", []interface{}{}) fake.spaceFieldsMutex.Unlock() - if fake.SpaceFieldsStub != nil { - return fake.SpaceFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.spaceFieldsReturns return fakeReturns.result1 } @@ -2563,15 +2613,16 @@ func (fake *FakeReadWriter) Trace() string { ret, specificReturn := fake.traceReturnsOnCall[len(fake.traceArgsForCall)] fake.traceArgsForCall = append(fake.traceArgsForCall, struct { }{}) + stub := fake.TraceStub + fakeReturns := fake.traceReturns fake.recordInvocation("Trace", []interface{}{}) fake.traceMutex.Unlock() - if fake.TraceStub != nil { - return fake.TraceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.traceReturns return fakeReturns.result1 } @@ -2615,15 +2666,16 @@ func (fake *FakeReadWriter) UAAGrantType() string { ret, specificReturn := fake.uAAGrantTypeReturnsOnCall[len(fake.uAAGrantTypeArgsForCall)] fake.uAAGrantTypeArgsForCall = append(fake.uAAGrantTypeArgsForCall, struct { }{}) + stub := fake.UAAGrantTypeStub + fakeReturns := fake.uAAGrantTypeReturns fake.recordInvocation("UAAGrantType", []interface{}{}) fake.uAAGrantTypeMutex.Unlock() - if fake.UAAGrantTypeStub != nil { - return fake.UAAGrantTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAGrantTypeReturns return fakeReturns.result1 } @@ -2667,15 +2719,16 @@ func (fake *FakeReadWriter) UAAOAuthClient() string { ret, specificReturn := fake.uAAOAuthClientReturnsOnCall[len(fake.uAAOAuthClientArgsForCall)] fake.uAAOAuthClientArgsForCall = append(fake.uAAOAuthClientArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientStub + fakeReturns := fake.uAAOAuthClientReturns fake.recordInvocation("UAAOAuthClient", []interface{}{}) fake.uAAOAuthClientMutex.Unlock() - if fake.UAAOAuthClientStub != nil { - return fake.UAAOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientReturns return fakeReturns.result1 } @@ -2719,15 +2772,16 @@ func (fake *FakeReadWriter) UAAOAuthClientSecret() string { ret, specificReturn := fake.uAAOAuthClientSecretReturnsOnCall[len(fake.uAAOAuthClientSecretArgsForCall)] fake.uAAOAuthClientSecretArgsForCall = append(fake.uAAOAuthClientSecretArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientSecretStub + fakeReturns := fake.uAAOAuthClientSecretReturns fake.recordInvocation("UAAOAuthClientSecret", []interface{}{}) fake.uAAOAuthClientSecretMutex.Unlock() - if fake.UAAOAuthClientSecretStub != nil { - return fake.UAAOAuthClientSecretStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientSecretReturns return fakeReturns.result1 } @@ -2771,15 +2825,16 @@ func (fake *FakeReadWriter) UaaEndpoint() string { ret, specificReturn := fake.uaaEndpointReturnsOnCall[len(fake.uaaEndpointArgsForCall)] fake.uaaEndpointArgsForCall = append(fake.uaaEndpointArgsForCall, struct { }{}) + stub := fake.UaaEndpointStub + fakeReturns := fake.uaaEndpointReturns fake.recordInvocation("UaaEndpoint", []interface{}{}) fake.uaaEndpointMutex.Unlock() - if fake.UaaEndpointStub != nil { - return fake.UaaEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uaaEndpointReturns return fakeReturns.result1 } @@ -2823,9 +2878,10 @@ func (fake *FakeReadWriter) UnSetPluginRepo(arg1 int) { fake.unSetPluginRepoArgsForCall = append(fake.unSetPluginRepoArgsForCall, struct { arg1 int }{arg1}) + stub := fake.UnSetPluginRepoStub fake.recordInvocation("UnSetPluginRepo", []interface{}{arg1}) fake.unSetPluginRepoMutex.Unlock() - if fake.UnSetPluginRepoStub != nil { + if stub != nil { fake.UnSetPluginRepoStub(arg1) } } @@ -2854,15 +2910,16 @@ func (fake *FakeReadWriter) UserEmail() string { ret, specificReturn := fake.userEmailReturnsOnCall[len(fake.userEmailArgsForCall)] fake.userEmailArgsForCall = append(fake.userEmailArgsForCall, struct { }{}) + stub := fake.UserEmailStub + fakeReturns := fake.userEmailReturns fake.recordInvocation("UserEmail", []interface{}{}) fake.userEmailMutex.Unlock() - if fake.UserEmailStub != nil { - return fake.UserEmailStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.userEmailReturns return fakeReturns.result1 } @@ -2906,15 +2963,16 @@ func (fake *FakeReadWriter) UserGUID() string { ret, specificReturn := fake.userGUIDReturnsOnCall[len(fake.userGUIDArgsForCall)] fake.userGUIDArgsForCall = append(fake.userGUIDArgsForCall, struct { }{}) + stub := fake.UserGUIDStub + fakeReturns := fake.userGUIDReturns fake.recordInvocation("UserGUID", []interface{}{}) fake.userGUIDMutex.Unlock() - if fake.UserGUIDStub != nil { - return fake.UserGUIDStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.userGUIDReturns return fakeReturns.result1 } @@ -2958,15 +3016,16 @@ func (fake *FakeReadWriter) Username() string { ret, specificReturn := fake.usernameReturnsOnCall[len(fake.usernameArgsForCall)] fake.usernameArgsForCall = append(fake.usernameArgsForCall, struct { }{}) + stub := fake.UsernameStub + fakeReturns := fake.usernameReturns fake.recordInvocation("Username", []interface{}{}) fake.usernameMutex.Unlock() - if fake.UsernameStub != nil { - return fake.UsernameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.usernameReturns return fakeReturns.result1 } diff --git a/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go b/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go index 5a452103c5..430dcf2ef0 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go @@ -4,9 +4,9 @@ package coreconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "github.com/blang/semver/v4" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + semver "github.com/blang/semver/v4" ) type FakeRepository struct { @@ -484,15 +484,16 @@ func (fake *FakeRepository) APIEndpoint() string { ret, specificReturn := fake.aPIEndpointReturnsOnCall[len(fake.aPIEndpointArgsForCall)] fake.aPIEndpointArgsForCall = append(fake.aPIEndpointArgsForCall, struct { }{}) + stub := fake.APIEndpointStub + fakeReturns := fake.aPIEndpointReturns fake.recordInvocation("APIEndpoint", []interface{}{}) fake.aPIEndpointMutex.Unlock() - if fake.APIEndpointStub != nil { - return fake.APIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIEndpointReturns return fakeReturns.result1 } @@ -536,15 +537,16 @@ func (fake *FakeRepository) APIVersion() string { ret, specificReturn := fake.aPIVersionReturnsOnCall[len(fake.aPIVersionArgsForCall)] fake.aPIVersionArgsForCall = append(fake.aPIVersionArgsForCall, struct { }{}) + stub := fake.APIVersionStub + fakeReturns := fake.aPIVersionReturns fake.recordInvocation("APIVersion", []interface{}{}) fake.aPIVersionMutex.Unlock() - if fake.APIVersionStub != nil { - return fake.APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIVersionReturns return fakeReturns.result1 } @@ -588,15 +590,16 @@ func (fake *FakeRepository) AccessToken() string { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -640,15 +643,16 @@ func (fake *FakeRepository) AsyncTimeout() uint { ret, specificReturn := fake.asyncTimeoutReturnsOnCall[len(fake.asyncTimeoutArgsForCall)] fake.asyncTimeoutArgsForCall = append(fake.asyncTimeoutArgsForCall, struct { }{}) + stub := fake.AsyncTimeoutStub + fakeReturns := fake.asyncTimeoutReturns fake.recordInvocation("AsyncTimeout", []interface{}{}) fake.asyncTimeoutMutex.Unlock() - if fake.AsyncTimeoutStub != nil { - return fake.AsyncTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.asyncTimeoutReturns return fakeReturns.result1 } @@ -692,15 +696,16 @@ func (fake *FakeRepository) AuthenticationEndpoint() string { ret, specificReturn := fake.authenticationEndpointReturnsOnCall[len(fake.authenticationEndpointArgsForCall)] fake.authenticationEndpointArgsForCall = append(fake.authenticationEndpointArgsForCall, struct { }{}) + stub := fake.AuthenticationEndpointStub + fakeReturns := fake.authenticationEndpointReturns fake.recordInvocation("AuthenticationEndpoint", []interface{}{}) fake.authenticationEndpointMutex.Unlock() - if fake.AuthenticationEndpointStub != nil { - return fake.AuthenticationEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.authenticationEndpointReturns return fakeReturns.result1 } @@ -744,15 +749,16 @@ func (fake *FakeRepository) CLIVersion() string { ret, specificReturn := fake.cLIVersionReturnsOnCall[len(fake.cLIVersionArgsForCall)] fake.cLIVersionArgsForCall = append(fake.cLIVersionArgsForCall, struct { }{}) + stub := fake.CLIVersionStub + fakeReturns := fake.cLIVersionReturns fake.recordInvocation("CLIVersion", []interface{}{}) fake.cLIVersionMutex.Unlock() - if fake.CLIVersionStub != nil { - return fake.CLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cLIVersionReturns return fakeReturns.result1 } @@ -795,9 +801,10 @@ func (fake *FakeRepository) ClearSession() { fake.clearSessionMutex.Lock() fake.clearSessionArgsForCall = append(fake.clearSessionArgsForCall, struct { }{}) + stub := fake.ClearSessionStub fake.recordInvocation("ClearSession", []interface{}{}) fake.clearSessionMutex.Unlock() - if fake.ClearSessionStub != nil { + if stub != nil { fake.ClearSessionStub() } } @@ -818,9 +825,10 @@ func (fake *FakeRepository) Close() { fake.closeMutex.Lock() fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { + if stub != nil { fake.CloseStub() } } @@ -842,15 +850,16 @@ func (fake *FakeRepository) ColorEnabled() string { ret, specificReturn := fake.colorEnabledReturnsOnCall[len(fake.colorEnabledArgsForCall)] fake.colorEnabledArgsForCall = append(fake.colorEnabledArgsForCall, struct { }{}) + stub := fake.ColorEnabledStub + fakeReturns := fake.colorEnabledReturns fake.recordInvocation("ColorEnabled", []interface{}{}) fake.colorEnabledMutex.Unlock() - if fake.ColorEnabledStub != nil { - return fake.ColorEnabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.colorEnabledReturns return fakeReturns.result1 } @@ -894,15 +903,16 @@ func (fake *FakeRepository) DopplerEndpoint() string { ret, specificReturn := fake.dopplerEndpointReturnsOnCall[len(fake.dopplerEndpointArgsForCall)] fake.dopplerEndpointArgsForCall = append(fake.dopplerEndpointArgsForCall, struct { }{}) + stub := fake.DopplerEndpointStub + fakeReturns := fake.dopplerEndpointReturns fake.recordInvocation("DopplerEndpoint", []interface{}{}) fake.dopplerEndpointMutex.Unlock() - if fake.DopplerEndpointStub != nil { - return fake.DopplerEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dopplerEndpointReturns return fakeReturns.result1 } @@ -946,15 +956,16 @@ func (fake *FakeRepository) HasAPIEndpoint() bool { ret, specificReturn := fake.hasAPIEndpointReturnsOnCall[len(fake.hasAPIEndpointArgsForCall)] fake.hasAPIEndpointArgsForCall = append(fake.hasAPIEndpointArgsForCall, struct { }{}) + stub := fake.HasAPIEndpointStub + fakeReturns := fake.hasAPIEndpointReturns fake.recordInvocation("HasAPIEndpoint", []interface{}{}) fake.hasAPIEndpointMutex.Unlock() - if fake.HasAPIEndpointStub != nil { - return fake.HasAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasAPIEndpointReturns return fakeReturns.result1 } @@ -998,15 +1009,16 @@ func (fake *FakeRepository) HasOrganization() bool { ret, specificReturn := fake.hasOrganizationReturnsOnCall[len(fake.hasOrganizationArgsForCall)] fake.hasOrganizationArgsForCall = append(fake.hasOrganizationArgsForCall, struct { }{}) + stub := fake.HasOrganizationStub + fakeReturns := fake.hasOrganizationReturns fake.recordInvocation("HasOrganization", []interface{}{}) fake.hasOrganizationMutex.Unlock() - if fake.HasOrganizationStub != nil { - return fake.HasOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasOrganizationReturns return fakeReturns.result1 } @@ -1050,15 +1062,16 @@ func (fake *FakeRepository) HasSpace() bool { ret, specificReturn := fake.hasSpaceReturnsOnCall[len(fake.hasSpaceArgsForCall)] fake.hasSpaceArgsForCall = append(fake.hasSpaceArgsForCall, struct { }{}) + stub := fake.HasSpaceStub + fakeReturns := fake.hasSpaceReturns fake.recordInvocation("HasSpace", []interface{}{}) fake.hasSpaceMutex.Unlock() - if fake.HasSpaceStub != nil { - return fake.HasSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.hasSpaceReturns return fakeReturns.result1 } @@ -1102,15 +1115,16 @@ func (fake *FakeRepository) IsLoggedIn() bool { ret, specificReturn := fake.isLoggedInReturnsOnCall[len(fake.isLoggedInArgsForCall)] fake.isLoggedInArgsForCall = append(fake.isLoggedInArgsForCall, struct { }{}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1 } @@ -1155,15 +1169,16 @@ func (fake *FakeRepository) IsMinAPIVersion(arg1 semver.Version) bool { fake.isMinAPIVersionArgsForCall = append(fake.isMinAPIVersionArgsForCall, struct { arg1 semver.Version }{arg1}) + stub := fake.IsMinAPIVersionStub + fakeReturns := fake.isMinAPIVersionReturns fake.recordInvocation("IsMinAPIVersion", []interface{}{arg1}) fake.isMinAPIVersionMutex.Unlock() - if fake.IsMinAPIVersionStub != nil { - return fake.IsMinAPIVersionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinAPIVersionReturns return fakeReturns.result1 } @@ -1215,15 +1230,16 @@ func (fake *FakeRepository) IsMinCLIVersion(arg1 string) bool { fake.isMinCLIVersionArgsForCall = append(fake.isMinCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.IsMinCLIVersionStub + fakeReturns := fake.isMinCLIVersionReturns fake.recordInvocation("IsMinCLIVersion", []interface{}{arg1}) fake.isMinCLIVersionMutex.Unlock() - if fake.IsMinCLIVersionStub != nil { - return fake.IsMinCLIVersionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinCLIVersionReturns return fakeReturns.result1 } @@ -1274,15 +1290,16 @@ func (fake *FakeRepository) IsSSLDisabled() bool { ret, specificReturn := fake.isSSLDisabledReturnsOnCall[len(fake.isSSLDisabledArgsForCall)] fake.isSSLDisabledArgsForCall = append(fake.isSSLDisabledArgsForCall, struct { }{}) + stub := fake.IsSSLDisabledStub + fakeReturns := fake.isSSLDisabledReturns fake.recordInvocation("IsSSLDisabled", []interface{}{}) fake.isSSLDisabledMutex.Unlock() - if fake.IsSSLDisabledStub != nil { - return fake.IsSSLDisabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isSSLDisabledReturns return fakeReturns.result1 } @@ -1326,15 +1343,16 @@ func (fake *FakeRepository) Locale() string { ret, specificReturn := fake.localeReturnsOnCall[len(fake.localeArgsForCall)] fake.localeArgsForCall = append(fake.localeArgsForCall, struct { }{}) + stub := fake.LocaleStub + fakeReturns := fake.localeReturns fake.recordInvocation("Locale", []interface{}{}) fake.localeMutex.Unlock() - if fake.LocaleStub != nil { - return fake.LocaleStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.localeReturns return fakeReturns.result1 } @@ -1378,15 +1396,16 @@ func (fake *FakeRepository) LogCacheEndpoint() string { ret, specificReturn := fake.logCacheEndpointReturnsOnCall[len(fake.logCacheEndpointArgsForCall)] fake.logCacheEndpointArgsForCall = append(fake.logCacheEndpointArgsForCall, struct { }{}) + stub := fake.LogCacheEndpointStub + fakeReturns := fake.logCacheEndpointReturns fake.recordInvocation("LogCacheEndpoint", []interface{}{}) fake.logCacheEndpointMutex.Unlock() - if fake.LogCacheEndpointStub != nil { - return fake.LogCacheEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.logCacheEndpointReturns return fakeReturns.result1 } @@ -1430,15 +1449,16 @@ func (fake *FakeRepository) MinCLIVersion() string { ret, specificReturn := fake.minCLIVersionReturnsOnCall[len(fake.minCLIVersionArgsForCall)] fake.minCLIVersionArgsForCall = append(fake.minCLIVersionArgsForCall, struct { }{}) + stub := fake.MinCLIVersionStub + fakeReturns := fake.minCLIVersionReturns fake.recordInvocation("MinCLIVersion", []interface{}{}) fake.minCLIVersionMutex.Unlock() - if fake.MinCLIVersionStub != nil { - return fake.MinCLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.minCLIVersionReturns return fakeReturns.result1 } @@ -1482,15 +1502,16 @@ func (fake *FakeRepository) MinRecommendedCLIVersion() string { ret, specificReturn := fake.minRecommendedCLIVersionReturnsOnCall[len(fake.minRecommendedCLIVersionArgsForCall)] fake.minRecommendedCLIVersionArgsForCall = append(fake.minRecommendedCLIVersionArgsForCall, struct { }{}) + stub := fake.MinRecommendedCLIVersionStub + fakeReturns := fake.minRecommendedCLIVersionReturns fake.recordInvocation("MinRecommendedCLIVersion", []interface{}{}) fake.minRecommendedCLIVersionMutex.Unlock() - if fake.MinRecommendedCLIVersionStub != nil { - return fake.MinRecommendedCLIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.minRecommendedCLIVersionReturns return fakeReturns.result1 } @@ -1534,15 +1555,16 @@ func (fake *FakeRepository) OrganizationFields() models.OrganizationFields { ret, specificReturn := fake.organizationFieldsReturnsOnCall[len(fake.organizationFieldsArgsForCall)] fake.organizationFieldsArgsForCall = append(fake.organizationFieldsArgsForCall, struct { }{}) + stub := fake.OrganizationFieldsStub + fakeReturns := fake.organizationFieldsReturns fake.recordInvocation("OrganizationFields", []interface{}{}) fake.organizationFieldsMutex.Unlock() - if fake.OrganizationFieldsStub != nil { - return fake.OrganizationFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.organizationFieldsReturns return fakeReturns.result1 } @@ -1586,15 +1608,16 @@ func (fake *FakeRepository) PluginRepos() []models.PluginRepo { ret, specificReturn := fake.pluginReposReturnsOnCall[len(fake.pluginReposArgsForCall)] fake.pluginReposArgsForCall = append(fake.pluginReposArgsForCall, struct { }{}) + stub := fake.PluginReposStub + fakeReturns := fake.pluginReposReturns fake.recordInvocation("PluginRepos", []interface{}{}) fake.pluginReposMutex.Unlock() - if fake.PluginReposStub != nil { - return fake.PluginReposStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginReposReturns return fakeReturns.result1 } @@ -1638,15 +1661,16 @@ func (fake *FakeRepository) RefreshToken() string { ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.refreshTokenReturns return fakeReturns.result1 } @@ -1690,15 +1714,16 @@ func (fake *FakeRepository) RoutingAPIEndpoint() string { ret, specificReturn := fake.routingAPIEndpointReturnsOnCall[len(fake.routingAPIEndpointArgsForCall)] fake.routingAPIEndpointArgsForCall = append(fake.routingAPIEndpointArgsForCall, struct { }{}) + stub := fake.RoutingAPIEndpointStub + fakeReturns := fake.routingAPIEndpointReturns fake.recordInvocation("RoutingAPIEndpoint", []interface{}{}) fake.routingAPIEndpointMutex.Unlock() - if fake.RoutingAPIEndpointStub != nil { - return fake.RoutingAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.routingAPIEndpointReturns return fakeReturns.result1 } @@ -1742,15 +1767,16 @@ func (fake *FakeRepository) SSHOAuthClient() string { ret, specificReturn := fake.sSHOAuthClientReturnsOnCall[len(fake.sSHOAuthClientArgsForCall)] fake.sSHOAuthClientArgsForCall = append(fake.sSHOAuthClientArgsForCall, struct { }{}) + stub := fake.SSHOAuthClientStub + fakeReturns := fake.sSHOAuthClientReturns fake.recordInvocation("SSHOAuthClient", []interface{}{}) fake.sSHOAuthClientMutex.Unlock() - if fake.SSHOAuthClientStub != nil { - return fake.SSHOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.sSHOAuthClientReturns return fakeReturns.result1 } @@ -1794,9 +1820,10 @@ func (fake *FakeRepository) SetAPIEndpoint(arg1 string) { fake.setAPIEndpointArgsForCall = append(fake.setAPIEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAPIEndpointStub fake.recordInvocation("SetAPIEndpoint", []interface{}{arg1}) fake.setAPIEndpointMutex.Unlock() - if fake.SetAPIEndpointStub != nil { + if stub != nil { fake.SetAPIEndpointStub(arg1) } } @@ -1825,9 +1852,10 @@ func (fake *FakeRepository) SetAPIVersion(arg1 string) { fake.setAPIVersionArgsForCall = append(fake.setAPIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAPIVersionStub fake.recordInvocation("SetAPIVersion", []interface{}{arg1}) fake.setAPIVersionMutex.Unlock() - if fake.SetAPIVersionStub != nil { + if stub != nil { fake.SetAPIVersionStub(arg1) } } @@ -1856,9 +1884,10 @@ func (fake *FakeRepository) SetAccessToken(arg1 string) { fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAccessTokenStub fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { + if stub != nil { fake.SetAccessTokenStub(arg1) } } @@ -1887,9 +1916,10 @@ func (fake *FakeRepository) SetAsyncTimeout(arg1 uint) { fake.setAsyncTimeoutArgsForCall = append(fake.setAsyncTimeoutArgsForCall, struct { arg1 uint }{arg1}) + stub := fake.SetAsyncTimeoutStub fake.recordInvocation("SetAsyncTimeout", []interface{}{arg1}) fake.setAsyncTimeoutMutex.Unlock() - if fake.SetAsyncTimeoutStub != nil { + if stub != nil { fake.SetAsyncTimeoutStub(arg1) } } @@ -1918,9 +1948,10 @@ func (fake *FakeRepository) SetAuthenticationEndpoint(arg1 string) { fake.setAuthenticationEndpointArgsForCall = append(fake.setAuthenticationEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetAuthenticationEndpointStub fake.recordInvocation("SetAuthenticationEndpoint", []interface{}{arg1}) fake.setAuthenticationEndpointMutex.Unlock() - if fake.SetAuthenticationEndpointStub != nil { + if stub != nil { fake.SetAuthenticationEndpointStub(arg1) } } @@ -1949,9 +1980,10 @@ func (fake *FakeRepository) SetCLIVersion(arg1 string) { fake.setCLIVersionArgsForCall = append(fake.setCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetCLIVersionStub fake.recordInvocation("SetCLIVersion", []interface{}{arg1}) fake.setCLIVersionMutex.Unlock() - if fake.SetCLIVersionStub != nil { + if stub != nil { fake.SetCLIVersionStub(arg1) } } @@ -1980,9 +2012,10 @@ func (fake *FakeRepository) SetColorEnabled(arg1 string) { fake.setColorEnabledArgsForCall = append(fake.setColorEnabledArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetColorEnabledStub fake.recordInvocation("SetColorEnabled", []interface{}{arg1}) fake.setColorEnabledMutex.Unlock() - if fake.SetColorEnabledStub != nil { + if stub != nil { fake.SetColorEnabledStub(arg1) } } @@ -2011,9 +2044,10 @@ func (fake *FakeRepository) SetDopplerEndpoint(arg1 string) { fake.setDopplerEndpointArgsForCall = append(fake.setDopplerEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetDopplerEndpointStub fake.recordInvocation("SetDopplerEndpoint", []interface{}{arg1}) fake.setDopplerEndpointMutex.Unlock() - if fake.SetDopplerEndpointStub != nil { + if stub != nil { fake.SetDopplerEndpointStub(arg1) } } @@ -2042,9 +2076,10 @@ func (fake *FakeRepository) SetLocale(arg1 string) { fake.setLocaleArgsForCall = append(fake.setLocaleArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetLocaleStub fake.recordInvocation("SetLocale", []interface{}{arg1}) fake.setLocaleMutex.Unlock() - if fake.SetLocaleStub != nil { + if stub != nil { fake.SetLocaleStub(arg1) } } @@ -2073,9 +2108,10 @@ func (fake *FakeRepository) SetLogCacheEndpoint(arg1 string) { fake.setLogCacheEndpointArgsForCall = append(fake.setLogCacheEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetLogCacheEndpointStub fake.recordInvocation("SetLogCacheEndpoint", []interface{}{arg1}) fake.setLogCacheEndpointMutex.Unlock() - if fake.SetLogCacheEndpointStub != nil { + if stub != nil { fake.SetLogCacheEndpointStub(arg1) } } @@ -2104,9 +2140,10 @@ func (fake *FakeRepository) SetMinCLIVersion(arg1 string) { fake.setMinCLIVersionArgsForCall = append(fake.setMinCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetMinCLIVersionStub fake.recordInvocation("SetMinCLIVersion", []interface{}{arg1}) fake.setMinCLIVersionMutex.Unlock() - if fake.SetMinCLIVersionStub != nil { + if stub != nil { fake.SetMinCLIVersionStub(arg1) } } @@ -2135,9 +2172,10 @@ func (fake *FakeRepository) SetMinRecommendedCLIVersion(arg1 string) { fake.setMinRecommendedCLIVersionArgsForCall = append(fake.setMinRecommendedCLIVersionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetMinRecommendedCLIVersionStub fake.recordInvocation("SetMinRecommendedCLIVersion", []interface{}{arg1}) fake.setMinRecommendedCLIVersionMutex.Unlock() - if fake.SetMinRecommendedCLIVersionStub != nil { + if stub != nil { fake.SetMinRecommendedCLIVersionStub(arg1) } } @@ -2166,9 +2204,10 @@ func (fake *FakeRepository) SetOrganizationFields(arg1 models.OrganizationFields fake.setOrganizationFieldsArgsForCall = append(fake.setOrganizationFieldsArgsForCall, struct { arg1 models.OrganizationFields }{arg1}) + stub := fake.SetOrganizationFieldsStub fake.recordInvocation("SetOrganizationFields", []interface{}{arg1}) fake.setOrganizationFieldsMutex.Unlock() - if fake.SetOrganizationFieldsStub != nil { + if stub != nil { fake.SetOrganizationFieldsStub(arg1) } } @@ -2197,9 +2236,10 @@ func (fake *FakeRepository) SetPluginRepo(arg1 models.PluginRepo) { fake.setPluginRepoArgsForCall = append(fake.setPluginRepoArgsForCall, struct { arg1 models.PluginRepo }{arg1}) + stub := fake.SetPluginRepoStub fake.recordInvocation("SetPluginRepo", []interface{}{arg1}) fake.setPluginRepoMutex.Unlock() - if fake.SetPluginRepoStub != nil { + if stub != nil { fake.SetPluginRepoStub(arg1) } } @@ -2228,9 +2268,10 @@ func (fake *FakeRepository) SetRefreshToken(arg1 string) { fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRefreshTokenStub fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { + if stub != nil { fake.SetRefreshTokenStub(arg1) } } @@ -2259,9 +2300,10 @@ func (fake *FakeRepository) SetRoutingAPIEndpoint(arg1 string) { fake.setRoutingAPIEndpointArgsForCall = append(fake.setRoutingAPIEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetRoutingAPIEndpointStub fake.recordInvocation("SetRoutingAPIEndpoint", []interface{}{arg1}) fake.setRoutingAPIEndpointMutex.Unlock() - if fake.SetRoutingAPIEndpointStub != nil { + if stub != nil { fake.SetRoutingAPIEndpointStub(arg1) } } @@ -2290,9 +2332,10 @@ func (fake *FakeRepository) SetSSHOAuthClient(arg1 string) { fake.setSSHOAuthClientArgsForCall = append(fake.setSSHOAuthClientArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetSSHOAuthClientStub fake.recordInvocation("SetSSHOAuthClient", []interface{}{arg1}) fake.setSSHOAuthClientMutex.Unlock() - if fake.SetSSHOAuthClientStub != nil { + if stub != nil { fake.SetSSHOAuthClientStub(arg1) } } @@ -2321,9 +2364,10 @@ func (fake *FakeRepository) SetSSLDisabled(arg1 bool) { fake.setSSLDisabledArgsForCall = append(fake.setSSLDisabledArgsForCall, struct { arg1 bool }{arg1}) + stub := fake.SetSSLDisabledStub fake.recordInvocation("SetSSLDisabled", []interface{}{arg1}) fake.setSSLDisabledMutex.Unlock() - if fake.SetSSLDisabledStub != nil { + if stub != nil { fake.SetSSLDisabledStub(arg1) } } @@ -2352,9 +2396,10 @@ func (fake *FakeRepository) SetSpaceFields(arg1 models.SpaceFields) { fake.setSpaceFieldsArgsForCall = append(fake.setSpaceFieldsArgsForCall, struct { arg1 models.SpaceFields }{arg1}) + stub := fake.SetSpaceFieldsStub fake.recordInvocation("SetSpaceFields", []interface{}{arg1}) fake.setSpaceFieldsMutex.Unlock() - if fake.SetSpaceFieldsStub != nil { + if stub != nil { fake.SetSpaceFieldsStub(arg1) } } @@ -2383,9 +2428,10 @@ func (fake *FakeRepository) SetTrace(arg1 string) { fake.setTraceArgsForCall = append(fake.setTraceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetTraceStub fake.recordInvocation("SetTrace", []interface{}{arg1}) fake.setTraceMutex.Unlock() - if fake.SetTraceStub != nil { + if stub != nil { fake.SetTraceStub(arg1) } } @@ -2414,9 +2460,10 @@ func (fake *FakeRepository) SetUAAGrantType(arg1 string) { fake.setUAAGrantTypeArgsForCall = append(fake.setUAAGrantTypeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAGrantTypeStub fake.recordInvocation("SetUAAGrantType", []interface{}{arg1}) fake.setUAAGrantTypeMutex.Unlock() - if fake.SetUAAGrantTypeStub != nil { + if stub != nil { fake.SetUAAGrantTypeStub(arg1) } } @@ -2445,9 +2492,10 @@ func (fake *FakeRepository) SetUAAOAuthClient(arg1 string) { fake.setUAAOAuthClientArgsForCall = append(fake.setUAAOAuthClientArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAOAuthClientStub fake.recordInvocation("SetUAAOAuthClient", []interface{}{arg1}) fake.setUAAOAuthClientMutex.Unlock() - if fake.SetUAAOAuthClientStub != nil { + if stub != nil { fake.SetUAAOAuthClientStub(arg1) } } @@ -2476,9 +2524,10 @@ func (fake *FakeRepository) SetUAAOAuthClientSecret(arg1 string) { fake.setUAAOAuthClientSecretArgsForCall = append(fake.setUAAOAuthClientSecretArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUAAOAuthClientSecretStub fake.recordInvocation("SetUAAOAuthClientSecret", []interface{}{arg1}) fake.setUAAOAuthClientSecretMutex.Unlock() - if fake.SetUAAOAuthClientSecretStub != nil { + if stub != nil { fake.SetUAAOAuthClientSecretStub(arg1) } } @@ -2507,9 +2556,10 @@ func (fake *FakeRepository) SetUaaEndpoint(arg1 string) { fake.setUaaEndpointArgsForCall = append(fake.setUaaEndpointArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetUaaEndpointStub fake.recordInvocation("SetUaaEndpoint", []interface{}{arg1}) fake.setUaaEndpointMutex.Unlock() - if fake.SetUaaEndpointStub != nil { + if stub != nil { fake.SetUaaEndpointStub(arg1) } } @@ -2538,15 +2588,16 @@ func (fake *FakeRepository) SpaceFields() models.SpaceFields { ret, specificReturn := fake.spaceFieldsReturnsOnCall[len(fake.spaceFieldsArgsForCall)] fake.spaceFieldsArgsForCall = append(fake.spaceFieldsArgsForCall, struct { }{}) + stub := fake.SpaceFieldsStub + fakeReturns := fake.spaceFieldsReturns fake.recordInvocation("SpaceFields", []interface{}{}) fake.spaceFieldsMutex.Unlock() - if fake.SpaceFieldsStub != nil { - return fake.SpaceFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.spaceFieldsReturns return fakeReturns.result1 } @@ -2590,15 +2641,16 @@ func (fake *FakeRepository) Trace() string { ret, specificReturn := fake.traceReturnsOnCall[len(fake.traceArgsForCall)] fake.traceArgsForCall = append(fake.traceArgsForCall, struct { }{}) + stub := fake.TraceStub + fakeReturns := fake.traceReturns fake.recordInvocation("Trace", []interface{}{}) fake.traceMutex.Unlock() - if fake.TraceStub != nil { - return fake.TraceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.traceReturns return fakeReturns.result1 } @@ -2642,15 +2694,16 @@ func (fake *FakeRepository) UAAGrantType() string { ret, specificReturn := fake.uAAGrantTypeReturnsOnCall[len(fake.uAAGrantTypeArgsForCall)] fake.uAAGrantTypeArgsForCall = append(fake.uAAGrantTypeArgsForCall, struct { }{}) + stub := fake.UAAGrantTypeStub + fakeReturns := fake.uAAGrantTypeReturns fake.recordInvocation("UAAGrantType", []interface{}{}) fake.uAAGrantTypeMutex.Unlock() - if fake.UAAGrantTypeStub != nil { - return fake.UAAGrantTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAGrantTypeReturns return fakeReturns.result1 } @@ -2694,15 +2747,16 @@ func (fake *FakeRepository) UAAOAuthClient() string { ret, specificReturn := fake.uAAOAuthClientReturnsOnCall[len(fake.uAAOAuthClientArgsForCall)] fake.uAAOAuthClientArgsForCall = append(fake.uAAOAuthClientArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientStub + fakeReturns := fake.uAAOAuthClientReturns fake.recordInvocation("UAAOAuthClient", []interface{}{}) fake.uAAOAuthClientMutex.Unlock() - if fake.UAAOAuthClientStub != nil { - return fake.UAAOAuthClientStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientReturns return fakeReturns.result1 } @@ -2746,15 +2800,16 @@ func (fake *FakeRepository) UAAOAuthClientSecret() string { ret, specificReturn := fake.uAAOAuthClientSecretReturnsOnCall[len(fake.uAAOAuthClientSecretArgsForCall)] fake.uAAOAuthClientSecretArgsForCall = append(fake.uAAOAuthClientSecretArgsForCall, struct { }{}) + stub := fake.UAAOAuthClientSecretStub + fakeReturns := fake.uAAOAuthClientSecretReturns fake.recordInvocation("UAAOAuthClientSecret", []interface{}{}) fake.uAAOAuthClientSecretMutex.Unlock() - if fake.UAAOAuthClientSecretStub != nil { - return fake.UAAOAuthClientSecretStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAOAuthClientSecretReturns return fakeReturns.result1 } @@ -2798,15 +2853,16 @@ func (fake *FakeRepository) UaaEndpoint() string { ret, specificReturn := fake.uaaEndpointReturnsOnCall[len(fake.uaaEndpointArgsForCall)] fake.uaaEndpointArgsForCall = append(fake.uaaEndpointArgsForCall, struct { }{}) + stub := fake.UaaEndpointStub + fakeReturns := fake.uaaEndpointReturns fake.recordInvocation("UaaEndpoint", []interface{}{}) fake.uaaEndpointMutex.Unlock() - if fake.UaaEndpointStub != nil { - return fake.UaaEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uaaEndpointReturns return fakeReturns.result1 } @@ -2850,9 +2906,10 @@ func (fake *FakeRepository) UnSetPluginRepo(arg1 int) { fake.unSetPluginRepoArgsForCall = append(fake.unSetPluginRepoArgsForCall, struct { arg1 int }{arg1}) + stub := fake.UnSetPluginRepoStub fake.recordInvocation("UnSetPluginRepo", []interface{}{arg1}) fake.unSetPluginRepoMutex.Unlock() - if fake.UnSetPluginRepoStub != nil { + if stub != nil { fake.UnSetPluginRepoStub(arg1) } } @@ -2881,15 +2938,16 @@ func (fake *FakeRepository) UserEmail() string { ret, specificReturn := fake.userEmailReturnsOnCall[len(fake.userEmailArgsForCall)] fake.userEmailArgsForCall = append(fake.userEmailArgsForCall, struct { }{}) + stub := fake.UserEmailStub + fakeReturns := fake.userEmailReturns fake.recordInvocation("UserEmail", []interface{}{}) fake.userEmailMutex.Unlock() - if fake.UserEmailStub != nil { - return fake.UserEmailStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.userEmailReturns return fakeReturns.result1 } @@ -2933,15 +2991,16 @@ func (fake *FakeRepository) UserGUID() string { ret, specificReturn := fake.userGUIDReturnsOnCall[len(fake.userGUIDArgsForCall)] fake.userGUIDArgsForCall = append(fake.userGUIDArgsForCall, struct { }{}) + stub := fake.UserGUIDStub + fakeReturns := fake.userGUIDReturns fake.recordInvocation("UserGUID", []interface{}{}) fake.userGUIDMutex.Unlock() - if fake.UserGUIDStub != nil { - return fake.UserGUIDStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.userGUIDReturns return fakeReturns.result1 } @@ -2985,15 +3044,16 @@ func (fake *FakeRepository) Username() string { ret, specificReturn := fake.usernameReturnsOnCall[len(fake.usernameArgsForCall)] fake.usernameArgsForCall = append(fake.usernameArgsForCall, struct { }{}) + stub := fake.UsernameStub + fakeReturns := fake.usernameReturns fake.recordInvocation("Username", []interface{}{}) fake.usernameMutex.Unlock() - if fake.UsernameStub != nil { - return fake.UsernameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.usernameReturns return fakeReturns.result1 } diff --git a/cf/configuration/pluginconfig/plugin_config.go b/cf/configuration/pluginconfig/plugin_config.go index ae82e07547..00163ea541 100644 --- a/cf/configuration/pluginconfig/plugin_config.go +++ b/cf/configuration/pluginconfig/plugin_config.go @@ -3,7 +3,7 @@ package pluginconfig import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginConfiguration diff --git a/cf/configuration/pluginconfig/plugin_config_test.go b/cf/configuration/pluginconfig/plugin_config_test.go index 1501c8f67b..a92ede57b6 100644 --- a/cf/configuration/pluginconfig/plugin_config_test.go +++ b/cf/configuration/pluginconfig/plugin_config_test.go @@ -5,12 +5,12 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/configuration" - "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" - . "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + . "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/plugin" - "code.cloudfoundry.org/cli/v8/cf/configuration/configurationfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/configurationfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/pluginconfig/plugin_data.go b/cf/configuration/pluginconfig/plugin_data.go index a08bc3c81e..81354f9ae5 100644 --- a/cf/configuration/pluginconfig/plugin_data.go +++ b/cf/configuration/pluginconfig/plugin_data.go @@ -3,7 +3,7 @@ package pluginconfig import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type PluginData struct { diff --git a/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go b/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go index d3978c6208..856e4bb9ac 100644 --- a/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go +++ b/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go @@ -4,7 +4,7 @@ package pluginconfigfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" ) type FakePluginConfiguration struct { @@ -58,15 +58,16 @@ func (fake *FakePluginConfiguration) GetPluginPath() string { ret, specificReturn := fake.getPluginPathReturnsOnCall[len(fake.getPluginPathArgsForCall)] fake.getPluginPathArgsForCall = append(fake.getPluginPathArgsForCall, struct { }{}) + stub := fake.GetPluginPathStub + fakeReturns := fake.getPluginPathReturns fake.recordInvocation("GetPluginPath", []interface{}{}) fake.getPluginPathMutex.Unlock() - if fake.GetPluginPathStub != nil { - return fake.GetPluginPathStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getPluginPathReturns return fakeReturns.result1 } @@ -110,15 +111,16 @@ func (fake *FakePluginConfiguration) ListCommands() []string { ret, specificReturn := fake.listCommandsReturnsOnCall[len(fake.listCommandsArgsForCall)] fake.listCommandsArgsForCall = append(fake.listCommandsArgsForCall, struct { }{}) + stub := fake.ListCommandsStub + fakeReturns := fake.listCommandsReturns fake.recordInvocation("ListCommands", []interface{}{}) fake.listCommandsMutex.Unlock() - if fake.ListCommandsStub != nil { - return fake.ListCommandsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.listCommandsReturns return fakeReturns.result1 } @@ -162,15 +164,16 @@ func (fake *FakePluginConfiguration) Plugins() map[string]pluginconfig.PluginMet ret, specificReturn := fake.pluginsReturnsOnCall[len(fake.pluginsArgsForCall)] fake.pluginsArgsForCall = append(fake.pluginsArgsForCall, struct { }{}) + stub := fake.PluginsStub + fakeReturns := fake.pluginsReturns fake.recordInvocation("Plugins", []interface{}{}) fake.pluginsMutex.Unlock() - if fake.PluginsStub != nil { - return fake.PluginsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.pluginsReturns return fakeReturns.result1 } @@ -214,9 +217,10 @@ func (fake *FakePluginConfiguration) RemovePlugin(arg1 string) { fake.removePluginArgsForCall = append(fake.removePluginArgsForCall, struct { arg1 string }{arg1}) + stub := fake.RemovePluginStub fake.recordInvocation("RemovePlugin", []interface{}{arg1}) fake.removePluginMutex.Unlock() - if fake.RemovePluginStub != nil { + if stub != nil { fake.RemovePluginStub(arg1) } } @@ -246,9 +250,10 @@ func (fake *FakePluginConfiguration) SetPlugin(arg1 string, arg2 pluginconfig.Pl arg1 string arg2 pluginconfig.PluginMetadata }{arg1, arg2}) + stub := fake.SetPluginStub fake.recordInvocation("SetPlugin", []interface{}{arg1, arg2}) fake.setPluginMutex.Unlock() - if fake.SetPluginStub != nil { + if stub != nil { fake.SetPluginStub(arg1, arg2) } } diff --git a/cf/errors/access_denied_error.go b/cf/errors/access_denied_error.go index 1d0f755b4e..1088d9b83b 100644 --- a/cf/errors/access_denied_error.go +++ b/cf/errors/access_denied_error.go @@ -1,6 +1,6 @@ package errors -import . "code.cloudfoundry.org/cli/v8/cf/i18n" +import . "code.cloudfoundry.org/cli/v9/cf/i18n" type AccessDeniedError struct { } diff --git a/cf/errors/ambiguous_model_error.go b/cf/errors/ambiguous_model_error.go index 03057eee08..850130c247 100644 --- a/cf/errors/ambiguous_model_error.go +++ b/cf/errors/ambiguous_model_error.go @@ -3,7 +3,7 @@ package errors import ( "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type AmbiguousModelError struct { diff --git a/cf/errors/curl_http_error.go b/cf/errors/curl_http_error.go index 15894557eb..d2bef652a4 100644 --- a/cf/errors/curl_http_error.go +++ b/cf/errors/curl_http_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type CurlHTTPError struct { diff --git a/cf/errors/empty_dir_error.go b/cf/errors/empty_dir_error.go index 86e270f191..d829cc54ea 100644 --- a/cf/errors/empty_dir_error.go +++ b/cf/errors/empty_dir_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type EmptyDirError struct { diff --git a/cf/errors/errorsfakes/fake_httperror.go b/cf/errors/errorsfakes/fake_httperror.go index fef573f67b..767724a9cf 100644 --- a/cf/errors/errorsfakes/fake_httperror.go +++ b/cf/errors/errorsfakes/fake_httperror.go @@ -4,7 +4,7 @@ package errorsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/errors" ) type FakeHTTPError struct { @@ -47,15 +47,16 @@ func (fake *FakeHTTPError) Error() string { ret, specificReturn := fake.errorReturnsOnCall[len(fake.errorArgsForCall)] fake.errorArgsForCall = append(fake.errorArgsForCall, struct { }{}) + stub := fake.ErrorStub + fakeReturns := fake.errorReturns fake.recordInvocation("Error", []interface{}{}) fake.errorMutex.Unlock() - if fake.ErrorStub != nil { - return fake.ErrorStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.errorReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeHTTPError) ErrorCode() string { ret, specificReturn := fake.errorCodeReturnsOnCall[len(fake.errorCodeArgsForCall)] fake.errorCodeArgsForCall = append(fake.errorCodeArgsForCall, struct { }{}) + stub := fake.ErrorCodeStub + fakeReturns := fake.errorCodeReturns fake.recordInvocation("ErrorCode", []interface{}{}) fake.errorCodeMutex.Unlock() - if fake.ErrorCodeStub != nil { - return fake.ErrorCodeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.errorCodeReturns return fakeReturns.result1 } @@ -151,15 +153,16 @@ func (fake *FakeHTTPError) StatusCode() int { ret, specificReturn := fake.statusCodeReturnsOnCall[len(fake.statusCodeArgsForCall)] fake.statusCodeArgsForCall = append(fake.statusCodeArgsForCall, struct { }{}) + stub := fake.StatusCodeStub + fakeReturns := fake.statusCodeReturns fake.recordInvocation("StatusCode", []interface{}{}) fake.statusCodeMutex.Unlock() - if fake.StatusCodeStub != nil { - return fake.StatusCodeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.statusCodeReturns return fakeReturns.result1 } diff --git a/cf/errors/gateway_error.go b/cf/errors/gateway_error.go index c0a19243ac..090a34925b 100644 --- a/cf/errors/gateway_error.go +++ b/cf/errors/gateway_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type AsyncTimeoutError struct { diff --git a/cf/errors/http_error.go b/cf/errors/http_error.go index 9979923dfd..d4fd145ddc 100644 --- a/cf/errors/http_error.go +++ b/cf/errors/http_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . HTTPError diff --git a/cf/errors/invalid_ssl_cert_error.go b/cf/errors/invalid_ssl_cert_error.go index 61880c1ded..8c241e1fc4 100644 --- a/cf/errors/invalid_ssl_cert_error.go +++ b/cf/errors/invalid_ssl_cert_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type InvalidSSLCert struct { diff --git a/cf/errors/invalid_token_error.go b/cf/errors/invalid_token_error.go index 8b9a438655..4d410f637a 100644 --- a/cf/errors/invalid_token_error.go +++ b/cf/errors/invalid_token_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type InvalidTokenError struct { diff --git a/cf/errors/model_already_exists_error.go b/cf/errors/model_already_exists_error.go index 904d4e7370..35916127cc 100644 --- a/cf/errors/model_already_exists_error.go +++ b/cf/errors/model_already_exists_error.go @@ -3,7 +3,7 @@ package errors import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ModelAlreadyExistsError struct { diff --git a/cf/errors/model_not_found_error.go b/cf/errors/model_not_found_error.go index 0ca7acf811..79616cfb02 100644 --- a/cf/errors/model_not_found_error.go +++ b/cf/errors/model_not_found_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ModelNotFoundError struct { diff --git a/cf/errors/not_authorized_error.go b/cf/errors/not_authorized_error.go index af012463d6..1d60c99a5e 100644 --- a/cf/errors/not_authorized_error.go +++ b/cf/errors/not_authorized_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type NotAuthorizedError struct { diff --git a/cf/errors/service_association_error.go b/cf/errors/service_association_error.go index c0d5d2b2cc..fb93eb9f0b 100644 --- a/cf/errors/service_association_error.go +++ b/cf/errors/service_association_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type ServiceAssociationError struct { diff --git a/cf/errors/unbindable_service_error.go b/cf/errors/unbindable_service_error.go index 9564a7dc74..b99d177ee7 100644 --- a/cf/errors/unbindable_service_error.go +++ b/cf/errors/unbindable_service_error.go @@ -1,7 +1,7 @@ package errors import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type UnbindableServiceError struct { diff --git a/cf/flagcontext/flag_content_helper_test.go b/cf/flagcontext/flag_content_helper_test.go index 65b1fd8ea8..a8a113448f 100644 --- a/cf/flagcontext/flag_content_helper_test.go +++ b/cf/flagcontext/flag_content_helper_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/cf/flagcontext" + "code.cloudfoundry.org/cli/v9/cf/flagcontext" "code.cloudfoundry.org/gofileutils/fileutils" . "github.com/onsi/ginkgo/v2" diff --git a/cf/flags/flag_constructor_test.go b/cf/flags/flag_constructor_test.go index ca5b124029..653aaee211 100644 --- a/cf/flags/flag_constructor_test.go +++ b/cf/flags/flag_constructor_test.go @@ -1,7 +1,7 @@ package flags_test import ( - "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/flags/flags_test.go b/cf/flags/flags_test.go index fb6545a891..683a00b673 100644 --- a/cf/flags/flags_test.go +++ b/cf/flags/flags_test.go @@ -1,7 +1,7 @@ package flags_test import ( - "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" . "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 27650bd950..de961cfafe 100644 --- a/cf/flags/flags_usage_test.go +++ b/cf/flags/flags_usage_test.go @@ -3,7 +3,7 @@ package flags_test import ( "strings" - "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bools.go b/cf/formatters/bools.go index 9866429469..7794fbda96 100644 --- a/cf/formatters/bools.go +++ b/cf/formatters/bools.go @@ -1,7 +1,7 @@ package formatters import ( - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) func Allowed(allowed bool) string { diff --git a/cf/formatters/bools_test.go b/cf/formatters/bools_test.go index 183b468b8b..e7ecab04c9 100644 --- a/cf/formatters/bools_test.go +++ b/cf/formatters/bools_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bytes.go b/cf/formatters/bytes.go index 50a360564c..5b055b32fe 100644 --- a/cf/formatters/bytes.go +++ b/cf/formatters/bytes.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) const ( diff --git a/cf/formatters/bytes_test.go b/cf/formatters/bytes_test.go index 45c34645ee..c93c9ebab5 100644 --- a/cf/formatters/bytes_test.go +++ b/cf/formatters/bytes_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/formatters" . "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 79753b0e76..db05513181 100644 --- a/cf/formatters/formatters_suite_test.go +++ b/cf/formatters/formatters_suite_test.go @@ -1,8 +1,8 @@ package formatters_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/formatters/memoryLimit_test.go b/cf/formatters/memoryLimit_test.go index 5a1cb3233e..71b094d93e 100644 --- a/cf/formatters/memoryLimit_test.go +++ b/cf/formatters/memoryLimit_test.go @@ -1,7 +1,7 @@ package formatters_test import ( - . "code.cloudfoundry.org/cli/v8/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/help/help.go b/cf/help/help.go index 7f243e4963..bb4bbfc5a2 100644 --- a/cf/help/help.go +++ b/cf/help/help.go @@ -11,13 +11,13 @@ import ( "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration" - "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/version" ) type appPresenter struct { diff --git a/cf/help/help_suite_test.go b/cf/help/help_suite_test.go index c05359e640..35ab16df69 100644 --- a/cf/help/help_suite_test.go +++ b/cf/help/help_suite_test.go @@ -1,7 +1,7 @@ package help_test import ( - "code.cloudfoundry.org/cli/v8/cf/commandsloader" + "code.cloudfoundry.org/cli/v9/cf/commandsloader" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/help/help_test.go b/cf/help/help_test.go index 407f5ab380..378574b431 100644 --- a/cf/help/help_test.go +++ b/cf/help/help_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/confighelpers" - "code.cloudfoundry.org/cli/v8/cf/help" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v9/cf/help" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/io" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/io" "os" diff --git a/cf/help/template.go b/cf/help/template.go index f4b57044ec..230c61309e 100644 --- a/cf/help/template.go +++ b/cf/help/template.go @@ -1,6 +1,6 @@ package help -import . "code.cloudfoundry.org/cli/v8/cf/i18n" +import . "code.cloudfoundry.org/cli/v9/cf/i18n" func GetHelpTemplate() string { return `{{.Title "` + T("NAME:") + `"}} diff --git a/cf/i18n/i18n.go b/cf/i18n/i18n.go index 7d680aa6a5..f1f977f1c1 100644 --- a/cf/i18n/i18n.go +++ b/cf/i18n/i18n.go @@ -1,6 +1,6 @@ package i18n -import "code.cloudfoundry.org/cli/v8/util/ui" +import "code.cloudfoundry.org/cli/v9/util/ui" var T ui.TranslateFunc diff --git a/cf/i18n/locale.go b/cf/i18n/locale.go index 1db267f2b2..cf4b633b79 100644 --- a/cf/i18n/locale.go +++ b/cf/i18n/locale.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "code.cloudfoundry.org/cli/v8/i18n/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/i18n/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) const resourceSuffix = ".all.json" diff --git a/cf/i18n/locale_test.go b/cf/i18n/locale_test.go index 9e1242bac0..792bbc292d 100644 --- a/cf/i18n/locale_test.go +++ b/cf/i18n/locale_test.go @@ -1,7 +1,7 @@ package i18n_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/manifest/generate_manifest.go b/cf/manifest/generate_manifest.go index 2667468a86..a219702600 100644 --- a/cf/manifest/generate_manifest.go +++ b/cf/manifest/generate_manifest.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" "gopkg.in/yaml.v2" "io" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . App diff --git a/cf/manifest/generate_manifest_test.go b/cf/manifest/generate_manifest_test.go index 609e37fdc0..677b1b0846 100644 --- a/cf/manifest/generate_manifest_test.go +++ b/cf/manifest/generate_manifest_test.go @@ -5,7 +5,7 @@ import ( "bytes" - . "code.cloudfoundry.org/cli/v8/cf/manifest" + . "code.cloudfoundry.org/cli/v9/cf/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/manifest/manifest.go b/cf/manifest/manifest.go index 5b363c80fe..c46e1022cd 100644 --- a/cf/manifest/manifest.go +++ b/cf/manifest/manifest.go @@ -7,12 +7,12 @@ import ( "regexp" "strconv" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/util/generic" - "code.cloudfoundry.org/cli/v8/util/randomword" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/util/generic" + "code.cloudfoundry.org/cli/v9/util/randomword" ) type Manifest struct { diff --git a/cf/manifest/manifest_disk_repository.go b/cf/manifest/manifest_disk_repository.go index 711e13ad18..3fee79ffca 100644 --- a/cf/manifest/manifest_disk_repository.go +++ b/cf/manifest/manifest_disk_repository.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/util/generic" "gopkg.in/yaml.v2" ) diff --git a/cf/manifest/manifest_disk_repository_test.go b/cf/manifest/manifest_disk_repository_test.go index f1a5cc95cd..9b042a809b 100644 --- a/cf/manifest/manifest_disk_repository_test.go +++ b/cf/manifest/manifest_disk_repository_test.go @@ -3,7 +3,7 @@ package manifest_test import ( "path/filepath" - . "code.cloudfoundry.org/cli/v8/cf/manifest" + . "code.cloudfoundry.org/cli/v9/cf/manifest" . "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 6568217197..6c2a4b06f2 100644 --- a/cf/manifest/manifest_suite_test.go +++ b/cf/manifest/manifest_suite_test.go @@ -1,8 +1,8 @@ package manifest_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/manifest/manifest_test.go b/cf/manifest/manifest_test.go index 24111d6023..e0323834d0 100644 --- a/cf/manifest/manifest_test.go +++ b/cf/manifest/manifest_test.go @@ -4,12 +4,12 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/v8/cf/manifest" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" ) func NewManifest(path string, data generic.Map) (m *manifest.Manifest) { diff --git a/cf/manifest/manifestfakes/fake_app.go b/cf/manifest/manifestfakes/fake_app.go index dba3ad5bb8..cef2683b36 100644 --- a/cf/manifest/manifestfakes/fake_app.go +++ b/cf/manifest/manifestfakes/fake_app.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/cf/manifest" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/models" ) type FakeApp struct { @@ -117,9 +117,10 @@ func (fake *FakeApp) BuildpackURL(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.BuildpackURLStub fake.recordInvocation("BuildpackURL", []interface{}{arg1, arg2}) fake.buildpackURLMutex.Unlock() - if fake.BuildpackURLStub != nil { + if stub != nil { fake.BuildpackURLStub(arg1, arg2) } } @@ -149,9 +150,10 @@ func (fake *FakeApp) DiskQuota(arg1 string, arg2 int64) { arg1 string arg2 int64 }{arg1, arg2}) + stub := fake.DiskQuotaStub fake.recordInvocation("DiskQuota", []interface{}{arg1, arg2}) fake.diskQuotaMutex.Unlock() - if fake.DiskQuotaStub != nil { + if stub != nil { fake.DiskQuotaStub(arg1, arg2) } } @@ -182,9 +184,10 @@ func (fake *FakeApp) EnvironmentVars(arg1 string, arg2 string, arg3 string) { arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.EnvironmentVarsStub fake.recordInvocation("EnvironmentVars", []interface{}{arg1, arg2, arg3}) fake.environmentVarsMutex.Unlock() - if fake.EnvironmentVarsStub != nil { + if stub != nil { fake.EnvironmentVarsStub(arg1, arg2, arg3) } } @@ -213,15 +216,16 @@ func (fake *FakeApp) GetContents() []models.Application { ret, specificReturn := fake.getContentsReturnsOnCall[len(fake.getContentsArgsForCall)] fake.getContentsArgsForCall = append(fake.getContentsArgsForCall, struct { }{}) + stub := fake.GetContentsStub + fakeReturns := fake.getContentsReturns fake.recordInvocation("GetContents", []interface{}{}) fake.getContentsMutex.Unlock() - if fake.GetContentsStub != nil { - return fake.GetContentsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getContentsReturns return fakeReturns.result1 } @@ -266,9 +270,10 @@ func (fake *FakeApp) HealthCheckHTTPEndpoint(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.HealthCheckHTTPEndpointStub fake.recordInvocation("HealthCheckHTTPEndpoint", []interface{}{arg1, arg2}) fake.healthCheckHTTPEndpointMutex.Unlock() - if fake.HealthCheckHTTPEndpointStub != nil { + if stub != nil { fake.HealthCheckHTTPEndpointStub(arg1, arg2) } } @@ -298,9 +303,10 @@ func (fake *FakeApp) HealthCheckTimeout(arg1 string, arg2 int) { arg1 string arg2 int }{arg1, arg2}) + stub := fake.HealthCheckTimeoutStub fake.recordInvocation("HealthCheckTimeout", []interface{}{arg1, arg2}) fake.healthCheckTimeoutMutex.Unlock() - if fake.HealthCheckTimeoutStub != nil { + if stub != nil { fake.HealthCheckTimeoutStub(arg1, arg2) } } @@ -330,9 +336,10 @@ func (fake *FakeApp) HealthCheckType(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.HealthCheckTypeStub fake.recordInvocation("HealthCheckType", []interface{}{arg1, arg2}) fake.healthCheckTypeMutex.Unlock() - if fake.HealthCheckTypeStub != nil { + if stub != nil { fake.HealthCheckTypeStub(arg1, arg2) } } @@ -362,9 +369,10 @@ func (fake *FakeApp) Instances(arg1 string, arg2 int) { arg1 string arg2 int }{arg1, arg2}) + stub := fake.InstancesStub fake.recordInvocation("Instances", []interface{}{arg1, arg2}) fake.instancesMutex.Unlock() - if fake.InstancesStub != nil { + if stub != nil { fake.InstancesStub(arg1, arg2) } } @@ -394,9 +402,10 @@ func (fake *FakeApp) Memory(arg1 string, arg2 int64) { arg1 string arg2 int64 }{arg1, arg2}) + stub := fake.MemoryStub fake.recordInvocation("Memory", []interface{}{arg1, arg2}) fake.memoryMutex.Unlock() - if fake.MemoryStub != nil { + if stub != nil { fake.MemoryStub(arg1, arg2) } } @@ -429,9 +438,10 @@ func (fake *FakeApp) Route(arg1 string, arg2 string, arg3 string, arg4 string, a arg4 string arg5 int }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.RouteStub fake.recordInvocation("Route", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.routeMutex.Unlock() - if fake.RouteStub != nil { + if stub != nil { fake.RouteStub(arg1, arg2, arg3, arg4, arg5) } } @@ -461,15 +471,16 @@ func (fake *FakeApp) Save(arg1 io.Writer) error { fake.saveArgsForCall = append(fake.saveArgsForCall, struct { arg1 io.Writer }{arg1}) + stub := fake.SaveStub + fakeReturns := fake.saveReturns fake.recordInvocation("Save", []interface{}{arg1}) fake.saveMutex.Unlock() - if fake.SaveStub != nil { - return fake.SaveStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.saveReturns return fakeReturns.result1 } @@ -521,9 +532,10 @@ func (fake *FakeApp) Service(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.ServiceStub fake.recordInvocation("Service", []interface{}{arg1, arg2}) fake.serviceMutex.Unlock() - if fake.ServiceStub != nil { + if stub != nil { fake.ServiceStub(arg1, arg2) } } @@ -553,9 +565,10 @@ func (fake *FakeApp) Stack(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.StackStub fake.recordInvocation("Stack", []interface{}{arg1, arg2}) fake.stackMutex.Unlock() - if fake.StackStub != nil { + if stub != nil { fake.StackStub(arg1, arg2) } } @@ -585,9 +598,10 @@ func (fake *FakeApp) StartCommand(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.StartCommandStub fake.recordInvocation("StartCommand", []interface{}{arg1, arg2}) fake.startCommandMutex.Unlock() - if fake.StartCommandStub != nil { + if stub != nil { fake.StartCommandStub(arg1, arg2) } } diff --git a/cf/manifest/manifestfakes/fake_repository.go b/cf/manifest/manifestfakes/fake_repository.go index e1783a74de..20580116a7 100644 --- a/cf/manifest/manifestfakes/fake_repository.go +++ b/cf/manifest/manifestfakes/fake_repository.go @@ -4,7 +4,7 @@ package manifestfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/manifest" + "code.cloudfoundry.org/cli/v9/cf/manifest" ) type FakeRepository struct { @@ -31,15 +31,16 @@ func (fake *FakeRepository) ReadManifest(arg1 string) (*manifest.Manifest, error fake.readManifestArgsForCall = append(fake.readManifestArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ReadManifestStub + fakeReturns := fake.readManifestReturns fake.recordInvocation("ReadManifest", []interface{}{arg1}) fake.readManifestMutex.Unlock() - if fake.ReadManifestStub != nil { - return fake.ReadManifestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.readManifestReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/models/application_test.go b/cf/models/application_test.go index 4fe59542b6..d31897b2ea 100644 --- a/cf/models/application_test.go +++ b/cf/models/application_test.go @@ -3,7 +3,7 @@ package models_test import ( "os" - . "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/domain_test.go b/cf/models/domain_test.go index e270b3bff1..4084388dbd 100644 --- a/cf/models/domain_test.go +++ b/cf/models/domain_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/route_summary_test.go b/cf/models/route_summary_test.go index 33ae0c7451..a943f7d474 100644 --- a/cf/models/route_summary_test.go +++ b/cf/models/route_summary_test.go @@ -1,7 +1,7 @@ package models_test import ( - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/models/route_test.go b/cf/models/route_test.go index a93e1d27ea..04b32375f4 100644 --- a/cf/models/route_test.go +++ b/cf/models/route_test.go @@ -1,7 +1,7 @@ package models_test import ( - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/models" . "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 ed211b871d..88fc2b87f0 100644 --- a/cf/models/service_instance_test.go +++ b/cf/models/service_instance_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/models" . "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 c666483340..002a84ae18 100644 --- a/cf/models/service_plan_test.go +++ b/cf/models/service_plan_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "code.cloudfoundry.org/cli/v8/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/space_quota.go b/cf/models/space_quota.go index 8b2adcc063..5a83cc5a6d 100644 --- a/cf/models/space_quota.go +++ b/cf/models/space_quota.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strconv" - "code.cloudfoundry.org/cli/v8/cf/formatters" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/formatters" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type SpaceQuota struct { diff --git a/cf/net/cloud_controller_gateway.go b/cf/net/cloud_controller_gateway.go index 6ca8581d8b..9222511d71 100644 --- a/cf/net/cloud_controller_gateway.go +++ b/cf/net/cloud_controller_gateway.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type ccErrorResponse struct { diff --git a/cf/net/cloud_controller_gateway_test.go b/cf/net/cloud_controller_gateway_test.go index a43863ea52..37c6ac1ca3 100644 --- a/cf/net/cloud_controller_gateway_test.go +++ b/cf/net/cloud_controller_gateway_test.go @@ -8,13 +8,13 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/gateway.go b/cf/net/gateway.go index 4f2f5f2f72..f69bbd73ee 100644 --- a/cf/net/gateway.go +++ b/cf/net/gateway.go @@ -17,13 +17,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" - "code.cloudfoundry.org/cli/v8/util" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/version" ) const ( diff --git a/cf/net/gateway_test.go b/cf/net/gateway_test.go index 7f97978e2d..9197d580ad 100644 --- a/cf/net/gateway_test.go +++ b/cf/net/gateway_test.go @@ -15,16 +15,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/cf/api/authentication" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/net/netfakes" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testnet "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/cf/api/authentication" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net/netfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/net/http_client.go b/cf/net/http_client.go index 3201f9a14d..496e116477 100644 --- a/cf/net/http_client.go +++ b/cf/net/http_client.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/i18n" "golang.org/x/net/websocket" ) diff --git a/cf/net/http_client_test.go b/cf/net/http_client_test.go index 9379ebfea0..e07165a0e3 100644 --- a/cf/net/http_client_test.go +++ b/cf/net/http_client_test.go @@ -7,9 +7,9 @@ import ( "net/url" "syscall" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "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 90ad9b50df..5191064959 100644 --- a/cf/net/net_suite_test.go +++ b/cf/net/net_suite_test.go @@ -1,8 +1,8 @@ package net_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/net/netfakes/fake_httpclient_interface.go b/cf/net/netfakes/fake_httpclient_interface.go index 9035698a8c..2243192697 100644 --- a/cf/net/netfakes/fake_httpclient_interface.go +++ b/cf/net/netfakes/fake_httpclient_interface.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net" ) type FakeHTTPClientInterface struct { @@ -54,15 +54,16 @@ func (fake *FakeHTTPClientInterface) Do(arg1 *http.Request) (*http.Response, err fake.doArgsForCall = append(fake.doArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.DoStub + fakeReturns := fake.doReturns fake.recordInvocation("Do", []interface{}{arg1}) fake.doMutex.Unlock() - if fake.DoStub != nil { - return fake.DoStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.doReturns return fakeReturns.result1, fakeReturns.result2 } @@ -116,9 +117,10 @@ func (fake *FakeHTTPClientInterface) DumpRequest(arg1 *http.Request) { fake.dumpRequestArgsForCall = append(fake.dumpRequestArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.DumpRequestStub fake.recordInvocation("DumpRequest", []interface{}{arg1}) fake.dumpRequestMutex.Unlock() - if fake.DumpRequestStub != nil { + if stub != nil { fake.DumpRequestStub(arg1) } } @@ -147,9 +149,10 @@ func (fake *FakeHTTPClientInterface) DumpResponse(arg1 *http.Response) { fake.dumpResponseArgsForCall = append(fake.dumpResponseArgsForCall, struct { arg1 *http.Response }{arg1}) + stub := fake.DumpResponseStub fake.recordInvocation("DumpResponse", []interface{}{arg1}) fake.dumpResponseMutex.Unlock() - if fake.DumpResponseStub != nil { + if stub != nil { fake.DumpResponseStub(arg1) } } @@ -185,15 +188,16 @@ func (fake *FakeHTTPClientInterface) ExecuteCheckRedirect(arg1 *http.Request, ar arg1 *http.Request arg2 []*http.Request }{arg1, arg2Copy}) + stub := fake.ExecuteCheckRedirectStub + fakeReturns := fake.executeCheckRedirectReturns fake.recordInvocation("ExecuteCheckRedirect", []interface{}{arg1, arg2Copy}) fake.executeCheckRedirectMutex.Unlock() - if fake.ExecuteCheckRedirectStub != nil { - return fake.ExecuteCheckRedirectStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeCheckRedirectReturns return fakeReturns.result1 } diff --git a/cf/net/netfakes/fake_request_dumper_interface.go b/cf/net/netfakes/fake_request_dumper_interface.go index 4f9b99978b..915bf213eb 100644 --- a/cf/net/netfakes/fake_request_dumper_interface.go +++ b/cf/net/netfakes/fake_request_dumper_interface.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net" ) type FakeRequestDumperInterface struct { @@ -28,9 +28,10 @@ func (fake *FakeRequestDumperInterface) DumpRequest(arg1 *http.Request) { fake.dumpRequestArgsForCall = append(fake.dumpRequestArgsForCall, struct { arg1 *http.Request }{arg1}) + stub := fake.DumpRequestStub fake.recordInvocation("DumpRequest", []interface{}{arg1}) fake.dumpRequestMutex.Unlock() - if fake.DumpRequestStub != nil { + if stub != nil { fake.DumpRequestStub(arg1) } } @@ -59,9 +60,10 @@ func (fake *FakeRequestDumperInterface) DumpResponse(arg1 *http.Response) { fake.dumpResponseArgsForCall = append(fake.dumpResponseArgsForCall, struct { arg1 *http.Response }{arg1}) + stub := fake.DumpResponseStub fake.recordInvocation("DumpResponse", []interface{}{arg1}) fake.dumpResponseMutex.Unlock() - if fake.DumpResponseStub != nil { + if stub != nil { fake.DumpResponseStub(arg1) } } diff --git a/cf/net/netfakes/fake_warning_producer.go b/cf/net/netfakes/fake_warning_producer.go index 8f8d6340d1..516c46f07c 100644 --- a/cf/net/netfakes/fake_warning_producer.go +++ b/cf/net/netfakes/fake_warning_producer.go @@ -4,7 +4,7 @@ package netfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net" ) type FakeWarningProducer struct { @@ -27,15 +27,16 @@ func (fake *FakeWarningProducer) Warnings() []string { ret, specificReturn := fake.warningsReturnsOnCall[len(fake.warningsArgsForCall)] fake.warningsArgsForCall = append(fake.warningsArgsForCall, struct { }{}) + stub := fake.WarningsStub + fakeReturns := fake.warningsReturns fake.recordInvocation("Warnings", []interface{}{}) fake.warningsMutex.Unlock() - if fake.WarningsStub != nil { - return fake.WarningsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.warningsReturns return fakeReturns.result1 } diff --git a/cf/net/progress_reader.go b/cf/net/progress_reader.go index 61d20f5dcf..58f3851955 100644 --- a/cf/net/progress_reader.go +++ b/cf/net/progress_reader.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/cf/formatters" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/formatters" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type ProgressReader struct { diff --git a/cf/net/progress_reader_test.go b/cf/net/progress_reader_test.go index f34e5898dc..181c34d2cd 100644 --- a/cf/net/progress_reader_test.go +++ b/cf/net/progress_reader_test.go @@ -7,8 +7,8 @@ import ( "os" "time" - . "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/request_dumper.go b/cf/net/request_dumper.go index ba8a77b244..876f83c103 100644 --- a/cf/net/request_dumper.go +++ b/cf/net/request_dumper.go @@ -11,10 +11,10 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" - "code.cloudfoundry.org/cli/v8/util/ui" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestDumperInterface diff --git a/cf/net/request_dumper_test.go b/cf/net/request_dumper_test.go index 43db9036be..66342332af 100644 --- a/cf/net/request_dumper_test.go +++ b/cf/net/request_dumper_test.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - . "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/trace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/routing_api_gateway.go b/cf/net/routing_api_gateway.go index d07e97c8b3..5b965cc93a 100644 --- a/cf/net/routing_api_gateway.go +++ b/cf/net/routing_api_gateway.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type errorResponse struct { diff --git a/cf/net/routing_api_gateway_test.go b/cf/net/routing_api_gateway_test.go index 94d4dcb5a2..846bee7a52 100644 --- a/cf/net/routing_api_gateway_test.go +++ b/cf/net/routing_api_gateway_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/uaa_gateway.go b/cf/net/uaa_gateway.go index ee2b3294b1..23338b6e2a 100644 --- a/cf/net/uaa_gateway.go +++ b/cf/net/uaa_gateway.go @@ -4,10 +4,10 @@ import ( "encoding/json" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type uaaErrorResponse struct { diff --git a/cf/net/uaa_gateway_test.go b/cf/net/uaa_gateway_test.go index 16bc93d9c6..dbd8226217 100644 --- a/cf/net/uaa_gateway_test.go +++ b/cf/net/uaa_gateway_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "time" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - . "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + . "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/warnings_collector.go b/cf/net/warnings_collector.go index 591a096b28..b3463d4d95 100644 --- a/cf/net/warnings_collector.go +++ b/cf/net/warnings_collector.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) const DeprecatedEndpointWarning = "Endpoint deprecated" diff --git a/cf/net/warnings_collector_test.go b/cf/net/warnings_collector_test.go index ac6e5527eb..7b2e5368d2 100644 --- a/cf/net/warnings_collector_test.go +++ b/cf/net/warnings_collector_test.go @@ -3,9 +3,9 @@ package net_test import ( "os" - "code.cloudfoundry.org/cli/v8/cf/net" - "code.cloudfoundry.org/cli/v8/cf/net/netfakes" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/net" + "code.cloudfoundry.org/cli/v9/cf/net/netfakes" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/api_endpoint.go b/cf/requirements/api_endpoint.go index a27d0a68c7..78cd7e62f3 100644 --- a/cf/requirements/api_endpoint.go +++ b/cf/requirements/api_endpoint.go @@ -5,10 +5,10 @@ import ( "errors" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type APIEndpointRequirement struct { diff --git a/cf/requirements/api_endpoint_test.go b/cf/requirements/api_endpoint_test.go index c4d6a702a2..52bcf2a9dc 100644 --- a/cf/requirements/api_endpoint_test.go +++ b/cf/requirements/api_endpoint_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/requirements" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/application.go b/cf/requirements/application.go index 8159a5d00f..019c356c1d 100644 --- a/cf/requirements/application.go +++ b/cf/requirements/application.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ApplicationRequirement diff --git a/cf/requirements/application_test.go b/cf/requirements/application_test.go index 79168699b6..89761025f2 100644 --- a/cf/requirements/application_test.go +++ b/cf/requirements/application_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/buildpack.go b/cf/requirements/buildpack.go index 5958260a6d..20ea40a76d 100644 --- a/cf/requirements/buildpack.go +++ b/cf/requirements/buildpack.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BuildpackRequirement diff --git a/cf/requirements/buildpack_test.go b/cf/requirements/buildpack_test.go index d6c4957460..ad60089cc2 100644 --- a/cf/requirements/buildpack_test.go +++ b/cf/requirements/buildpack_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/config_refreshing_requirement.go b/cf/requirements/config_refreshing_requirement.go index c14a57f99d..b90ad9262f 100644 --- a/cf/requirements/config_refreshing_requirement.go +++ b/cf/requirements/config_refreshing_requirement.go @@ -1,6 +1,6 @@ package requirements -import "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" +import "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" type configRefreshingRequirement struct { requirement Requirement diff --git a/cf/requirements/config_refreshing_requirement_test.go b/cf/requirements/config_refreshing_requirement_test.go index 5624a212c6..d2a81a9e25 100644 --- a/cf/requirements/config_refreshing_requirement_test.go +++ b/cf/requirements/config_refreshing_requirement_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/v8/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" "errors" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/dea_application.go b/cf/requirements/dea_application.go index 07cd2d1b28..b78ea10975 100644 --- a/cf/requirements/dea_application.go +++ b/cf/requirements/dea_application.go @@ -1,10 +1,10 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api/applications" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/api/applications" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DEAApplicationRequirement diff --git a/cf/requirements/dea_application_test.go b/cf/requirements/dea_application_test.go index 3770ad3753..44fdd9af3d 100644 --- a/cf/requirements/dea_application_test.go +++ b/cf/requirements/dea_application_test.go @@ -3,10 +3,10 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v9/cf/api/applications/applicationsfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/domain.go b/cf/requirements/domain.go index bbd1746a65..454fb89178 100644 --- a/cf/requirements/domain.go +++ b/cf/requirements/domain.go @@ -1,9 +1,9 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . DomainRequirement diff --git a/cf/requirements/domain_test.go b/cf/requirements/domain_test.go index ae63f62e15..fd3bfde2f5 100644 --- a/cf/requirements/domain_test.go +++ b/cf/requirements/domain_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/requirements" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/factory.go b/cf/requirements/factory.go index cba1dfaccb..4d4f8dfd2f 100644 --- a/cf/requirements/factory.go +++ b/cf/requirements/factory.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" "github.com/blang/semver/v4" ) diff --git a/cf/requirements/login.go b/cf/requirements/login.go index d7f1f724d1..5ab26a1144 100644 --- a/cf/requirements/login.go +++ b/cf/requirements/login.go @@ -3,8 +3,8 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type LoginRequirement struct { diff --git a/cf/requirements/login_test.go b/cf/requirements/login_test.go index 883113afc6..2d1f5eca47 100644 --- a/cf/requirements/login_test.go +++ b/cf/requirements/login_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" ) var _ = Describe("LoginRequirement", func() { diff --git a/cf/requirements/max_api_version.go b/cf/requirements/max_api_version.go index 9639145c27..b092a4592a 100644 --- a/cf/requirements/max_api_version.go +++ b/cf/requirements/max_api_version.go @@ -3,10 +3,10 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" "github.com/blang/semver/v4" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type MaxAPIVersionRequirement struct { diff --git a/cf/requirements/max_api_version_test.go b/cf/requirements/max_api_version_test.go index 32f0b7d9b9..81c3a46b31 100644 --- a/cf/requirements/max_api_version_test.go +++ b/cf/requirements/max_api_version_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" "github.com/blang/semver/v4" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/min_api_version.go b/cf/requirements/min_api_version.go index 48c6025965..580dfbc742 100644 --- a/cf/requirements/min_api_version.go +++ b/cf/requirements/min_api_version.go @@ -3,10 +3,10 @@ package requirements import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" "github.com/blang/semver/v4" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type MinAPIVersionRequirement struct { diff --git a/cf/requirements/min_api_version_test.go b/cf/requirements/min_api_version_test.go index aa1c58b507..17501c6a69 100644 --- a/cf/requirements/min_api_version_test.go +++ b/cf/requirements/min_api_version_test.go @@ -1,11 +1,11 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" "github.com/blang/semver/v4" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/number_arguments.go b/cf/requirements/number_arguments.go index fe21784c1a..34bae5d553 100644 --- a/cf/requirements/number_arguments.go +++ b/cf/requirements/number_arguments.go @@ -3,7 +3,7 @@ package requirements import ( "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type NumberArguments struct { diff --git a/cf/requirements/number_arguments_test.go b/cf/requirements/number_arguments_test.go index 06564365f1..1c3e7c6a13 100644 --- a/cf/requirements/number_arguments_test.go +++ b/cf/requirements/number_arguments_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/v8/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/organization.go b/cf/requirements/organization.go index 54dbd02d3f..17ef3115d5 100644 --- a/cf/requirements/organization.go +++ b/cf/requirements/organization.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api/organizations" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/organizations" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . OrganizationRequirement diff --git a/cf/requirements/organization_test.go b/cf/requirements/organization_test.go index 052e50e14f..1f97711ba5 100644 --- a/cf/requirements/organization_test.go +++ b/cf/requirements/organization_test.go @@ -3,9 +3,9 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/organizations/organizationsfakes" - "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "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 7e89ce0829..fee8a8225a 100644 --- a/cf/requirements/requirements_suite_test.go +++ b/cf/requirements/requirements_suite_test.go @@ -1,8 +1,8 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/requirements_test.go b/cf/requirements/requirements_test.go index 30cf87780a..3e291cedf7 100644 --- a/cf/requirements/requirements_test.go +++ b/cf/requirements/requirements_test.go @@ -1,9 +1,9 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/v8/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v9/cf/requirements/requirementsfakes" "errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/requirementsfakes/fake_application_requirement.go b/cf/requirements/requirementsfakes/fake_application_requirement.go index 7762e98631..d948f3c48c 100644 --- a/cf/requirements/requirementsfakes/fake_application_requirement.go +++ b/cf/requirements/requirementsfakes/fake_application_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeApplicationRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeApplicationRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeApplicationRequirement) GetApplication() models.Application { ret, specificReturn := fake.getApplicationReturnsOnCall[len(fake.getApplicationArgsForCall)] fake.getApplicationArgsForCall = append(fake.getApplicationArgsForCall, struct { }{}) + stub := fake.GetApplicationStub + fakeReturns := fake.getApplicationReturns fake.recordInvocation("GetApplication", []interface{}{}) fake.getApplicationMutex.Unlock() - if fake.GetApplicationStub != nil { - return fake.GetApplicationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getApplicationReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_buildpack_requirement.go b/cf/requirements/requirementsfakes/fake_buildpack_requirement.go index 1717925f6c..a83671f2ca 100644 --- a/cf/requirements/requirementsfakes/fake_buildpack_requirement.go +++ b/cf/requirements/requirementsfakes/fake_buildpack_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeBuildpackRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeBuildpackRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeBuildpackRequirement) GetBuildpack() models.Buildpack { ret, specificReturn := fake.getBuildpackReturnsOnCall[len(fake.getBuildpackArgsForCall)] fake.getBuildpackArgsForCall = append(fake.getBuildpackArgsForCall, struct { }{}) + stub := fake.GetBuildpackStub + fakeReturns := fake.getBuildpackReturns fake.recordInvocation("GetBuildpack", []interface{}{}) fake.getBuildpackMutex.Unlock() - if fake.GetBuildpackStub != nil { - return fake.GetBuildpackStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getBuildpackReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_config_refresher.go b/cf/requirements/requirementsfakes/fake_config_refresher.go index e2aa005bec..9a0e42c860 100644 --- a/cf/requirements/requirementsfakes/fake_config_refresher.go +++ b/cf/requirements/requirementsfakes/fake_config_refresher.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeConfigRefresher struct { @@ -30,15 +30,16 @@ func (fake *FakeConfigRefresher) Refresh() (coreconfig.Warning, error) { ret, specificReturn := fake.refreshReturnsOnCall[len(fake.refreshArgsForCall)] fake.refreshArgsForCall = append(fake.refreshArgsForCall, struct { }{}) + stub := fake.RefreshStub + fakeReturns := fake.refreshReturns fake.recordInvocation("Refresh", []interface{}{}) fake.refreshMutex.Unlock() - if fake.RefreshStub != nil { - return fake.RefreshStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go b/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go index 7c59dd7840..5815c9c07e 100644 --- a/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go +++ b/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeDEAApplicationRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeDEAApplicationRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeDEAApplicationRequirement) GetApplication() models.Application { ret, specificReturn := fake.getApplicationReturnsOnCall[len(fake.getApplicationArgsForCall)] fake.getApplicationArgsForCall = append(fake.getApplicationArgsForCall, struct { }{}) + stub := fake.GetApplicationStub + fakeReturns := fake.getApplicationReturns fake.recordInvocation("GetApplication", []interface{}{}) fake.getApplicationMutex.Unlock() - if fake.GetApplicationStub != nil { - return fake.GetApplicationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getApplicationReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_domain_requirement.go b/cf/requirements/requirementsfakes/fake_domain_requirement.go index e564627414..9b249ae9f9 100644 --- a/cf/requirements/requirementsfakes/fake_domain_requirement.go +++ b/cf/requirements/requirementsfakes/fake_domain_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeDomainRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeDomainRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeDomainRequirement) GetDomain() models.DomainFields { ret, specificReturn := fake.getDomainReturnsOnCall[len(fake.getDomainArgsForCall)] fake.getDomainArgsForCall = append(fake.getDomainArgsForCall, struct { }{}) + stub := fake.GetDomainStub + fakeReturns := fake.getDomainReturns fake.recordInvocation("GetDomain", []interface{}{}) fake.getDomainMutex.Unlock() - if fake.GetDomainStub != nil { - return fake.GetDomainStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getDomainReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_factory.go b/cf/requirements/requirementsfakes/fake_factory.go index 89ead2c992..ca1126e873 100644 --- a/cf/requirements/requirementsfakes/fake_factory.go +++ b/cf/requirements/requirementsfakes/fake_factory.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "github.com/blang/semver/v4" + "code.cloudfoundry.org/cli/v9/cf/requirements" + semver "github.com/blang/semver/v4" ) type FakeFactory struct { @@ -219,15 +219,16 @@ func (fake *FakeFactory) NewAPIEndpointRequirement() requirements.Requirement { ret, specificReturn := fake.newAPIEndpointRequirementReturnsOnCall[len(fake.newAPIEndpointRequirementArgsForCall)] fake.newAPIEndpointRequirementArgsForCall = append(fake.newAPIEndpointRequirementArgsForCall, struct { }{}) + stub := fake.NewAPIEndpointRequirementStub + fakeReturns := fake.newAPIEndpointRequirementReturns fake.recordInvocation("NewAPIEndpointRequirement", []interface{}{}) fake.newAPIEndpointRequirementMutex.Unlock() - if fake.NewAPIEndpointRequirementStub != nil { - return fake.NewAPIEndpointRequirementStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.newAPIEndpointRequirementReturns return fakeReturns.result1 } @@ -272,15 +273,16 @@ func (fake *FakeFactory) NewApplicationRequirement(arg1 string) requirements.App fake.newApplicationRequirementArgsForCall = append(fake.newApplicationRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewApplicationRequirementStub + fakeReturns := fake.newApplicationRequirementReturns fake.recordInvocation("NewApplicationRequirement", []interface{}{arg1}) fake.newApplicationRequirementMutex.Unlock() - if fake.NewApplicationRequirementStub != nil { - return fake.NewApplicationRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newApplicationRequirementReturns return fakeReturns.result1 } @@ -333,15 +335,16 @@ func (fake *FakeFactory) NewBuildpackRequirement(arg1 string, arg2 string) requi arg1 string arg2 string }{arg1, arg2}) + stub := fake.NewBuildpackRequirementStub + fakeReturns := fake.newBuildpackRequirementReturns fake.recordInvocation("NewBuildpackRequirement", []interface{}{arg1, arg2}) fake.newBuildpackRequirementMutex.Unlock() - if fake.NewBuildpackRequirementStub != nil { - return fake.NewBuildpackRequirementStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newBuildpackRequirementReturns return fakeReturns.result1 } @@ -393,15 +396,16 @@ func (fake *FakeFactory) NewClientRequirement(arg1 string) requirements.UserRequ fake.newClientRequirementArgsForCall = append(fake.newClientRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewClientRequirementStub + fakeReturns := fake.newClientRequirementReturns fake.recordInvocation("NewClientRequirement", []interface{}{arg1}) fake.newClientRequirementMutex.Unlock() - if fake.NewClientRequirementStub != nil { - return fake.NewClientRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newClientRequirementReturns return fakeReturns.result1 } @@ -453,15 +457,16 @@ func (fake *FakeFactory) NewDEAApplicationRequirement(arg1 string) requirements. fake.newDEAApplicationRequirementArgsForCall = append(fake.newDEAApplicationRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewDEAApplicationRequirementStub + fakeReturns := fake.newDEAApplicationRequirementReturns fake.recordInvocation("NewDEAApplicationRequirement", []interface{}{arg1}) fake.newDEAApplicationRequirementMutex.Unlock() - if fake.NewDEAApplicationRequirementStub != nil { - return fake.NewDEAApplicationRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newDEAApplicationRequirementReturns return fakeReturns.result1 } @@ -513,15 +518,16 @@ func (fake *FakeFactory) NewDomainRequirement(arg1 string) requirements.DomainRe fake.newDomainRequirementArgsForCall = append(fake.newDomainRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewDomainRequirementStub + fakeReturns := fake.newDomainRequirementReturns fake.recordInvocation("NewDomainRequirement", []interface{}{arg1}) fake.newDomainRequirementMutex.Unlock() - if fake.NewDomainRequirementStub != nil { - return fake.NewDomainRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newDomainRequirementReturns return fakeReturns.result1 } @@ -572,15 +578,16 @@ func (fake *FakeFactory) NewLoginRequirement() requirements.Requirement { ret, specificReturn := fake.newLoginRequirementReturnsOnCall[len(fake.newLoginRequirementArgsForCall)] fake.newLoginRequirementArgsForCall = append(fake.newLoginRequirementArgsForCall, struct { }{}) + stub := fake.NewLoginRequirementStub + fakeReturns := fake.newLoginRequirementReturns fake.recordInvocation("NewLoginRequirement", []interface{}{}) fake.newLoginRequirementMutex.Unlock() - if fake.NewLoginRequirementStub != nil { - return fake.NewLoginRequirementStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.newLoginRequirementReturns return fakeReturns.result1 } @@ -626,15 +633,16 @@ func (fake *FakeFactory) NewMaxAPIVersionRequirement(arg1 string, arg2 semver.Ve arg1 string arg2 semver.Version }{arg1, arg2}) + stub := fake.NewMaxAPIVersionRequirementStub + fakeReturns := fake.newMaxAPIVersionRequirementReturns fake.recordInvocation("NewMaxAPIVersionRequirement", []interface{}{arg1, arg2}) fake.newMaxAPIVersionRequirementMutex.Unlock() - if fake.NewMaxAPIVersionRequirementStub != nil { - return fake.NewMaxAPIVersionRequirementStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newMaxAPIVersionRequirementReturns return fakeReturns.result1 } @@ -687,15 +695,16 @@ func (fake *FakeFactory) NewMinAPIVersionRequirement(arg1 string, arg2 semver.Ve arg1 string arg2 semver.Version }{arg1, arg2}) + stub := fake.NewMinAPIVersionRequirementStub + fakeReturns := fake.newMinAPIVersionRequirementReturns fake.recordInvocation("NewMinAPIVersionRequirement", []interface{}{arg1, arg2}) fake.newMinAPIVersionRequirementMutex.Unlock() - if fake.NewMinAPIVersionRequirementStub != nil { - return fake.NewMinAPIVersionRequirementStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newMinAPIVersionRequirementReturns return fakeReturns.result1 } @@ -753,15 +762,16 @@ func (fake *FakeFactory) NewNumberArguments(arg1 []string, arg2 ...string) requi arg1 []string arg2 []string }{arg1Copy, arg2}) + stub := fake.NewNumberArgumentsStub + fakeReturns := fake.newNumberArgumentsReturns fake.recordInvocation("NewNumberArguments", []interface{}{arg1Copy, arg2}) fake.newNumberArgumentsMutex.Unlock() - if fake.NewNumberArgumentsStub != nil { - return fake.NewNumberArgumentsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1 } - fakeReturns := fake.newNumberArgumentsReturns return fakeReturns.result1 } @@ -813,15 +823,16 @@ func (fake *FakeFactory) NewOrganizationRequirement(arg1 string) requirements.Or fake.newOrganizationRequirementArgsForCall = append(fake.newOrganizationRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewOrganizationRequirementStub + fakeReturns := fake.newOrganizationRequirementReturns fake.recordInvocation("NewOrganizationRequirement", []interface{}{arg1}) fake.newOrganizationRequirementMutex.Unlock() - if fake.NewOrganizationRequirementStub != nil { - return fake.NewOrganizationRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newOrganizationRequirementReturns return fakeReturns.result1 } @@ -873,15 +884,16 @@ func (fake *FakeFactory) NewServiceInstanceRequirement(arg1 string) requirements fake.newServiceInstanceRequirementArgsForCall = append(fake.newServiceInstanceRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewServiceInstanceRequirementStub + fakeReturns := fake.newServiceInstanceRequirementReturns fake.recordInvocation("NewServiceInstanceRequirement", []interface{}{arg1}) fake.newServiceInstanceRequirementMutex.Unlock() - if fake.NewServiceInstanceRequirementStub != nil { - return fake.NewServiceInstanceRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newServiceInstanceRequirementReturns return fakeReturns.result1 } @@ -933,15 +945,16 @@ func (fake *FakeFactory) NewSpaceRequirement(arg1 string) requirements.SpaceRequ fake.newSpaceRequirementArgsForCall = append(fake.newSpaceRequirementArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NewSpaceRequirementStub + fakeReturns := fake.newSpaceRequirementReturns fake.recordInvocation("NewSpaceRequirement", []interface{}{arg1}) fake.newSpaceRequirementMutex.Unlock() - if fake.NewSpaceRequirementStub != nil { - return fake.NewSpaceRequirementStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newSpaceRequirementReturns return fakeReturns.result1 } @@ -992,15 +1005,16 @@ func (fake *FakeFactory) NewTargetedOrgRequirement() requirements.TargetedOrgReq ret, specificReturn := fake.newTargetedOrgRequirementReturnsOnCall[len(fake.newTargetedOrgRequirementArgsForCall)] fake.newTargetedOrgRequirementArgsForCall = append(fake.newTargetedOrgRequirementArgsForCall, struct { }{}) + stub := fake.NewTargetedOrgRequirementStub + fakeReturns := fake.newTargetedOrgRequirementReturns fake.recordInvocation("NewTargetedOrgRequirement", []interface{}{}) fake.newTargetedOrgRequirementMutex.Unlock() - if fake.NewTargetedOrgRequirementStub != nil { - return fake.NewTargetedOrgRequirementStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.newTargetedOrgRequirementReturns return fakeReturns.result1 } @@ -1044,15 +1058,16 @@ func (fake *FakeFactory) NewTargetedSpaceRequirement() requirements.Requirement ret, specificReturn := fake.newTargetedSpaceRequirementReturnsOnCall[len(fake.newTargetedSpaceRequirementArgsForCall)] fake.newTargetedSpaceRequirementArgsForCall = append(fake.newTargetedSpaceRequirementArgsForCall, struct { }{}) + stub := fake.NewTargetedSpaceRequirementStub + fakeReturns := fake.newTargetedSpaceRequirementReturns fake.recordInvocation("NewTargetedSpaceRequirement", []interface{}{}) fake.newTargetedSpaceRequirementMutex.Unlock() - if fake.NewTargetedSpaceRequirementStub != nil { - return fake.NewTargetedSpaceRequirementStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.newTargetedSpaceRequirementReturns return fakeReturns.result1 } @@ -1097,15 +1112,16 @@ func (fake *FakeFactory) NewUnsupportedLegacyFlagRequirement(arg1 ...string) req fake.newUnsupportedLegacyFlagRequirementArgsForCall = append(fake.newUnsupportedLegacyFlagRequirementArgsForCall, struct { arg1 []string }{arg1}) + stub := fake.NewUnsupportedLegacyFlagRequirementStub + fakeReturns := fake.newUnsupportedLegacyFlagRequirementReturns fake.recordInvocation("NewUnsupportedLegacyFlagRequirement", []interface{}{arg1}) fake.newUnsupportedLegacyFlagRequirementMutex.Unlock() - if fake.NewUnsupportedLegacyFlagRequirementStub != nil { - return fake.NewUnsupportedLegacyFlagRequirementStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1 } - fakeReturns := fake.newUnsupportedLegacyFlagRequirementReturns return fakeReturns.result1 } @@ -1159,15 +1175,16 @@ func (fake *FakeFactory) NewUsageRequirement(arg1 requirements.Usable, arg2 stri arg2 string arg3 func() bool }{arg1, arg2, arg3}) + stub := fake.NewUsageRequirementStub + fakeReturns := fake.newUsageRequirementReturns fake.recordInvocation("NewUsageRequirement", []interface{}{arg1, arg2, arg3}) fake.newUsageRequirementMutex.Unlock() - if fake.NewUsageRequirementStub != nil { - return fake.NewUsageRequirementStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.newUsageRequirementReturns return fakeReturns.result1 } @@ -1220,15 +1237,16 @@ func (fake *FakeFactory) NewUserRequirement(arg1 string, arg2 bool) requirements arg1 string arg2 bool }{arg1, arg2}) + stub := fake.NewUserRequirementStub + fakeReturns := fake.newUserRequirementReturns fake.recordInvocation("NewUserRequirement", []interface{}{arg1, arg2}) fake.newUserRequirementMutex.Unlock() - if fake.NewUserRequirementStub != nil { - return fake.NewUserRequirementStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newUserRequirementReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_organization_requirement.go b/cf/requirements/requirementsfakes/fake_organization_requirement.go index 446af1263f..e186b5f5a9 100644 --- a/cf/requirements/requirementsfakes/fake_organization_requirement.go +++ b/cf/requirements/requirementsfakes/fake_organization_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeOrganizationRequirement struct { @@ -43,15 +43,16 @@ func (fake *FakeOrganizationRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -95,15 +96,16 @@ func (fake *FakeOrganizationRequirement) GetOrganization() models.Organization { ret, specificReturn := fake.getOrganizationReturnsOnCall[len(fake.getOrganizationArgsForCall)] fake.getOrganizationArgsForCall = append(fake.getOrganizationArgsForCall, struct { }{}) + stub := fake.GetOrganizationStub + fakeReturns := fake.getOrganizationReturns fake.recordInvocation("GetOrganization", []interface{}{}) fake.getOrganizationMutex.Unlock() - if fake.GetOrganizationStub != nil { - return fake.GetOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrganizationReturns return fakeReturns.result1 } @@ -147,9 +149,10 @@ func (fake *FakeOrganizationRequirement) SetOrganizationName(arg1 string) { fake.setOrganizationNameArgsForCall = append(fake.setOrganizationNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetOrganizationNameStub fake.recordInvocation("SetOrganizationName", []interface{}{arg1}) fake.setOrganizationNameMutex.Unlock() - if fake.SetOrganizationNameStub != nil { + if stub != nil { fake.SetOrganizationNameStub(arg1) } } diff --git a/cf/requirements/requirementsfakes/fake_requirement.go b/cf/requirements/requirementsfakes/fake_requirement.go index f5d897c5ec..69947707e8 100644 --- a/cf/requirements/requirementsfakes/fake_requirement.go +++ b/cf/requirements/requirementsfakes/fake_requirement.go @@ -4,7 +4,7 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeRequirement struct { @@ -27,15 +27,16 @@ func (fake *FakeRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_service_instance_requirement.go b/cf/requirements/requirementsfakes/fake_service_instance_requirement.go index 124c0a2275..077e2856fc 100644 --- a/cf/requirements/requirementsfakes/fake_service_instance_requirement.go +++ b/cf/requirements/requirementsfakes/fake_service_instance_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeServiceInstanceRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeServiceInstanceRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeServiceInstanceRequirement) GetServiceInstance() models.ServiceI ret, specificReturn := fake.getServiceInstanceReturnsOnCall[len(fake.getServiceInstanceArgsForCall)] fake.getServiceInstanceArgsForCall = append(fake.getServiceInstanceArgsForCall, struct { }{}) + stub := fake.GetServiceInstanceStub + fakeReturns := fake.getServiceInstanceReturns fake.recordInvocation("GetServiceInstance", []interface{}{}) fake.getServiceInstanceMutex.Unlock() - if fake.GetServiceInstanceStub != nil { - return fake.GetServiceInstanceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getServiceInstanceReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_space_requirement.go b/cf/requirements/requirementsfakes/fake_space_requirement.go index 5943b014a7..f7a11c4fa1 100644 --- a/cf/requirements/requirementsfakes/fake_space_requirement.go +++ b/cf/requirements/requirementsfakes/fake_space_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeSpaceRequirement struct { @@ -43,15 +43,16 @@ func (fake *FakeSpaceRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -95,15 +96,16 @@ func (fake *FakeSpaceRequirement) GetSpace() models.Space { ret, specificReturn := fake.getSpaceReturnsOnCall[len(fake.getSpaceArgsForCall)] fake.getSpaceArgsForCall = append(fake.getSpaceArgsForCall, struct { }{}) + stub := fake.GetSpaceStub + fakeReturns := fake.getSpaceReturns fake.recordInvocation("GetSpace", []interface{}{}) fake.getSpaceMutex.Unlock() - if fake.GetSpaceStub != nil { - return fake.GetSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getSpaceReturns return fakeReturns.result1 } @@ -147,9 +149,10 @@ func (fake *FakeSpaceRequirement) SetSpaceName(arg1 string) { fake.setSpaceNameArgsForCall = append(fake.setSpaceNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetSpaceNameStub fake.recordInvocation("SetSpaceName", []interface{}{arg1}) fake.setSpaceNameMutex.Unlock() - if fake.SetSpaceNameStub != nil { + if stub != nil { fake.SetSpaceNameStub(arg1) } } diff --git a/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go b/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go index 7e0fe42cec..29c639eacc 100644 --- a/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go +++ b/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeTargetedOrgRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeTargetedOrgRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeTargetedOrgRequirement) GetOrganizationFields() models.Organizat ret, specificReturn := fake.getOrganizationFieldsReturnsOnCall[len(fake.getOrganizationFieldsArgsForCall)] fake.getOrganizationFieldsArgsForCall = append(fake.getOrganizationFieldsArgsForCall, struct { }{}) + stub := fake.GetOrganizationFieldsStub + fakeReturns := fake.getOrganizationFieldsReturns fake.recordInvocation("GetOrganizationFields", []interface{}{}) fake.getOrganizationFieldsMutex.Unlock() - if fake.GetOrganizationFieldsStub != nil { - return fake.GetOrganizationFieldsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrganizationFieldsReturns return fakeReturns.result1 } diff --git a/cf/requirements/requirementsfakes/fake_user_requirement.go b/cf/requirements/requirementsfakes/fake_user_requirement.go index d5b640b015..d6b0641c11 100644 --- a/cf/requirements/requirementsfakes/fake_user_requirement.go +++ b/cf/requirements/requirementsfakes/fake_user_requirement.go @@ -4,8 +4,8 @@ package requirementsfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeUserRequirement struct { @@ -38,15 +38,16 @@ func (fake *FakeUserRequirement) Execute() error { ret, specificReturn := fake.executeReturnsOnCall[len(fake.executeArgsForCall)] fake.executeArgsForCall = append(fake.executeArgsForCall, struct { }{}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } @@ -90,15 +91,16 @@ func (fake *FakeUserRequirement) GetUser() models.UserFields { ret, specificReturn := fake.getUserReturnsOnCall[len(fake.getUserArgsForCall)] fake.getUserArgsForCall = append(fake.getUserArgsForCall, struct { }{}) + stub := fake.GetUserStub + fakeReturns := fake.getUserReturns fake.recordInvocation("GetUser", []interface{}{}) fake.getUserMutex.Unlock() - if fake.GetUserStub != nil { - return fake.GetUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getUserReturns return fakeReturns.result1 } diff --git a/cf/requirements/service_instance.go b/cf/requirements/service_instance.go index 9df3ddde74..2312d70175 100644 --- a/cf/requirements/service_instance.go +++ b/cf/requirements/service_instance.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceInstanceRequirement diff --git a/cf/requirements/service_instance_test.go b/cf/requirements/service_instance_test.go index 8be9c42459..328aac87f1 100644 --- a/cf/requirements/service_instance_test.go +++ b/cf/requirements/service_instance_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/space.go b/cf/requirements/space.go index 5fd82d1170..3db9317d1d 100644 --- a/cf/requirements/space.go +++ b/cf/requirements/space.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api/spaces" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api/spaces" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SpaceRequirement diff --git a/cf/requirements/space_test.go b/cf/requirements/space_test.go index 6355006389..3047db42f2 100644 --- a/cf/requirements/space_test.go +++ b/cf/requirements/space_test.go @@ -3,9 +3,9 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/api/spaces/spacesfakes" - "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/targeted_organization.go b/cf/requirements/targeted_organization.go index 872bf3deb4..33a14fb6af 100644 --- a/cf/requirements/targeted_organization.go +++ b/cf/requirements/targeted_organization.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . TargetedOrgRequirement diff --git a/cf/requirements/targeted_organization_test.go b/cf/requirements/targeted_organization_test.go index 27cfbb4745..25664f6d34 100644 --- a/cf/requirements/targeted_organization_test.go +++ b/cf/requirements/targeted_organization_test.go @@ -1,12 +1,12 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/v8/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/targeted_space.go b/cf/requirements/targeted_space.go index 66a3fb2459..b3838a056b 100644 --- a/cf/requirements/targeted_space.go +++ b/cf/requirements/targeted_space.go @@ -5,10 +5,10 @@ import ( "errors" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - . "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type TargetedSpaceRequirement struct { diff --git a/cf/requirements/targeted_space_test.go b/cf/requirements/targeted_space_test.go index fbdaa4d13e..3b9660f15b 100644 --- a/cf/requirements/targeted_space_test.go +++ b/cf/requirements/targeted_space_test.go @@ -1,10 +1,10 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - . "code.cloudfoundry.org/cli/v8/cf/requirements" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + . "code.cloudfoundry.org/cli/v9/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/unsupported_legacy_flag.go b/cf/requirements/unsupported_legacy_flag.go index e944a34b4e..8a9368d82d 100644 --- a/cf/requirements/unsupported_legacy_flag.go +++ b/cf/requirements/unsupported_legacy_flag.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type UnsupportedLegacyFlagRequirement struct { diff --git a/cf/requirements/unsupported_legacy_flag_test.go b/cf/requirements/unsupported_legacy_flag_test.go index 9ff70d2396..5db6431789 100644 --- a/cf/requirements/unsupported_legacy_flag_test.go +++ b/cf/requirements/unsupported_legacy_flag_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/usage_requirement.go b/cf/requirements/usage_requirement.go index 37ec7e108b..58a0936967 100644 --- a/cf/requirements/usage_requirement.go +++ b/cf/requirements/usage_requirement.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) type RequirementFunction func() error diff --git a/cf/requirements/usage_requirement_test.go b/cf/requirements/usage_requirement_test.go index 5955a82c70..c2a0fc4686 100644 --- a/cf/requirements/usage_requirement_test.go +++ b/cf/requirements/usage_requirement_test.go @@ -1,7 +1,7 @@ package requirements_test import ( - . "code.cloudfoundry.org/cli/v8/cf/requirements" + . "code.cloudfoundry.org/cli/v9/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/user.go b/cf/requirements/user.go index adf1525dbd..66e4df2745 100644 --- a/cf/requirements/user.go +++ b/cf/requirements/user.go @@ -1,8 +1,8 @@ package requirements import ( - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserRequirement diff --git a/cf/requirements/user_test.go b/cf/requirements/user_test.go index 5e1b2b6e32..1b6771f8f2 100644 --- a/cf/requirements/user_test.go +++ b/cf/requirements/user_test.go @@ -3,10 +3,10 @@ package requirements_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/api/apifakes" + "code.cloudfoundry.org/cli/v9/cf/api/apifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/options/ssh_options.go b/cf/ssh/options/ssh_options.go index c1b2550fc2..ebf5f74511 100644 --- a/cf/ssh/options/ssh_options.go +++ b/cf/ssh/options/ssh_options.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/flags" ) type TTYRequest int diff --git a/cf/ssh/options/ssh_options_test.go b/cf/ssh/options/ssh_options_test.go index 29a46fd504..31647ca854 100644 --- a/cf/ssh/options/ssh_options_test.go +++ b/cf/ssh/options/ssh_options_test.go @@ -1,8 +1,8 @@ package options_test import ( - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/ssh/options" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/ssh.go b/cf/ssh/ssh.go index ef4c51b28d..5c32ee3ca1 100644 --- a/cf/ssh/ssh.go +++ b/cf/ssh/ssh.go @@ -19,10 +19,10 @@ import ( "golang.org/x/crypto/ssh" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/ssh/options" - "code.cloudfoundry.org/cli/v8/cf/ssh/sigwinch" - "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" + "code.cloudfoundry.org/cli/v9/cf/ssh/sigwinch" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" "github.com/moby/term" ) diff --git a/cf/ssh/ssh_test.go b/cf/ssh/ssh_test.go index 71f1800dc3..549297ede7 100644 --- a/cf/ssh/ssh_test.go +++ b/cf/ssh/ssh_test.go @@ -16,12 +16,12 @@ import ( "syscall" "time" - "code.cloudfoundry.org/cli/v8/cf/models" - sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" - "code.cloudfoundry.org/cli/v8/cf/ssh/options" - "code.cloudfoundry.org/cli/v8/cf/ssh/sshfakes" - "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" - "code.cloudfoundry.org/cli/v8/cf/ssh/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/models" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" + "code.cloudfoundry.org/cli/v9/cf/ssh/sshfakes" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal/terminalfakes" "code.cloudfoundry.org/diego-ssh/server" fake_server "code.cloudfoundry.org/diego-ssh/server/fakes" "code.cloudfoundry.org/diego-ssh/test_helpers" diff --git a/cf/ssh/sshfakes/fake_listener_factory.go b/cf/ssh/sshfakes/fake_listener_factory.go index de9ed83151..8d51c03352 100644 --- a/cf/ssh/sshfakes/fake_listener_factory.go +++ b/cf/ssh/sshfakes/fake_listener_factory.go @@ -5,7 +5,7 @@ import ( "net" "sync" - sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" ) type FakeListenerFactory struct { @@ -34,15 +34,16 @@ func (fake *FakeListenerFactory) Listen(arg1 string, arg2 string) (net.Listener, arg1 string arg2 string }{arg1, arg2}) + stub := fake.ListenStub + fakeReturns := fake.listenReturns fake.recordInvocation("Listen", []interface{}{arg1, arg2}) fake.listenMutex.Unlock() - if fake.ListenStub != nil { - return fake.ListenStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/ssh/sshfakes/fake_secure_client.go b/cf/ssh/sshfakes/fake_secure_client.go index f2c7c01719..f542299182 100644 --- a/cf/ssh/sshfakes/fake_secure_client.go +++ b/cf/ssh/sshfakes/fake_secure_client.go @@ -5,7 +5,7 @@ import ( "net" "sync" - sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" "golang.org/x/crypto/ssh" ) @@ -75,15 +75,16 @@ func (fake *FakeSecureClient) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -127,15 +128,16 @@ func (fake *FakeSecureClient) Conn() ssh.Conn { ret, specificReturn := fake.connReturnsOnCall[len(fake.connArgsForCall)] fake.connArgsForCall = append(fake.connArgsForCall, struct { }{}) + stub := fake.ConnStub + fakeReturns := fake.connReturns fake.recordInvocation("Conn", []interface{}{}) fake.connMutex.Unlock() - if fake.ConnStub != nil { - return fake.ConnStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.connReturns return fakeReturns.result1 } @@ -181,15 +183,16 @@ func (fake *FakeSecureClient) Dial(arg1 string, arg2 string) (net.Conn, error) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.DialStub + fakeReturns := fake.dialReturns fake.recordInvocation("Dial", []interface{}{arg1, arg2}) fake.dialMutex.Unlock() - if fake.DialStub != nil { - return fake.DialStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dialReturns return fakeReturns.result1, fakeReturns.result2 } @@ -243,15 +246,16 @@ func (fake *FakeSecureClient) NewSession() (sshCmd.SecureSession, error) { ret, specificReturn := fake.newSessionReturnsOnCall[len(fake.newSessionArgsForCall)] fake.newSessionArgsForCall = append(fake.newSessionArgsForCall, struct { }{}) + stub := fake.NewSessionStub + fakeReturns := fake.newSessionReturns fake.recordInvocation("NewSession", []interface{}{}) fake.newSessionMutex.Unlock() - if fake.NewSessionStub != nil { - return fake.NewSessionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.newSessionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -298,15 +302,16 @@ func (fake *FakeSecureClient) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/cf/ssh/sshfakes/fake_secure_dialer.go b/cf/ssh/sshfakes/fake_secure_dialer.go index a483a81e8a..6a296ff2c8 100644 --- a/cf/ssh/sshfakes/fake_secure_dialer.go +++ b/cf/ssh/sshfakes/fake_secure_dialer.go @@ -4,7 +4,7 @@ package sshfakes import ( "sync" - sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" "golang.org/x/crypto/ssh" ) @@ -36,15 +36,16 @@ func (fake *FakeSecureDialer) Dial(arg1 string, arg2 string, arg3 *ssh.ClientCon arg2 string arg3 *ssh.ClientConfig }{arg1, arg2, arg3}) + stub := fake.DialStub + fakeReturns := fake.dialReturns fake.recordInvocation("Dial", []interface{}{arg1, arg2, arg3}) fake.dialMutex.Unlock() - if fake.DialStub != nil { - return fake.DialStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dialReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/cf/ssh/sshfakes/fake_secure_session.go b/cf/ssh/sshfakes/fake_secure_session.go index c428b59ef9..abf1792128 100644 --- a/cf/ssh/sshfakes/fake_secure_session.go +++ b/cf/ssh/sshfakes/fake_secure_session.go @@ -5,7 +5,7 @@ import ( "io" "sync" - sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" "golang.org/x/crypto/ssh" ) @@ -125,15 +125,16 @@ func (fake *FakeSecureSession) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -181,15 +182,16 @@ func (fake *FakeSecureSession) RequestPty(arg1 string, arg2 int, arg3 int, arg4 arg3 int arg4 ssh.TerminalModes }{arg1, arg2, arg3, arg4}) + stub := fake.RequestPtyStub + fakeReturns := fake.requestPtyReturns fake.recordInvocation("RequestPty", []interface{}{arg1, arg2, arg3, arg4}) fake.requestPtyMutex.Unlock() - if fake.RequestPtyStub != nil { - return fake.RequestPtyStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.requestPtyReturns return fakeReturns.result1 } @@ -248,15 +250,16 @@ func (fake *FakeSecureSession) SendRequest(arg1 string, arg2 bool, arg3 []byte) arg2 bool arg3 []byte }{arg1, arg2, arg3Copy}) + stub := fake.SendRequestStub + fakeReturns := fake.sendRequestReturns fake.recordInvocation("SendRequest", []interface{}{arg1, arg2, arg3Copy}) fake.sendRequestMutex.Unlock() - if fake.SendRequestStub != nil { - return fake.SendRequestStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.sendRequestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -310,15 +313,16 @@ func (fake *FakeSecureSession) Shell() error { ret, specificReturn := fake.shellReturnsOnCall[len(fake.shellArgsForCall)] fake.shellArgsForCall = append(fake.shellArgsForCall, struct { }{}) + stub := fake.ShellStub + fakeReturns := fake.shellReturns fake.recordInvocation("Shell", []interface{}{}) fake.shellMutex.Unlock() - if fake.ShellStub != nil { - return fake.ShellStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.shellReturns return fakeReturns.result1 } @@ -363,15 +367,16 @@ func (fake *FakeSecureSession) Start(arg1 string) error { fake.startArgsForCall = append(fake.startArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{arg1}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -422,15 +427,16 @@ func (fake *FakeSecureSession) StderrPipe() (io.Reader, error) { ret, specificReturn := fake.stderrPipeReturnsOnCall[len(fake.stderrPipeArgsForCall)] fake.stderrPipeArgsForCall = append(fake.stderrPipeArgsForCall, struct { }{}) + stub := fake.StderrPipeStub + fakeReturns := fake.stderrPipeReturns fake.recordInvocation("StderrPipe", []interface{}{}) fake.stderrPipeMutex.Unlock() - if fake.StderrPipeStub != nil { - return fake.StderrPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stderrPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -477,15 +483,16 @@ func (fake *FakeSecureSession) StdinPipe() (io.WriteCloser, error) { ret, specificReturn := fake.stdinPipeReturnsOnCall[len(fake.stdinPipeArgsForCall)] fake.stdinPipeArgsForCall = append(fake.stdinPipeArgsForCall, struct { }{}) + stub := fake.StdinPipeStub + fakeReturns := fake.stdinPipeReturns fake.recordInvocation("StdinPipe", []interface{}{}) fake.stdinPipeMutex.Unlock() - if fake.StdinPipeStub != nil { - return fake.StdinPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stdinPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -532,15 +539,16 @@ func (fake *FakeSecureSession) StdoutPipe() (io.Reader, error) { ret, specificReturn := fake.stdoutPipeReturnsOnCall[len(fake.stdoutPipeArgsForCall)] fake.stdoutPipeArgsForCall = append(fake.stdoutPipeArgsForCall, struct { }{}) + stub := fake.StdoutPipeStub + fakeReturns := fake.stdoutPipeReturns fake.recordInvocation("StdoutPipe", []interface{}{}) fake.stdoutPipeMutex.Unlock() - if fake.StdoutPipeStub != nil { - return fake.StdoutPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stdoutPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -587,15 +595,16 @@ func (fake *FakeSecureSession) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/cf/ssh/sshfakes/fake_secure_shell.go b/cf/ssh/sshfakes/fake_secure_shell.go index 46d02598aa..d600ac2e7c 100644 --- a/cf/ssh/sshfakes/fake_secure_shell.go +++ b/cf/ssh/sshfakes/fake_secure_shell.go @@ -4,8 +4,8 @@ package sshfakes import ( "sync" - sshCmd "code.cloudfoundry.org/cli/v8/cf/ssh" - "code.cloudfoundry.org/cli/v8/cf/ssh/options" + sshCmd "code.cloudfoundry.org/cli/v9/cf/ssh" + "code.cloudfoundry.org/cli/v9/cf/ssh/options" ) type FakeSecureShell struct { @@ -69,15 +69,16 @@ func (fake *FakeSecureShell) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -122,15 +123,16 @@ func (fake *FakeSecureShell) Connect(arg1 *options.SSHOptions) error { fake.connectArgsForCall = append(fake.connectArgsForCall, struct { arg1 *options.SSHOptions }{arg1}) + stub := fake.ConnectStub + fakeReturns := fake.connectReturns fake.recordInvocation("Connect", []interface{}{arg1}) fake.connectMutex.Unlock() - if fake.ConnectStub != nil { - return fake.ConnectStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.connectReturns return fakeReturns.result1 } @@ -181,15 +183,16 @@ func (fake *FakeSecureShell) InteractiveSession() error { ret, specificReturn := fake.interactiveSessionReturnsOnCall[len(fake.interactiveSessionArgsForCall)] fake.interactiveSessionArgsForCall = append(fake.interactiveSessionArgsForCall, struct { }{}) + stub := fake.InteractiveSessionStub + fakeReturns := fake.interactiveSessionReturns fake.recordInvocation("InteractiveSession", []interface{}{}) fake.interactiveSessionMutex.Unlock() - if fake.InteractiveSessionStub != nil { - return fake.InteractiveSessionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.interactiveSessionReturns return fakeReturns.result1 } @@ -233,15 +236,16 @@ func (fake *FakeSecureShell) LocalPortForward() error { ret, specificReturn := fake.localPortForwardReturnsOnCall[len(fake.localPortForwardArgsForCall)] fake.localPortForwardArgsForCall = append(fake.localPortForwardArgsForCall, struct { }{}) + stub := fake.LocalPortForwardStub + fakeReturns := fake.localPortForwardReturns fake.recordInvocation("LocalPortForward", []interface{}{}) fake.localPortForwardMutex.Unlock() - if fake.LocalPortForwardStub != nil { - return fake.LocalPortForwardStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.localPortForwardReturns return fakeReturns.result1 } @@ -285,15 +289,16 @@ func (fake *FakeSecureShell) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/cf/ssh/terminal/helper_test.go b/cf/ssh/terminal/helper_test.go index 2fa91f14ab..ccc6000ec5 100644 --- a/cf/ssh/terminal/helper_test.go +++ b/cf/ssh/terminal/helper_test.go @@ -1,7 +1,7 @@ package terminal_test import ( - "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go b/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go index e5ab97cabf..b38185c584 100644 --- a/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go +++ b/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v9/cf/ssh/terminal" "github.com/moby/term" ) @@ -96,15 +96,16 @@ func (fake *FakeTerminalHelper) GetFdInfo(arg1 interface{}) (uintptr, bool) { fake.getFdInfoArgsForCall = append(fake.getFdInfoArgsForCall, struct { arg1 interface{} }{arg1}) + stub := fake.GetFdInfoStub + fakeReturns := fake.getFdInfoReturns fake.recordInvocation("GetFdInfo", []interface{}{arg1}) fake.getFdInfoMutex.Unlock() - if fake.GetFdInfoStub != nil { - return fake.GetFdInfoStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getFdInfoReturns return fakeReturns.result1, fakeReturns.result2 } @@ -159,15 +160,16 @@ func (fake *FakeTerminalHelper) GetWinsize(arg1 uintptr) (*term.Winsize, error) fake.getWinsizeArgsForCall = append(fake.getWinsizeArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.GetWinsizeStub + fakeReturns := fake.getWinsizeReturns fake.recordInvocation("GetWinsize", []interface{}{arg1}) fake.getWinsizeMutex.Unlock() - if fake.GetWinsizeStub != nil { - return fake.GetWinsizeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getWinsizeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -222,15 +224,16 @@ func (fake *FakeTerminalHelper) IsTerminal(arg1 uintptr) bool { fake.isTerminalArgsForCall = append(fake.isTerminalArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.IsTerminalStub + fakeReturns := fake.isTerminalReturns fake.recordInvocation("IsTerminal", []interface{}{arg1}) fake.isTerminalMutex.Unlock() - if fake.IsTerminalStub != nil { - return fake.IsTerminalStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.isTerminalReturns return fakeReturns.result1 } @@ -283,15 +286,16 @@ func (fake *FakeTerminalHelper) RestoreTerminal(arg1 uintptr, arg2 *term.State) arg1 uintptr arg2 *term.State }{arg1, arg2}) + stub := fake.RestoreTerminalStub + fakeReturns := fake.restoreTerminalReturns fake.recordInvocation("RestoreTerminal", []interface{}{arg1, arg2}) fake.restoreTerminalMutex.Unlock() - if fake.RestoreTerminalStub != nil { - return fake.RestoreTerminalStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.restoreTerminalReturns return fakeReturns.result1 } @@ -343,15 +347,16 @@ func (fake *FakeTerminalHelper) SetRawTerminal(arg1 uintptr) (*term.State, error fake.setRawTerminalArgsForCall = append(fake.setRawTerminalArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.SetRawTerminalStub + fakeReturns := fake.setRawTerminalReturns fake.recordInvocation("SetRawTerminal", []interface{}{arg1}) fake.setRawTerminalMutex.Unlock() - if fake.SetRawTerminalStub != nil { - return fake.SetRawTerminalStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setRawTerminalReturns return fakeReturns.result1, fakeReturns.result2 } @@ -405,15 +410,16 @@ func (fake *FakeTerminalHelper) StdStreams() (io.ReadCloser, io.Writer, io.Write ret, specificReturn := fake.stdStreamsReturnsOnCall[len(fake.stdStreamsArgsForCall)] fake.stdStreamsArgsForCall = append(fake.stdStreamsArgsForCall, struct { }{}) + stub := fake.StdStreamsStub + fakeReturns := fake.stdStreamsReturns fake.recordInvocation("StdStreams", []interface{}{}) fake.stdStreamsMutex.Unlock() - if fake.StdStreamsStub != nil { - return fake.StdStreamsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.stdStreamsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/cf/terminal/color_test.go b/cf/terminal/color_test.go index 717b30ae1f..bf1eb3bae3 100644 --- a/cf/terminal/color_test.go +++ b/cf/terminal/color_test.go @@ -3,7 +3,7 @@ package terminal_test import ( "os" - . "code.cloudfoundry.org/cli/v8/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/terminal" "github.com/fatih/color" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/terminal/table_test.go b/cf/terminal/table_test.go index 0263a591ed..4aa06d6ec4 100644 --- a/cf/terminal/table_test.go +++ b/cf/terminal/table_test.go @@ -4,8 +4,8 @@ import ( "bytes" "strings" - . "code.cloudfoundry.org/cli/v8/cf/terminal" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 c31d7076d1..1313c5c5a3 100644 --- a/cf/terminal/tee_printer_test.go +++ b/cf/terminal/tee_printer_test.go @@ -3,9 +3,9 @@ package terminal_test import ( "os" - . "code.cloudfoundry.org/cli/v8/cf/terminal" + . "code.cloudfoundry.org/cli/v9/cf/terminal" - io_helpers "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/io" + io_helpers "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/io" . "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 9d70dd83c1..ecdae7bcf8 100644 --- a/cf/terminal/terminal_suite_test.go +++ b/cf/terminal/terminal_suite_test.go @@ -1,8 +1,8 @@ package terminal_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/terminal/terminalfakes/fake_ui.go b/cf/terminal/terminalfakes/fake_ui.go index de886b060b..3ccf190b0d 100644 --- a/cf/terminal/terminalfakes/fake_ui.go +++ b/cf/terminal/terminalfakes/fake_ui.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type FakeUI struct { @@ -152,15 +152,16 @@ func (fake *FakeUI) Ask(arg1 string) string { fake.askArgsForCall = append(fake.askArgsForCall, struct { arg1 string }{arg1}) + stub := fake.AskStub + fakeReturns := fake.askReturns fake.recordInvocation("Ask", []interface{}{arg1}) fake.askMutex.Unlock() - if fake.AskStub != nil { - return fake.AskStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.askReturns return fakeReturns.result1 } @@ -212,15 +213,16 @@ func (fake *FakeUI) AskForPassword(arg1 string) string { fake.askForPasswordArgsForCall = append(fake.askForPasswordArgsForCall, struct { arg1 string }{arg1}) + stub := fake.AskForPasswordStub + fakeReturns := fake.askForPasswordReturns fake.recordInvocation("AskForPassword", []interface{}{arg1}) fake.askForPasswordMutex.Unlock() - if fake.AskForPasswordStub != nil { - return fake.AskForPasswordStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.askForPasswordReturns return fakeReturns.result1 } @@ -272,15 +274,16 @@ func (fake *FakeUI) Confirm(arg1 string) bool { fake.confirmArgsForCall = append(fake.confirmArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ConfirmStub + fakeReturns := fake.confirmReturns fake.recordInvocation("Confirm", []interface{}{arg1}) fake.confirmMutex.Unlock() - if fake.ConfirmStub != nil { - return fake.ConfirmStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.confirmReturns return fakeReturns.result1 } @@ -333,15 +336,16 @@ func (fake *FakeUI) ConfirmDelete(arg1 string, arg2 string) bool { arg1 string arg2 string }{arg1, arg2}) + stub := fake.ConfirmDeleteStub + fakeReturns := fake.confirmDeleteReturns fake.recordInvocation("ConfirmDelete", []interface{}{arg1, arg2}) fake.confirmDeleteMutex.Unlock() - if fake.ConfirmDeleteStub != nil { - return fake.ConfirmDeleteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.confirmDeleteReturns return fakeReturns.result1 } @@ -394,15 +398,16 @@ func (fake *FakeUI) ConfirmDeleteWithAssociations(arg1 string, arg2 string) bool arg1 string arg2 string }{arg1, arg2}) + stub := fake.ConfirmDeleteWithAssociationsStub + fakeReturns := fake.confirmDeleteWithAssociationsReturns fake.recordInvocation("ConfirmDeleteWithAssociations", []interface{}{arg1, arg2}) fake.confirmDeleteWithAssociationsMutex.Unlock() - if fake.ConfirmDeleteWithAssociationsStub != nil { - return fake.ConfirmDeleteWithAssociationsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.confirmDeleteWithAssociationsReturns return fakeReturns.result1 } @@ -454,9 +459,10 @@ func (fake *FakeUI) Failed(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.FailedStub fake.recordInvocation("Failed", []interface{}{arg1, arg2}) fake.failedMutex.Unlock() - if fake.FailedStub != nil { + if stub != nil { fake.FailedStub(arg1, arg2...) } } @@ -484,9 +490,10 @@ func (fake *FakeUI) LoadingIndication() { fake.loadingIndicationMutex.Lock() fake.loadingIndicationArgsForCall = append(fake.loadingIndicationArgsForCall, struct { }{}) + stub := fake.LoadingIndicationStub fake.recordInvocation("LoadingIndication", []interface{}{}) fake.loadingIndicationMutex.Unlock() - if fake.LoadingIndicationStub != nil { + if stub != nil { fake.LoadingIndicationStub() } } @@ -508,9 +515,10 @@ func (fake *FakeUI) NotifyUpdateIfNeeded(arg1 coreconfig.Reader) { fake.notifyUpdateIfNeededArgsForCall = append(fake.notifyUpdateIfNeededArgsForCall, struct { arg1 coreconfig.Reader }{arg1}) + stub := fake.NotifyUpdateIfNeededStub fake.recordInvocation("NotifyUpdateIfNeeded", []interface{}{arg1}) fake.notifyUpdateIfNeededMutex.Unlock() - if fake.NotifyUpdateIfNeededStub != nil { + if stub != nil { fake.NotifyUpdateIfNeededStub(arg1) } } @@ -538,9 +546,10 @@ func (fake *FakeUI) Ok() { fake.okMutex.Lock() fake.okArgsForCall = append(fake.okArgsForCall, struct { }{}) + stub := fake.OkStub fake.recordInvocation("Ok", []interface{}{}) fake.okMutex.Unlock() - if fake.OkStub != nil { + if stub != nil { fake.OkStub() } } @@ -563,9 +572,10 @@ func (fake *FakeUI) PrintCapturingNoOutput(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.PrintCapturingNoOutputStub fake.recordInvocation("PrintCapturingNoOutput", []interface{}{arg1, arg2}) fake.printCapturingNoOutputMutex.Unlock() - if fake.PrintCapturingNoOutputStub != nil { + if stub != nil { fake.PrintCapturingNoOutputStub(arg1, arg2...) } } @@ -600,9 +610,10 @@ func (fake *FakeUI) PrintPaginator(arg1 []string, arg2 error) { arg1 []string arg2 error }{arg1Copy, arg2}) + stub := fake.PrintPaginatorStub fake.recordInvocation("PrintPaginator", []interface{}{arg1Copy, arg2}) fake.printPaginatorMutex.Unlock() - if fake.PrintPaginatorStub != nil { + if stub != nil { fake.PrintPaginatorStub(arg1, arg2) } } @@ -632,9 +643,10 @@ func (fake *FakeUI) Say(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.SayStub fake.recordInvocation("Say", []interface{}{arg1, arg2}) fake.sayMutex.Unlock() - if fake.SayStub != nil { + if stub != nil { fake.SayStub(arg1, arg2...) } } @@ -664,15 +676,16 @@ func (fake *FakeUI) ShowConfiguration(arg1 coreconfig.Reader) error { fake.showConfigurationArgsForCall = append(fake.showConfigurationArgsForCall, struct { arg1 coreconfig.Reader }{arg1}) + stub := fake.ShowConfigurationStub + fakeReturns := fake.showConfigurationReturns fake.recordInvocation("ShowConfiguration", []interface{}{arg1}) fake.showConfigurationMutex.Unlock() - if fake.ShowConfigurationStub != nil { - return fake.ShowConfigurationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.showConfigurationReturns return fakeReturns.result1 } @@ -729,15 +742,16 @@ func (fake *FakeUI) Table(arg1 []string) *terminal.UITable { fake.tableArgsForCall = append(fake.tableArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.TableStub + fakeReturns := fake.tableReturns fake.recordInvocation("Table", []interface{}{arg1Copy}) fake.tableMutex.Unlock() - if fake.TableStub != nil { - return fake.TableStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.tableReturns return fakeReturns.result1 } @@ -789,9 +803,10 @@ func (fake *FakeUI) Warn(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.WarnStub fake.recordInvocation("Warn", []interface{}{arg1, arg2}) fake.warnMutex.Unlock() - if fake.WarnStub != nil { + if stub != nil { fake.WarnStub(arg1, arg2...) } } @@ -820,15 +835,16 @@ func (fake *FakeUI) Writer() io.Writer { ret, specificReturn := fake.writerReturnsOnCall[len(fake.writerArgsForCall)] fake.writerArgsForCall = append(fake.writerArgsForCall, struct { }{}) + stub := fake.WriterStub + fakeReturns := fake.writerReturns fake.recordInvocation("Writer", []interface{}{}) fake.writerMutex.Unlock() - if fake.WriterStub != nil { - return fake.WriterStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.writerReturns return fakeReturns.result1 } diff --git a/cf/terminal/ui.go b/cf/terminal/ui.go index 4802c418eb..11879a6eee 100644 --- a/cf/terminal/ui.go +++ b/cf/terminal/ui.go @@ -5,15 +5,15 @@ import ( "io" "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" "bytes" "bufio" - "code.cloudfoundry.org/cli/v8/cf" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v9/cf" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type ColoringFunction func(value string, row int, col int) string diff --git a/cf/terminal/ui_test.go b/cf/terminal/ui_test.go index 4b37f70165..72bd293013 100644 --- a/cf/terminal/ui_test.go +++ b/cf/terminal/ui_test.go @@ -6,18 +6,18 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - io_helpers "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/io" - newUI "code.cloudfoundry.org/cli/v8/util/ui" - - . "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/cf/trace" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + io_helpers "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/io" + newUI "code.cloudfoundry.org/cli/v9/util/ui" + + . "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/cf/terminal/ui_unix.go b/cf/terminal/ui_unix.go index 652ac88f18..bafb50cf5f 100644 --- a/cf/terminal/ui_unix.go +++ b/cf/terminal/ui_unix.go @@ -13,7 +13,7 @@ import ( "strings" "syscall" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) const ( diff --git a/cf/trace/combined_printer_test.go b/cf/trace/combined_printer_test.go index f23f0f2a6a..1b7dee0b2e 100644 --- a/cf/trace/combined_printer_test.go +++ b/cf/trace/combined_printer_test.go @@ -1,9 +1,9 @@ package trace_test import ( - . "code.cloudfoundry.org/cli/v8/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/trace" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/trace/logger_provider.go b/cf/trace/logger_provider.go index 61a0da76b0..c073693249 100644 --- a/cf/trace/logger_provider.go +++ b/cf/trace/logger_provider.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) func NewLogger(writer io.Writer, verbose bool, boolsOrPaths ...string) Printer { diff --git a/cf/trace/logger_provider_test.go b/cf/trace/logger_provider_test.go index 3850af0623..7513cd3e03 100644 --- a/cf/trace/logger_provider_test.go +++ b/cf/trace/logger_provider_test.go @@ -5,7 +5,7 @@ import ( "path" "runtime" - . "code.cloudfoundry.org/cli/v8/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/trace" "code.cloudfoundry.org/gofileutils/fileutils" "os" diff --git a/cf/trace/trace.go b/cf/trace/trace.go index 701ea4c023..3e0f076de4 100644 --- a/cf/trace/trace.go +++ b/cf/trace/trace.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" ) var LoggingToStdout bool diff --git a/cf/trace/trace_suite_test.go b/cf/trace/trace_suite_test.go index 528b61ef60..1e5292d093 100644 --- a/cf/trace/trace_suite_test.go +++ b/cf/trace/trace_suite_test.go @@ -1,8 +1,8 @@ package trace_test import ( - "code.cloudfoundry.org/cli/v8/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/trace/trace_test.go b/cf/trace/trace_test.go index 5994272e1a..69366c3940 100644 --- a/cf/trace/trace_test.go +++ b/cf/trace/trace_test.go @@ -1,7 +1,7 @@ package trace_test import ( - . "code.cloudfoundry.org/cli/v8/cf/trace" + . "code.cloudfoundry.org/cli/v9/cf/trace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/trace/tracefakes/fake_printer.go b/cf/trace/tracefakes/fake_printer.go index 0d833d911c..3f9c24a61e 100644 --- a/cf/trace/tracefakes/fake_printer.go +++ b/cf/trace/tracefakes/fake_printer.go @@ -4,7 +4,7 @@ package tracefakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/trace" ) type FakePrinter struct { @@ -43,9 +43,10 @@ func (fake *FakePrinter) Print(arg1 ...interface{}) { fake.printArgsForCall = append(fake.printArgsForCall, struct { arg1 []interface{} }{arg1}) + stub := fake.PrintStub fake.recordInvocation("Print", []interface{}{arg1}) fake.printMutex.Unlock() - if fake.PrintStub != nil { + if stub != nil { fake.PrintStub(arg1...) } } @@ -75,9 +76,10 @@ func (fake *FakePrinter) Printf(arg1 string, arg2 ...interface{}) { arg1 string arg2 []interface{} }{arg1, arg2}) + stub := fake.PrintfStub fake.recordInvocation("Printf", []interface{}{arg1, arg2}) fake.printfMutex.Unlock() - if fake.PrintfStub != nil { + if stub != nil { fake.PrintfStub(arg1, arg2...) } } @@ -106,9 +108,10 @@ func (fake *FakePrinter) Println(arg1 ...interface{}) { fake.printlnArgsForCall = append(fake.printlnArgsForCall, struct { arg1 []interface{} }{arg1}) + stub := fake.PrintlnStub fake.recordInvocation("Println", []interface{}{arg1}) fake.printlnMutex.Unlock() - if fake.PrintlnStub != nil { + if stub != nil { fake.PrintlnStub(arg1...) } } @@ -137,15 +140,16 @@ func (fake *FakePrinter) WritesToConsole() bool { ret, specificReturn := fake.writesToConsoleReturnsOnCall[len(fake.writesToConsoleArgsForCall)] fake.writesToConsoleArgsForCall = append(fake.writesToConsoleArgsForCall, struct { }{}) + stub := fake.WritesToConsoleStub + fakeReturns := fake.writesToConsoleReturns fake.recordInvocation("WritesToConsole", []interface{}{}) fake.writesToConsoleMutex.Unlock() - if fake.WritesToConsoleStub != nil { - return fake.WritesToConsoleStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.writesToConsoleReturns return fakeReturns.result1 } diff --git a/cf/uihelpers/tags_parser_test.go b/cf/uihelpers/tags_parser_test.go index 1660a04111..9a4b87e29c 100644 --- a/cf/uihelpers/tags_parser_test.go +++ b/cf/uihelpers/tags_parser_test.go @@ -1,7 +1,7 @@ package uihelpers_test import ( - . "code.cloudfoundry.org/cli/v8/cf/uihelpers" + . "code.cloudfoundry.org/cli/v9/cf/uihelpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/uihelpers/ui.go b/cf/uihelpers/ui.go index 4aa24bf89e..9bfcd8eca1 100644 --- a/cf/uihelpers/ui.go +++ b/cf/uihelpers/ui.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - . "code.cloudfoundry.org/cli/v8/cf/i18n" + . "code.cloudfoundry.org/cli/v9/cf/i18n" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) func ColoredAppState(app models.ApplicationFields) string { diff --git a/cf/util/downloader/file_download.go b/cf/util/downloader/file_download.go index a6a71f80f4..a40e0516be 100644 --- a/cf/util/downloader/file_download.go +++ b/cf/util/downloader/file_download.go @@ -1,7 +1,7 @@ package downloader import ( - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/util" "fmt" "io" "net/http" diff --git a/cf/util/downloader/file_download_test.go b/cf/util/downloader/file_download_test.go index 19efd72b96..ae2ab40ac0 100644 --- a/cf/util/downloader/file_download_test.go +++ b/cf/util/downloader/file_download_test.go @@ -6,7 +6,7 @@ import ( "os" "path" - "code.cloudfoundry.org/cli/v8/cf/util/downloader" + "code.cloudfoundry.org/cli/v9/cf/util/downloader" "github.com/onsi/gomega/ghttp" diff --git a/cf/util/json/json_parser_test.go b/cf/util/json/json_parser_test.go index 29c9f61854..92a9bf5db4 100644 --- a/cf/util/json/json_parser_test.go +++ b/cf/util/json/json_parser_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "code.cloudfoundry.org/cli/v8/cf/util/json" + "code.cloudfoundry.org/cli/v9/cf/util/json" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/spellcheck/spellcheck_test.go b/cf/util/spellcheck/spellcheck_test.go index 970ac563f3..5c748fc0c3 100644 --- a/cf/util/spellcheck/spellcheck_test.go +++ b/cf/util/spellcheck/spellcheck_test.go @@ -1,7 +1,7 @@ package spellcheck_test import ( - . "code.cloudfoundry.org/cli/v8/cf/util/spellcheck" + . "code.cloudfoundry.org/cli/v9/cf/util/spellcheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/commands/requirements.go b/cf/util/testhelpers/commands/requirements.go index 46cb966792..1ee63f8023 100644 --- a/cf/util/testhelpers/commands/requirements.go +++ b/cf/util/testhelpers/commands/requirements.go @@ -1,6 +1,6 @@ package commands -import "code.cloudfoundry.org/cli/v8/cf/requirements" +import "code.cloudfoundry.org/cli/v9/cf/requirements" func RunRequirements(reqs []requirements.Requirement) error { var retErr error diff --git a/cf/util/testhelpers/commands/runner.go b/cf/util/testhelpers/commands/runner.go index 56b30d0765..f58648582a 100644 --- a/cf/util/testhelpers/commands/runner.go +++ b/cf/util/testhelpers/commands/runner.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - testterm "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + testterm "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/terminal" ) type RunCommandResult int diff --git a/cf/util/testhelpers/configuration/access_token.go b/cf/util/testhelpers/configuration/access_token.go index e57de6ff6f..e02c094fdb 100644 --- a/cf/util/testhelpers/configuration/access_token.go +++ b/cf/util/testhelpers/configuration/access_token.go @@ -9,7 +9,7 @@ import ( "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" ) func EncodeAccessToken(tokenInfo coreconfig.TokenInfo) (accessToken string, err error) { diff --git a/cf/util/testhelpers/configuration/fake_config_persistance.go b/cf/util/testhelpers/configuration/fake_config_persistance.go index e9222e60ce..ee12421008 100644 --- a/cf/util/testhelpers/configuration/fake_config_persistance.go +++ b/cf/util/testhelpers/configuration/fake_config_persistance.go @@ -1,8 +1,8 @@ package configuration import ( - "code.cloudfoundry.org/cli/v8/cf/configuration" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" ) type FakePersistor struct { diff --git a/cf/util/testhelpers/configuration/test_config.go b/cf/util/testhelpers/configuration/test_config.go index 3b3b8994f1..f651907f16 100644 --- a/cf/util/testhelpers/configuration/test_config.go +++ b/cf/util/testhelpers/configuration/test_config.go @@ -1,8 +1,8 @@ package configuration import ( - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" ) func NewRepository() coreconfig.Repository { diff --git a/cf/util/testhelpers/io/io_test.go b/cf/util/testhelpers/io/io_test.go index 9fe0772c74..f95bf412cc 100644 --- a/cf/util/testhelpers/io/io_test.go +++ b/cf/util/testhelpers/io/io_test.go @@ -4,7 +4,7 @@ import ( "os" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/io" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/io" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/all_requests_called_matcher.go b/cf/util/testhelpers/matchers/all_requests_called_matcher.go index e98bb9c7b6..bc4e485efe 100644 --- a/cf/util/testhelpers/matchers/all_requests_called_matcher.go +++ b/cf/util/testhelpers/matchers/all_requests_called_matcher.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/net" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/be_in_display_order.go b/cf/util/testhelpers/matchers/be_in_display_order.go index d58bb99f46..773c5de563 100644 --- a/cf/util/testhelpers/matchers/be_in_display_order.go +++ b/cf/util/testhelpers/matchers/be_in_display_order.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/terminal" "github.com/onsi/gomega" ) 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 abf20f4c68..de5b57964f 100644 --- a/cf/util/testhelpers/matchers/be_in_display_order_test.go +++ b/cf/util/testhelpers/matchers/be_in_display_order_test.go @@ -3,7 +3,7 @@ package matchers_test import ( "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 606ad12196..7bb5263f5d 100644 --- a/cf/util/testhelpers/matchers/contain_element_times_test.go +++ b/cf/util/testhelpers/matchers/contain_element_times_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 0500ff628a..0245167d72 100644 --- a/cf/util/testhelpers/matchers/contain_elements_in_order_test.go +++ b/cf/util/testhelpers/matchers/contain_elements_in_order_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/contain_substrings.go b/cf/util/testhelpers/matchers/contain_substrings.go index c1209d9362..40ecc55294 100644 --- a/cf/util/testhelpers/matchers/contain_substrings.go +++ b/cf/util/testhelpers/matchers/contain_substrings.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/terminal" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/have_succeeded.go b/cf/util/testhelpers/matchers/have_succeeded.go index 917944400f..113466cb8f 100644 --- a/cf/util/testhelpers/matchers/have_succeeded.go +++ b/cf/util/testhelpers/matchers/have_succeeded.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" "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 127612e9cc..f17f53ffdc 100644 --- a/cf/util/testhelpers/matchers/have_type_of_test.go +++ b/cf/util/testhelpers/matchers/have_type_of_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 2a06e9f189..5204423898 100644 --- a/cf/util/testhelpers/matchers/match_func_name_test.go +++ b/cf/util/testhelpers/matchers/match_func_name_test.go @@ -3,7 +3,7 @@ package matchers_test import ( "errors" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 a7f2dcdbc2..6fca0e941e 100644 --- a/cf/util/testhelpers/matchers/match_path_test.go +++ b/cf/util/testhelpers/matchers/match_path_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" "errors" . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" diff --git a/cf/util/testhelpers/matchers/passed_requirements.go b/cf/util/testhelpers/matchers/passed_requirements.go index 1756c375bd..1ed36c190a 100644 --- a/cf/util/testhelpers/matchers/passed_requirements.go +++ b/cf/util/testhelpers/matchers/passed_requirements.go @@ -3,7 +3,7 @@ package matchers import ( "fmt" - testcmd "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/commands" + testcmd "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/commands" "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go b/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go index df15686d3f..acab87bfc2 100644 --- a/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go +++ b/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go @@ -4,9 +4,9 @@ package rpcserverfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/v8/plugin" - plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v9/plugin" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" ) type FakeHandlers struct { @@ -381,15 +381,16 @@ func (fake *FakeHandlers) AccessToken(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{arg1, arg2}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1 } @@ -442,15 +443,16 @@ func (fake *FakeHandlers) ApiEndpoint(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.ApiEndpointStub + fakeReturns := fake.apiEndpointReturns fake.recordInvocation("ApiEndpoint", []interface{}{arg1, arg2}) fake.apiEndpointMutex.Unlock() - if fake.ApiEndpointStub != nil { - return fake.ApiEndpointStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.apiEndpointReturns return fakeReturns.result1 } @@ -503,15 +505,16 @@ func (fake *FakeHandlers) ApiVersion(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.ApiVersionStub + fakeReturns := fake.apiVersionReturns fake.recordInvocation("ApiVersion", []interface{}{arg1, arg2}) fake.apiVersionMutex.Unlock() - if fake.ApiVersionStub != nil { - return fake.ApiVersionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.apiVersionReturns return fakeReturns.result1 } @@ -569,15 +572,16 @@ func (fake *FakeHandlers) CallCoreCommand(arg1 []string, arg2 *bool) error { arg1 []string arg2 *bool }{arg1Copy, arg2}) + stub := fake.CallCoreCommandStub + fakeReturns := fake.callCoreCommandReturns fake.recordInvocation("CallCoreCommand", []interface{}{arg1Copy, arg2}) fake.callCoreCommandMutex.Unlock() - if fake.CallCoreCommandStub != nil { - return fake.CallCoreCommandStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.callCoreCommandReturns return fakeReturns.result1 } @@ -630,15 +634,16 @@ func (fake *FakeHandlers) DisableTerminalOutput(arg1 bool, arg2 *bool) error { arg1 bool arg2 *bool }{arg1, arg2}) + stub := fake.DisableTerminalOutputStub + fakeReturns := fake.disableTerminalOutputReturns fake.recordInvocation("DisableTerminalOutput", []interface{}{arg1, arg2}) fake.disableTerminalOutputMutex.Unlock() - if fake.DisableTerminalOutputStub != nil { - return fake.DisableTerminalOutputStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.disableTerminalOutputReturns return fakeReturns.result1 } @@ -691,15 +696,16 @@ func (fake *FakeHandlers) DopplerEndpoint(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.DopplerEndpointStub + fakeReturns := fake.dopplerEndpointReturns fake.recordInvocation("DopplerEndpoint", []interface{}{arg1, arg2}) fake.dopplerEndpointMutex.Unlock() - if fake.DopplerEndpointStub != nil { - return fake.DopplerEndpointStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.dopplerEndpointReturns return fakeReturns.result1 } @@ -752,15 +758,16 @@ func (fake *FakeHandlers) GetApp(arg1 string, arg2 *plugin_models.GetAppModel) e arg1 string arg2 *plugin_models.GetAppModel }{arg1, arg2}) + stub := fake.GetAppStub + fakeReturns := fake.getAppReturns fake.recordInvocation("GetApp", []interface{}{arg1, arg2}) fake.getAppMutex.Unlock() - if fake.GetAppStub != nil { - return fake.GetAppStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getAppReturns return fakeReturns.result1 } @@ -813,15 +820,16 @@ func (fake *FakeHandlers) GetApps(arg1 string, arg2 *[]plugin_models.GetAppsMode arg1 string arg2 *[]plugin_models.GetAppsModel }{arg1, arg2}) + stub := fake.GetAppsStub + fakeReturns := fake.getAppsReturns fake.recordInvocation("GetApps", []interface{}{arg1, arg2}) fake.getAppsMutex.Unlock() - if fake.GetAppsStub != nil { - return fake.GetAppsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getAppsReturns return fakeReturns.result1 } @@ -874,15 +882,16 @@ func (fake *FakeHandlers) GetCurrentOrg(arg1 string, arg2 *plugin_models.Organiz arg1 string arg2 *plugin_models.Organization }{arg1, arg2}) + stub := fake.GetCurrentOrgStub + fakeReturns := fake.getCurrentOrgReturns fake.recordInvocation("GetCurrentOrg", []interface{}{arg1, arg2}) fake.getCurrentOrgMutex.Unlock() - if fake.GetCurrentOrgStub != nil { - return fake.GetCurrentOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getCurrentOrgReturns return fakeReturns.result1 } @@ -935,15 +944,16 @@ func (fake *FakeHandlers) GetCurrentSpace(arg1 string, arg2 *plugin_models.Space arg1 string arg2 *plugin_models.Space }{arg1, arg2}) + stub := fake.GetCurrentSpaceStub + fakeReturns := fake.getCurrentSpaceReturns fake.recordInvocation("GetCurrentSpace", []interface{}{arg1, arg2}) fake.getCurrentSpaceMutex.Unlock() - if fake.GetCurrentSpaceStub != nil { - return fake.GetCurrentSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getCurrentSpaceReturns return fakeReturns.result1 } @@ -996,15 +1006,16 @@ func (fake *FakeHandlers) GetOrg(arg1 string, arg2 *plugin_models.GetOrg_Model) arg1 string arg2 *plugin_models.GetOrg_Model }{arg1, arg2}) + stub := fake.GetOrgStub + fakeReturns := fake.getOrgReturns fake.recordInvocation("GetOrg", []interface{}{arg1, arg2}) fake.getOrgMutex.Unlock() - if fake.GetOrgStub != nil { - return fake.GetOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrgReturns return fakeReturns.result1 } @@ -1062,15 +1073,16 @@ func (fake *FakeHandlers) GetOrgUsers(arg1 []string, arg2 *[]plugin_models.GetOr arg1 []string arg2 *[]plugin_models.GetOrgUsers_Model }{arg1Copy, arg2}) + stub := fake.GetOrgUsersStub + fakeReturns := fake.getOrgUsersReturns fake.recordInvocation("GetOrgUsers", []interface{}{arg1Copy, arg2}) fake.getOrgUsersMutex.Unlock() - if fake.GetOrgUsersStub != nil { - return fake.GetOrgUsersStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrgUsersReturns return fakeReturns.result1 } @@ -1123,15 +1135,16 @@ func (fake *FakeHandlers) GetOrgs(arg1 string, arg2 *[]plugin_models.GetOrgs_Mod arg1 string arg2 *[]plugin_models.GetOrgs_Model }{arg1, arg2}) + stub := fake.GetOrgsStub + fakeReturns := fake.getOrgsReturns fake.recordInvocation("GetOrgs", []interface{}{arg1, arg2}) fake.getOrgsMutex.Unlock() - if fake.GetOrgsStub != nil { - return fake.GetOrgsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getOrgsReturns return fakeReturns.result1 } @@ -1184,15 +1197,16 @@ func (fake *FakeHandlers) GetOutputAndReset(arg1 bool, arg2 *[]string) error { arg1 bool arg2 *[]string }{arg1, arg2}) + stub := fake.GetOutputAndResetStub + fakeReturns := fake.getOutputAndResetReturns fake.recordInvocation("GetOutputAndReset", []interface{}{arg1, arg2}) fake.getOutputAndResetMutex.Unlock() - if fake.GetOutputAndResetStub != nil { - return fake.GetOutputAndResetStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getOutputAndResetReturns return fakeReturns.result1 } @@ -1245,15 +1259,16 @@ func (fake *FakeHandlers) GetService(arg1 string, arg2 *plugin_models.GetService arg1 string arg2 *plugin_models.GetService_Model }{arg1, arg2}) + stub := fake.GetServiceStub + fakeReturns := fake.getServiceReturns fake.recordInvocation("GetService", []interface{}{arg1, arg2}) fake.getServiceMutex.Unlock() - if fake.GetServiceStub != nil { - return fake.GetServiceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getServiceReturns return fakeReturns.result1 } @@ -1306,15 +1321,16 @@ func (fake *FakeHandlers) GetServices(arg1 string, arg2 *[]plugin_models.GetServ arg1 string arg2 *[]plugin_models.GetServices_Model }{arg1, arg2}) + stub := fake.GetServicesStub + fakeReturns := fake.getServicesReturns fake.recordInvocation("GetServices", []interface{}{arg1, arg2}) fake.getServicesMutex.Unlock() - if fake.GetServicesStub != nil { - return fake.GetServicesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getServicesReturns return fakeReturns.result1 } @@ -1367,15 +1383,16 @@ func (fake *FakeHandlers) GetSpace(arg1 string, arg2 *plugin_models.GetSpace_Mod arg1 string arg2 *plugin_models.GetSpace_Model }{arg1, arg2}) + stub := fake.GetSpaceStub + fakeReturns := fake.getSpaceReturns fake.recordInvocation("GetSpace", []interface{}{arg1, arg2}) fake.getSpaceMutex.Unlock() - if fake.GetSpaceStub != nil { - return fake.GetSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getSpaceReturns return fakeReturns.result1 } @@ -1433,15 +1450,16 @@ func (fake *FakeHandlers) GetSpaceUsers(arg1 []string, arg2 *[]plugin_models.Get arg1 []string arg2 *[]plugin_models.GetSpaceUsers_Model }{arg1Copy, arg2}) + stub := fake.GetSpaceUsersStub + fakeReturns := fake.getSpaceUsersReturns fake.recordInvocation("GetSpaceUsers", []interface{}{arg1Copy, arg2}) fake.getSpaceUsersMutex.Unlock() - if fake.GetSpaceUsersStub != nil { - return fake.GetSpaceUsersStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getSpaceUsersReturns return fakeReturns.result1 } @@ -1494,15 +1512,16 @@ func (fake *FakeHandlers) GetSpaces(arg1 string, arg2 *[]plugin_models.GetSpaces arg1 string arg2 *[]plugin_models.GetSpaces_Model }{arg1, arg2}) + stub := fake.GetSpacesStub + fakeReturns := fake.getSpacesReturns fake.recordInvocation("GetSpaces", []interface{}{arg1, arg2}) fake.getSpacesMutex.Unlock() - if fake.GetSpacesStub != nil { - return fake.GetSpacesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getSpacesReturns return fakeReturns.result1 } @@ -1555,15 +1574,16 @@ func (fake *FakeHandlers) HasAPIEndpoint(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.HasAPIEndpointStub + fakeReturns := fake.hasAPIEndpointReturns fake.recordInvocation("HasAPIEndpoint", []interface{}{arg1, arg2}) fake.hasAPIEndpointMutex.Unlock() - if fake.HasAPIEndpointStub != nil { - return fake.HasAPIEndpointStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasAPIEndpointReturns return fakeReturns.result1 } @@ -1616,15 +1636,16 @@ func (fake *FakeHandlers) HasOrganization(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.HasOrganizationStub + fakeReturns := fake.hasOrganizationReturns fake.recordInvocation("HasOrganization", []interface{}{arg1, arg2}) fake.hasOrganizationMutex.Unlock() - if fake.HasOrganizationStub != nil { - return fake.HasOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasOrganizationReturns return fakeReturns.result1 } @@ -1677,15 +1698,16 @@ func (fake *FakeHandlers) HasSpace(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.HasSpaceStub + fakeReturns := fake.hasSpaceReturns fake.recordInvocation("HasSpace", []interface{}{arg1, arg2}) fake.hasSpaceMutex.Unlock() - if fake.HasSpaceStub != nil { - return fake.HasSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.hasSpaceReturns return fakeReturns.result1 } @@ -1738,15 +1760,16 @@ func (fake *FakeHandlers) IsLoggedIn(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{arg1, arg2}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1 } @@ -1799,15 +1822,16 @@ func (fake *FakeHandlers) IsMinCliVersion(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.IsMinCliVersionStub + fakeReturns := fake.isMinCliVersionReturns fake.recordInvocation("IsMinCliVersion", []interface{}{arg1, arg2}) fake.isMinCliVersionMutex.Unlock() - if fake.IsMinCliVersionStub != nil { - return fake.IsMinCliVersionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.isMinCliVersionReturns return fakeReturns.result1 } @@ -1860,15 +1884,16 @@ func (fake *FakeHandlers) IsSSLDisabled(arg1 string, arg2 *bool) error { arg1 string arg2 *bool }{arg1, arg2}) + stub := fake.IsSSLDisabledStub + fakeReturns := fake.isSSLDisabledReturns fake.recordInvocation("IsSSLDisabled", []interface{}{arg1, arg2}) fake.isSSLDisabledMutex.Unlock() - if fake.IsSSLDisabledStub != nil { - return fake.IsSSLDisabledStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.isSSLDisabledReturns return fakeReturns.result1 } @@ -1921,15 +1946,16 @@ func (fake *FakeHandlers) LoggregatorEndpoint(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.LoggregatorEndpointStub + fakeReturns := fake.loggregatorEndpointReturns fake.recordInvocation("LoggregatorEndpoint", []interface{}{arg1, arg2}) fake.loggregatorEndpointMutex.Unlock() - if fake.LoggregatorEndpointStub != nil { - return fake.LoggregatorEndpointStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.loggregatorEndpointReturns return fakeReturns.result1 } @@ -1982,15 +2008,16 @@ func (fake *FakeHandlers) SetPluginMetadata(arg1 plugin.PluginMetadata, arg2 *bo arg1 plugin.PluginMetadata arg2 *bool }{arg1, arg2}) + stub := fake.SetPluginMetadataStub + fakeReturns := fake.setPluginMetadataReturns fake.recordInvocation("SetPluginMetadata", []interface{}{arg1, arg2}) fake.setPluginMetadataMutex.Unlock() - if fake.SetPluginMetadataStub != nil { - return fake.SetPluginMetadataStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.setPluginMetadataReturns return fakeReturns.result1 } @@ -2043,15 +2070,16 @@ func (fake *FakeHandlers) UserEmail(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.UserEmailStub + fakeReturns := fake.userEmailReturns fake.recordInvocation("UserEmail", []interface{}{arg1, arg2}) fake.userEmailMutex.Unlock() - if fake.UserEmailStub != nil { - return fake.UserEmailStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.userEmailReturns return fakeReturns.result1 } @@ -2104,15 +2132,16 @@ func (fake *FakeHandlers) UserGuid(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.UserGuidStub + fakeReturns := fake.userGuidReturns fake.recordInvocation("UserGuid", []interface{}{arg1, arg2}) fake.userGuidMutex.Unlock() - if fake.UserGuidStub != nil { - return fake.UserGuidStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.userGuidReturns return fakeReturns.result1 } @@ -2165,15 +2194,16 @@ func (fake *FakeHandlers) Username(arg1 string, arg2 *string) error { arg1 string arg2 *string }{arg1, arg2}) + stub := fake.UsernameStub + fakeReturns := fake.usernameReturns fake.recordInvocation("Username", []interface{}{arg1, arg2}) fake.usernameMutex.Unlock() - if fake.UsernameStub != nil { - return fake.UsernameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.usernameReturns return fakeReturns.result1 } diff --git a/cf/util/testhelpers/rpcserver/server.go b/cf/util/testhelpers/rpcserver/server.go index 72eba1f645..30ef099925 100644 --- a/cf/util/testhelpers/rpcserver/server.go +++ b/cf/util/testhelpers/rpcserver/server.go @@ -9,8 +9,8 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/v8/plugin" - "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/plugin" + "code.cloudfoundry.org/cli/v9/plugin/models" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Handlers diff --git a/cf/util/testhelpers/terminal/ui.go b/cf/util/testhelpers/terminal/ui.go index 2ac3ed5765..5979179efa 100644 --- a/cf/util/testhelpers/terminal/ui.go +++ b/cf/util/testhelpers/terminal/ui.go @@ -9,8 +9,8 @@ import ( "os" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - term "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + term "code.cloudfoundry.org/cli/v9/cf/terminal" ) type FakeUI struct { diff --git a/cf/util/utilfakes/fake_sha1checksum.go b/cf/util/utilfakes/fake_sha1checksum.go index 1d9d065300..10b9513f40 100644 --- a/cf/util/utilfakes/fake_sha1checksum.go +++ b/cf/util/utilfakes/fake_sha1checksum.go @@ -4,7 +4,7 @@ package utilfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/util" ) type FakeSha1Checksum struct { diff --git a/command/api_version_warning.go b/command/api_version_warning.go index e53946fdf5..c477f3591e 100644 --- a/command/api_version_warning.go +++ b/command/api_version_warning.go @@ -1,8 +1,8 @@ package command import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" ) diff --git a/command/api_version_warning_test.go b/command/api_version_warning_test.go index 6282e44f31..119938b86c 100644 --- a/command/api_version_warning_test.go +++ b/command/api_version_warning_test.go @@ -4,11 +4,11 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/commandfakes/fake_config.go b/command/commandfakes/fake_config.go index af04e7cb3a..9565997676 100644 --- a/command/commandfakes/fake_config.go +++ b/command/commandfakes/fake_config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeConfig struct { diff --git a/command/commandfakes/fake_shared_actor.go b/command/commandfakes/fake_shared_actor.go index 948372c2d7..b9e36cdf57 100644 --- a/command/commandfakes/fake_shared_actor.go +++ b/command/commandfakes/fake_shared_actor.go @@ -4,7 +4,7 @@ package commandfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v9/command" ) type FakeSharedActor struct { @@ -85,15 +85,16 @@ func (fake *FakeSharedActor) CheckTarget(arg1 bool, arg2 bool) error { arg1 bool arg2 bool }{arg1, arg2}) + stub := fake.CheckTargetStub + fakeReturns := fake.checkTargetReturns fake.recordInvocation("CheckTarget", []interface{}{arg1, arg2}) fake.checkTargetMutex.Unlock() - if fake.CheckTargetStub != nil { - return fake.CheckTargetStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.checkTargetReturns return fakeReturns.result1 } @@ -144,15 +145,16 @@ func (fake *FakeSharedActor) IsLoggedIn() bool { ret, specificReturn := fake.isLoggedInReturnsOnCall[len(fake.isLoggedInArgsForCall)] fake.isLoggedInArgsForCall = append(fake.isLoggedInArgsForCall, struct { }{}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1 } @@ -196,15 +198,16 @@ func (fake *FakeSharedActor) IsOrgTargeted() bool { ret, specificReturn := fake.isOrgTargetedReturnsOnCall[len(fake.isOrgTargetedArgsForCall)] fake.isOrgTargetedArgsForCall = append(fake.isOrgTargetedArgsForCall, struct { }{}) + stub := fake.IsOrgTargetedStub + fakeReturns := fake.isOrgTargetedReturns fake.recordInvocation("IsOrgTargeted", []interface{}{}) fake.isOrgTargetedMutex.Unlock() - if fake.IsOrgTargetedStub != nil { - return fake.IsOrgTargetedStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isOrgTargetedReturns return fakeReturns.result1 } @@ -248,15 +251,16 @@ func (fake *FakeSharedActor) IsSpaceTargeted() bool { ret, specificReturn := fake.isSpaceTargetedReturnsOnCall[len(fake.isSpaceTargetedArgsForCall)] fake.isSpaceTargetedArgsForCall = append(fake.isSpaceTargetedArgsForCall, struct { }{}) + stub := fake.IsSpaceTargetedStub + fakeReturns := fake.isSpaceTargetedReturns fake.recordInvocation("IsSpaceTargeted", []interface{}{}) fake.isSpaceTargetedMutex.Unlock() - if fake.IsSpaceTargetedStub != nil { - return fake.IsSpaceTargetedStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isSpaceTargetedReturns return fakeReturns.result1 } @@ -300,15 +304,16 @@ func (fake *FakeSharedActor) RequireCurrentUser() (string, error) { ret, specificReturn := fake.requireCurrentUserReturnsOnCall[len(fake.requireCurrentUserArgsForCall)] fake.requireCurrentUserArgsForCall = append(fake.requireCurrentUserArgsForCall, struct { }{}) + stub := fake.RequireCurrentUserStub + fakeReturns := fake.requireCurrentUserReturns fake.recordInvocation("RequireCurrentUser", []interface{}{}) fake.requireCurrentUserMutex.Unlock() - if fake.RequireCurrentUserStub != nil { - return fake.RequireCurrentUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requireCurrentUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -355,15 +360,16 @@ func (fake *FakeSharedActor) RequireTargetedOrg() (string, error) { ret, specificReturn := fake.requireTargetedOrgReturnsOnCall[len(fake.requireTargetedOrgArgsForCall)] fake.requireTargetedOrgArgsForCall = append(fake.requireTargetedOrgArgsForCall, struct { }{}) + stub := fake.RequireTargetedOrgStub + fakeReturns := fake.requireTargetedOrgReturns fake.recordInvocation("RequireTargetedOrg", []interface{}{}) fake.requireTargetedOrgMutex.Unlock() - if fake.RequireTargetedOrgStub != nil { - return fake.RequireTargetedOrgStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.requireTargetedOrgReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/commandfakes/fake_ui.go b/command/commandfakes/fake_ui.go index 931226c8c2..a168965e9a 100644 --- a/command/commandfakes/fake_ui.go +++ b/command/commandfakes/fake_ui.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeUI struct { @@ -742,15 +742,16 @@ func (fake *FakeUI) DisplayJSON(arg1 string, arg2 interface{}) error { arg1 string arg2 interface{} }{arg1, arg2}) + stub := fake.DisplayJSONStub + fakeReturns := fake.displayJSONReturns fake.recordInvocation("DisplayJSON", []interface{}{arg1, arg2}) fake.displayJSONMutex.Unlock() - if fake.DisplayJSONStub != nil { - return fake.DisplayJSONStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayJSONReturns return fakeReturns.result1 } diff --git a/command/common/command_list_v7.go b/command/common/command_list_v7.go index 4bb960c8e3..02bb8f322a 100644 --- a/command/common/command_list_v7.go +++ b/command/common/command_list_v7.go @@ -3,8 +3,8 @@ package common import ( "reflect" - "code.cloudfoundry.org/cli/v8/command/plugin" - v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/command/plugin" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) var Commands commandList diff --git a/command/common/command_list_v7_test.go b/command/common/command_list_v7_test.go index 92fffb0f37..88c2b05e16 100644 --- a/command/common/command_list_v7_test.go +++ b/command/common/command_list_v7_test.go @@ -1,7 +1,7 @@ package common_test import ( - . "code.cloudfoundry.org/cli/v8/command/common" + . "code.cloudfoundry.org/cli/v9/command/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/commonfakes/fake_help_actor.go b/command/common/commonfakes/fake_help_actor.go index d982a9f618..8432abeeab 100644 --- a/command/common/commonfakes/fake_help_actor.go +++ b/command/common/commonfakes/fake_help_actor.go @@ -4,8 +4,8 @@ package commonfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/command/common" ) type FakeHelpActor struct { @@ -45,15 +45,16 @@ func (fake *FakeHelpActor) CommandInfoByName(arg1 interface{}, arg2 string) (sha arg1 interface{} arg2 string }{arg1, arg2}) + stub := fake.CommandInfoByNameStub + fakeReturns := fake.commandInfoByNameReturns fake.recordInvocation("CommandInfoByName", []interface{}{arg1, arg2}) fake.commandInfoByNameMutex.Unlock() - if fake.CommandInfoByNameStub != nil { - return fake.CommandInfoByNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.commandInfoByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -108,15 +109,16 @@ func (fake *FakeHelpActor) CommandInfos(arg1 interface{}) map[string]sharedactio fake.commandInfosArgsForCall = append(fake.commandInfosArgsForCall, struct { arg1 interface{} }{arg1}) + stub := fake.CommandInfosStub + fakeReturns := fake.commandInfosReturns fake.recordInvocation("CommandInfos", []interface{}{arg1}) fake.commandInfosMutex.Unlock() - if fake.CommandInfosStub != nil { - return fake.CommandInfosStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.commandInfosReturns return fakeReturns.result1 } diff --git a/command/common/commonfakes/fake_install_plugin_actor.go b/command/common/commonfakes/fake_install_plugin_actor.go index 8d5eeae77b..4877908b2e 100644 --- a/command/common/commonfakes/fake_install_plugin_actor.go +++ b/command/common/commonfakes/fake_install_plugin_actor.go @@ -4,10 +4,10 @@ package commonfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeInstallPluginActor struct { @@ -155,15 +155,16 @@ func (fake *FakeInstallPluginActor) CreateExecutableCopy(arg1 string, arg2 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateExecutableCopyStub + fakeReturns := fake.createExecutableCopyReturns fake.recordInvocation("CreateExecutableCopy", []interface{}{arg1, arg2}) fake.createExecutableCopyMutex.Unlock() - if fake.CreateExecutableCopyStub != nil { - return fake.CreateExecutableCopyStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createExecutableCopyReturns return fakeReturns.result1, fakeReturns.result2 } @@ -220,15 +221,16 @@ func (fake *FakeInstallPluginActor) DownloadExecutableBinaryFromURL(arg1 string, arg2 string arg3 plugin.ProxyReader }{arg1, arg2, arg3}) + stub := fake.DownloadExecutableBinaryFromURLStub + fakeReturns := fake.downloadExecutableBinaryFromURLReturns fake.recordInvocation("DownloadExecutableBinaryFromURL", []interface{}{arg1, arg2, arg3}) fake.downloadExecutableBinaryFromURLMutex.Unlock() - if fake.DownloadExecutableBinaryFromURLStub != nil { - return fake.DownloadExecutableBinaryFromURLStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.downloadExecutableBinaryFromURLReturns return fakeReturns.result1, fakeReturns.result2 } @@ -283,15 +285,16 @@ func (fake *FakeInstallPluginActor) FileExists(arg1 string) bool { fake.fileExistsArgsForCall = append(fake.fileExistsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.FileExistsStub + fakeReturns := fake.fileExistsReturns fake.recordInvocation("FileExists", []interface{}{arg1}) fake.fileExistsMutex.Unlock() - if fake.FileExistsStub != nil { - return fake.FileExistsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.fileExistsReturns return fakeReturns.result1 } @@ -345,15 +348,16 @@ func (fake *FakeInstallPluginActor) GetAndValidatePlugin(arg1 pluginaction.Plugi arg2 pluginaction.CommandList arg3 string }{arg1, arg2, arg3}) + stub := fake.GetAndValidatePluginStub + fakeReturns := fake.getAndValidatePluginReturns fake.recordInvocation("GetAndValidatePlugin", []interface{}{arg1, arg2, arg3}) fake.getAndValidatePluginMutex.Unlock() - if fake.GetAndValidatePluginStub != nil { - return fake.GetAndValidatePluginStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAndValidatePluginReturns return fakeReturns.result1, fakeReturns.result2 } @@ -409,15 +413,16 @@ func (fake *FakeInstallPluginActor) GetPlatformString(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetPlatformStringStub + fakeReturns := fake.getPlatformStringReturns fake.recordInvocation("GetPlatformString", []interface{}{arg1, arg2}) fake.getPlatformStringMutex.Unlock() - if fake.GetPlatformStringStub != nil { - return fake.GetPlatformStringStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.getPlatformStringReturns return fakeReturns.result1 } @@ -476,15 +481,16 @@ func (fake *FakeInstallPluginActor) GetPluginInfoFromRepositoriesForPlatform(arg arg2 []configv3.PluginRepository arg3 string }{arg1, arg2Copy, arg3}) + stub := fake.GetPluginInfoFromRepositoriesForPlatformStub + fakeReturns := fake.getPluginInfoFromRepositoriesForPlatformReturns fake.recordInvocation("GetPluginInfoFromRepositoriesForPlatform", []interface{}{arg1, arg2Copy, arg3}) fake.getPluginInfoFromRepositoriesForPlatformMutex.Unlock() - if fake.GetPluginInfoFromRepositoriesForPlatformStub != nil { - return fake.GetPluginInfoFromRepositoriesForPlatformStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getPluginInfoFromRepositoriesForPlatformReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -542,15 +548,16 @@ func (fake *FakeInstallPluginActor) GetPluginRepository(arg1 string) (configv3.P fake.getPluginRepositoryArgsForCall = append(fake.getPluginRepositoryArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPluginRepositoryStub + fakeReturns := fake.getPluginRepositoryReturns fake.recordInvocation("GetPluginRepository", []interface{}{arg1}) fake.getPluginRepositoryMutex.Unlock() - if fake.GetPluginRepositoryStub != nil { - return fake.GetPluginRepositoryStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPluginRepositoryReturns return fakeReturns.result1, fakeReturns.result2 } @@ -606,15 +613,16 @@ func (fake *FakeInstallPluginActor) InstallPluginFromPath(arg1 string, arg2 conf arg1 string arg2 configv3.Plugin }{arg1, arg2}) + stub := fake.InstallPluginFromPathStub + fakeReturns := fake.installPluginFromPathReturns fake.recordInvocation("InstallPluginFromPath", []interface{}{arg1, arg2}) fake.installPluginFromPathMutex.Unlock() - if fake.InstallPluginFromPathStub != nil { - return fake.InstallPluginFromPathStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.installPluginFromPathReturns return fakeReturns.result1 } @@ -667,15 +675,16 @@ func (fake *FakeInstallPluginActor) UninstallPlugin(arg1 pluginaction.PluginUnin arg1 pluginaction.PluginUninstaller arg2 string }{arg1, arg2}) + stub := fake.UninstallPluginStub + fakeReturns := fake.uninstallPluginReturns fake.recordInvocation("UninstallPlugin", []interface{}{arg1, arg2}) fake.uninstallPluginMutex.Unlock() - if fake.UninstallPluginStub != nil { - return fake.UninstallPluginStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.uninstallPluginReturns return fakeReturns.result1 } @@ -728,15 +737,16 @@ func (fake *FakeInstallPluginActor) ValidateFileChecksum(arg1 string, arg2 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.ValidateFileChecksumStub + fakeReturns := fake.validateFileChecksumReturns fake.recordInvocation("ValidateFileChecksum", []interface{}{arg1, arg2}) fake.validateFileChecksumMutex.Unlock() - if fake.ValidateFileChecksumStub != nil { - return fake.ValidateFileChecksumStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.validateFileChecksumReturns return fakeReturns.result1 } diff --git a/command/common/help_command.go b/command/common/help_command.go index 41d337f371..c5980234ea 100644 --- a/command/common/help_command.go +++ b/command/common/help_command.go @@ -5,12 +5,12 @@ import ( "math" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/common/internal" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/common/internal" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . HelpActor diff --git a/command/common/install_plugin_command.go b/command/common/install_plugin_command.go index d176b56f9d..7ebb070d95 100644 --- a/command/common/install_plugin_command.go +++ b/command/common/install_plugin_command.go @@ -6,16 +6,16 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/plugin/shared" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/plugin/shared" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/util/configv3" log "github.com/sirupsen/logrus" ) diff --git a/command/common/install_plugin_command_test.go b/command/common/install_plugin_command_test.go index dd8f75504e..45b66d1619 100644 --- a/command/common/install_plugin_command_test.go +++ b/command/common/install_plugin_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/command/common/commonfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/common/commonfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "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 d7227281c2..e9dae85965 100644 --- a/command/common/install_plugin_from_repo_command_test.go +++ b/command/common/install_plugin_from_repo_command_test.go @@ -8,18 +8,18 @@ import ( "os" "runtime" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginfakes" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/command/common/commonfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/common/commonfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/common/internal/help_all_display_test.go b/command/common/internal/help_all_display_test.go index 8e0dd0e34a..3cd84d34d0 100644 --- a/command/common/internal/help_all_display_test.go +++ b/command/common/internal/help_all_display_test.go @@ -4,8 +4,8 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/command/common/internal" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/common/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/internal/help_display.go b/command/common/internal/help_display.go index d2b309a83e..3f08bc5cce 100644 --- a/command/common/internal/help_display.go +++ b/command/common/internal/help_display.go @@ -5,9 +5,9 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/sorting" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/sorting" ) type HelpCategory struct { diff --git a/command/common/version_command.go b/command/common/version_command.go index 9d5fe25a35..bf196f5968 100644 --- a/command/common/version_command.go +++ b/command/common/version_command.go @@ -1,6 +1,6 @@ package common -import "code.cloudfoundry.org/cli/v8/command" +import "code.cloudfoundry.org/cli/v9/command" type VersionCommand struct { usage interface{} `usage:"CF_NAME version\n\n 'cf -v' and 'cf --version' are also accepted."` diff --git a/command/common/version_command_test.go b/command/common/version_command_test.go index 52c7a6295c..b0373073f6 100644 --- a/command/common/version_command_test.go +++ b/command/common/version_command_test.go @@ -1,9 +1,9 @@ package common_test import ( - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/config.go b/command/config.go index 57f480e467..bbdf777643 100644 --- a/command/config.go +++ b/command/config.go @@ -3,7 +3,7 @@ package command import ( "time" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/command/flag/app_type_test.go b/command/flag/app_type_test.go index 017df82a18..df6067c9a5 100644 --- a/command/flag/app_type_test.go +++ b/command/flag/app_type_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "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 a0bc0596da..0b3b0ec431 100644 --- a/command/flag/binding_name_test.go +++ b/command/flag/binding_name_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/buildpack.go b/command/flag/buildpack.go index 2426791ad0..17081b4c96 100644 --- a/command/flag/buildpack.go +++ b/command/flag/buildpack.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" ) type Buildpack struct { diff --git a/command/flag/buildpack_test.go b/command/flag/buildpack_test.go index 7fad2d7ab8..2301f26290 100644 --- a/command/flag/buildpack_test.go +++ b/command/flag/buildpack_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/bytes_with_unlimited.go b/command/flag/bytes_with_unlimited.go index 4eeb64079f..d04766ef66 100644 --- a/command/flag/bytes_with_unlimited.go +++ b/command/flag/bytes_with_unlimited.go @@ -6,7 +6,7 @@ import ( "strings" "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/bytes_with_unlimited_test.go b/command/flag/bytes_with_unlimited_test.go index 15a5ce369b..f583cc2878 100644 --- a/command/flag/bytes_with_unlimited_test.go +++ b/command/flag/bytes_with_unlimited_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/color_test.go b/command/flag/color_test.go index 5851725384..f202a8092e 100644 --- a/command/flag/color_test.go +++ b/command/flag/color_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/command.go b/command/flag/command.go index 1556e7353a..551c6e409f 100644 --- a/command/flag/command.go +++ b/command/flag/command.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" ) type Command struct { diff --git a/command/flag/command_test.go b/command/flag/command_test.go index fb5f970329..5b34059b6a 100644 --- a/command/flag/command_test.go +++ b/command/flag/command_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/credentials_or_json.go b/command/flag/credentials_or_json.go index f4396cc60a..367c5ccb28 100644 --- a/command/flag/credentials_or_json.go +++ b/command/flag/credentials_or_json.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/credentials_or_json_test.go b/command/flag/credentials_or_json_test.go index 6631521b4e..5f8da070f4 100644 --- a/command/flag/credentials_or_json_test.go +++ b/command/flag/credentials_or_json_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/command/flag/deployment_strategy.go b/command/flag/deployment_strategy.go index 0c034f8b37..a0d6d1a876 100644 --- a/command/flag/deployment_strategy.go +++ b/command/flag/deployment_strategy.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" "github.com/jessevdk/go-flags" ) diff --git a/command/flag/deployment_strategy_test.go b/command/flag/deployment_strategy_test.go index 2ee856181f..5abe614a2d 100644 --- a/command/flag/deployment_strategy_test.go +++ b/command/flag/deployment_strategy_test.go @@ -1,8 +1,8 @@ package flag_test import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/docker_test.go b/command/flag/docker_test.go index c9d9a59f06..5cc6879730 100644 --- a/command/flag/docker_test.go +++ b/command/flag/docker_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/droplet_test.go b/command/flag/droplet_test.go index 714f6f4346..22b0e28f36 100644 --- a/command/flag/droplet_test.go +++ b/command/flag/droplet_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "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 377b15a3ab..1d7c43562b 100644 --- a/command/flag/environment_variable_test.go +++ b/command/flag/environment_variable_test.go @@ -8,7 +8,7 @@ import ( "os" "strings" - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/health_check_type.go b/command/flag/health_check_type.go index e80834dc5a..0fd1dbb6c9 100644 --- a/command/flag/health_check_type.go +++ b/command/flag/health_check_type.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/health_check_type_test.go b/command/flag/health_check_type_test.go index f01aa4eaa0..144f06665f 100644 --- a/command/flag/health_check_type_test.go +++ b/command/flag/health_check_type_test.go @@ -1,8 +1,8 @@ package flag_test import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "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 eb18d882e9..30b893249a 100644 --- a/command/flag/health_check_type_with_deprecated_value_test.go +++ b/command/flag/health_check_type_with_deprecated_value_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/instances.go b/command/flag/instances.go index d7ea3226b9..9db7f73f4d 100644 --- a/command/flag/instances.go +++ b/command/flag/instances.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/instances_test.go b/command/flag/instances_test.go index 5d53994f2e..a72f467e09 100644 --- a/command/flag/instances_test.go +++ b/command/flag/instances_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/integer_limit.go b/command/flag/integer_limit.go index 91df9f3997..917d065918 100644 --- a/command/flag/integer_limit.go +++ b/command/flag/integer_limit.go @@ -3,7 +3,7 @@ package flag import ( "strconv" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/integer_limit_test.go b/command/flag/integer_limit_test.go index 1414e983a5..f2764fd8a2 100644 --- a/command/flag/integer_limit_test.go +++ b/command/flag/integer_limit_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/locale.go b/command/flag/locale.go index 92b70ed2ee..8b46a46575 100644 --- a/command/flag/locale.go +++ b/command/flag/locale.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/cf/i18n" + "code.cloudfoundry.org/cli/v9/cf/i18n" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/locale_test.go b/command/flag/locale_test.go index 775e4a0c4c..094f3599de 100644 --- a/command/flag/locale_test.go +++ b/command/flag/locale_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/megabytes.go b/command/flag/megabytes.go index 68b338a6cb..4284275849 100644 --- a/command/flag/megabytes.go +++ b/command/flag/megabytes.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/bytefmt" flags "github.com/jessevdk/go-flags" diff --git a/command/flag/megabytes_test.go b/command/flag/megabytes_test.go index 117ee09a7c..527d7fab85 100644 --- a/command/flag/megabytes_test.go +++ b/command/flag/megabytes_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/megabytes_with_unlimited.go b/command/flag/megabytes_with_unlimited.go index f421a9df14..81c201e557 100644 --- a/command/flag/megabytes_with_unlimited.go +++ b/command/flag/megabytes_with_unlimited.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" ) type MegabytesWithUnlimited types.NullInt diff --git a/command/flag/megabytes_with_unlimited_test.go b/command/flag/megabytes_with_unlimited_test.go index 580924cd9e..85b4ff2e01 100644 --- a/command/flag/megabytes_with_unlimited_test.go +++ b/command/flag/megabytes_with_unlimited_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "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 0c055b6057..3b803e070b 100644 --- a/command/flag/network_port_test.go +++ b/command/flag/network_port_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "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 a58f4177c2..07f32f65bb 100644 --- a/command/flag/network_protocol_test.go +++ b/command/flag/network_protocol_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/optional_string.go b/command/flag/optional_string.go index 2ca8f7e403..3de892c2b5 100644 --- a/command/flag/optional_string.go +++ b/command/flag/optional_string.go @@ -1,6 +1,6 @@ package flag -import "code.cloudfoundry.org/cli/v8/types" +import "code.cloudfoundry.org/cli/v9/types" type OptionalString types.OptionalString diff --git a/command/flag/optional_string_test.go b/command/flag/optional_string_test.go index 098ca5116c..dcc1b87bd6 100644 --- a/command/flag/optional_string_test.go +++ b/command/flag/optional_string_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "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 a06f3f2eaa..85bf0bea8c 100644 --- a/command/flag/org_role_test.go +++ b/command/flag/org_role_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/path.go b/command/flag/path.go index 9aa463a390..8339018a2d 100644 --- a/command/flag/path.go +++ b/command/flag/path.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/manifestparser" "github.com/jessevdk/go-flags" ) diff --git a/command/flag/path_test.go b/command/flag/path_test.go index e28c11e1a1..5739aad7b5 100644 --- a/command/flag/path_test.go +++ b/command/flag/path_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - . "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/port.go b/command/flag/port.go index e7bc7b6384..af24fbdf07 100644 --- a/command/flag/port.go +++ b/command/flag/port.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/port_test.go b/command/flag/port_test.go index a8d40839f3..b11fdb35e9 100644 --- a/command/flag/port_test.go +++ b/command/flag/port_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" . "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 8fb2774829..87ae619349 100644 --- a/command/flag/positive_integer_test.go +++ b/command/flag/positive_integer_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" ) var _ = Describe("Positive Integer", func() { diff --git a/command/flag/revision.go b/command/flag/revision.go index ce4f15edcc..28c600fa03 100644 --- a/command/flag/revision.go +++ b/command/flag/revision.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/revision_test.go b/command/flag/revision_test.go index 60a97c789e..146ec8813d 100644 --- a/command/flag/revision_test.go +++ b/command/flag/revision_test.go @@ -1,8 +1,8 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" . "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 0982b368ab..5771d0624f 100644 --- a/command/flag/route_path_test.go +++ b/command/flag/route_path_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "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 238ac21073..c8b8222868 100644 --- a/command/flag/security_group_lifecycle_test.go +++ b/command/flag/security_group_lifecycle_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "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 a630510cf2..fb42481127 100644 --- a/command/flag/space_role_test.go +++ b/command/flag/space_role_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "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 6070c60323..8bb49e2fc8 100644 --- a/command/flag/ssh_port_forwarding_test.go +++ b/command/flag/ssh_port_forwarding_test.go @@ -3,7 +3,7 @@ package flag_test import ( "fmt" - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/command/flag/tags.go b/command/flag/tags.go index 5208dbdfb1..b557003d3c 100644 --- a/command/flag/tags.go +++ b/command/flag/tags.go @@ -3,7 +3,7 @@ package flag import ( "strings" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" ) type Tags types.OptionalStringSlice diff --git a/command/flag/tags_test.go b/command/flag/tags_test.go index de055e8d37..1fce44e95d 100644 --- a/command/flag/tags_test.go +++ b/command/flag/tags_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/timeout.go b/command/flag/timeout.go index 36fdcdc9c5..500747d72a 100644 --- a/command/flag/timeout.go +++ b/command/flag/timeout.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/timeout_test.go b/command/flag/timeout_test.go index 1ba970fbd0..b82eb32e88 100644 --- a/command/flag/timeout_test.go +++ b/command/flag/timeout_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" ) var _ = Describe("Timeout", func() { diff --git a/command/flag/trimmed_string_test.go b/command/flag/trimmed_string_test.go index 803d73646d..08bd820720 100644 --- a/command/flag/trimmed_string_test.go +++ b/command/flag/trimmed_string_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/v8/command/flag" + . "code.cloudfoundry.org/cli/v9/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/minimum_version_check.go b/command/minimum_version_check.go index 9cfbcd5737..78ec18ee1d 100644 --- a/command/minimum_version_check.go +++ b/command/minimum_version_check.go @@ -1,7 +1,7 @@ package command import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" log "github.com/sirupsen/logrus" ) diff --git a/command/minimum_version_check_test.go b/command/minimum_version_check_test.go index 4c06641ab5..f3b8209c5c 100644 --- a/command/minimum_version_check_test.go +++ b/command/minimum_version_check_test.go @@ -1,9 +1,9 @@ package command_test import ( - . "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/version" + . "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/plugin/add_plugin_repo_command.go b/command/plugin/add_plugin_repo_command.go index 3f65777877..cb40cad0be 100644 --- a/command/plugin/add_plugin_repo_command.go +++ b/command/plugin/add_plugin_repo_command.go @@ -1,11 +1,11 @@ package plugin import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/plugin/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/plugin/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . AddPluginRepoActor diff --git a/command/plugin/add_plugin_repo_command_test.go b/command/plugin/add_plugin_repo_command_test.go index f632d271a4..c3763cf295 100644 --- a/command/plugin/add_plugin_repo_command_test.go +++ b/command/plugin/add_plugin_repo_command_test.go @@ -1,11 +1,11 @@ package plugin_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/plugin" - "code.cloudfoundry.org/cli/v8/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/plugin" + "code.cloudfoundry.org/cli/v9/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/plugin/list_plugin_repos_command.go b/command/plugin/list_plugin_repos_command.go index 090e58687b..2e4c4a0074 100644 --- a/command/plugin/list_plugin_repos_command.go +++ b/command/plugin/list_plugin_repos_command.go @@ -1,8 +1,8 @@ package plugin import ( - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type ListPluginReposCommand struct { diff --git a/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go b/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go index 8342afe78b..acad05c8fa 100644 --- a/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go +++ b/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go @@ -4,7 +4,7 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/command/plugin" + "code.cloudfoundry.org/cli/v9/command/plugin" ) type FakeAddPluginRepoActor struct { @@ -31,15 +31,16 @@ func (fake *FakeAddPluginRepoActor) AddPluginRepository(arg1 string, arg2 string arg1 string arg2 string }{arg1, arg2}) + stub := fake.AddPluginRepositoryStub + fakeReturns := fake.addPluginRepositoryReturns fake.recordInvocation("AddPluginRepository", []interface{}{arg1, arg2}) fake.addPluginRepositoryMutex.Unlock() - if fake.AddPluginRepositoryStub != nil { - return fake.AddPluginRepositoryStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.addPluginRepositoryReturns return fakeReturns.result1 } diff --git a/command/plugin/pluginfakes/fake_plugins_actor.go b/command/plugin/pluginfakes/fake_plugins_actor.go index a72bda695f..16cb741a26 100644 --- a/command/plugin/pluginfakes/fake_plugins_actor.go +++ b/command/plugin/pluginfakes/fake_plugins_actor.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/command/plugin" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command/plugin" ) type FakePluginsActor struct { @@ -30,15 +30,16 @@ func (fake *FakePluginsActor) GetOutdatedPlugins() ([]pluginaction.OutdatedPlugi ret, specificReturn := fake.getOutdatedPluginsReturnsOnCall[len(fake.getOutdatedPluginsArgsForCall)] fake.getOutdatedPluginsArgsForCall = append(fake.getOutdatedPluginsArgsForCall, struct { }{}) + stub := fake.GetOutdatedPluginsStub + fakeReturns := fake.getOutdatedPluginsReturns fake.recordInvocation("GetOutdatedPlugins", []interface{}{}) fake.getOutdatedPluginsMutex.Unlock() - if fake.GetOutdatedPluginsStub != nil { - return fake.GetOutdatedPluginsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getOutdatedPluginsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go b/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go index 33721abd80..3442264e26 100644 --- a/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go +++ b/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/command/plugin" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command/plugin" ) type FakeUninstallPluginActor struct { @@ -32,15 +32,16 @@ func (fake *FakeUninstallPluginActor) UninstallPlugin(arg1 pluginaction.PluginUn arg1 pluginaction.PluginUninstaller arg2 string }{arg1, arg2}) + stub := fake.UninstallPluginStub + fakeReturns := fake.uninstallPluginReturns fake.recordInvocation("UninstallPlugin", []interface{}{arg1, arg2}) fake.uninstallPluginMutex.Unlock() - if fake.UninstallPluginStub != nil { - return fake.UninstallPluginStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.uninstallPluginReturns return fakeReturns.result1 } diff --git a/command/plugin/plugins_command.go b/command/plugin/plugins_command.go index 5c62a5968c..a74c995abc 100644 --- a/command/plugin/plugins_command.go +++ b/command/plugin/plugins_command.go @@ -3,12 +3,12 @@ package plugin import ( "strings" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/plugin/shared" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/plugin/shared" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PluginsActor diff --git a/command/plugin/plugins_command_test.go b/command/plugin/plugins_command_test.go index 0505fe5a12..3e191af60c 100644 --- a/command/plugin/plugins_command_test.go +++ b/command/plugin/plugins_command_test.go @@ -3,14 +3,14 @@ package plugin_test import ( "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/plugin" - "code.cloudfoundry.org/cli/v8/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/plugin" + "code.cloudfoundry.org/cli/v9/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/plugin/remove_plugin_repo_command.go b/command/plugin/remove_plugin_repo_command.go index 6cb1800f55..1f5a4f95f5 100644 --- a/command/plugin/remove_plugin_repo_command.go +++ b/command/plugin/remove_plugin_repo_command.go @@ -1,9 +1,9 @@ package plugin import ( - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type RemovePluginRepoCommand struct { diff --git a/command/plugin/repo_plugins_command.go b/command/plugin/repo_plugins_command.go index 48f5f84362..4e92272750 100644 --- a/command/plugin/repo_plugins_command.go +++ b/command/plugin/repo_plugins_command.go @@ -1,8 +1,8 @@ package plugin import ( - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type RepoPluginsCommand struct { diff --git a/command/plugin/shared/new_client.go b/command/plugin/shared/new_client.go index 95e753a2a6..f30f32e210 100644 --- a/command/plugin/shared/new_client.go +++ b/command/plugin/shared/new_client.go @@ -1,9 +1,9 @@ package shared import ( - "code.cloudfoundry.org/cli/v8/api/plugin" - "code.cloudfoundry.org/cli/v8/api/plugin/wrapper" - "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v9/api/plugin" + "code.cloudfoundry.org/cli/v9/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v9/command" ) // NewClient creates a new V2 Cloud Controller client and UAA client using the diff --git a/command/plugin/shared/rpc.go b/command/plugin/shared/rpc.go index aeb631af69..5a7e4dd66d 100644 --- a/command/plugin/shared/rpc.go +++ b/command/plugin/shared/rpc.go @@ -8,10 +8,10 @@ import ( "os/exec" "time" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/trace" - "code.cloudfoundry.org/cli/v8/plugin/rpc" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/trace" + "code.cloudfoundry.org/cli/v9/plugin/rpc" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type Config interface { diff --git a/command/plugin/uninstall_plugin_command.go b/command/plugin/uninstall_plugin_command.go index 7a729f6ffa..661867376d 100644 --- a/command/plugin/uninstall_plugin_command.go +++ b/command/plugin/uninstall_plugin_command.go @@ -1,12 +1,12 @@ package plugin import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/pluginaction" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/plugin/shared" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/pluginaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/plugin/shared" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UninstallPluginActor diff --git a/command/plugin/uninstall_plugin_command_test.go b/command/plugin/uninstall_plugin_command_test.go index e1506084e2..1e165bcfc5 100644 --- a/command/plugin/uninstall_plugin_command_test.go +++ b/command/plugin/uninstall_plugin_command_test.go @@ -4,13 +4,13 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/plugin" - "code.cloudfoundry.org/cli/v8/command/plugin/pluginfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/plugin" + "code.cloudfoundry.org/cli/v9/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/translatableerror/convert_to_translatable_error.go b/command/translatableerror/convert_to_translatable_error.go index fdb8578289..13e9734a80 100644 --- a/command/translatableerror/convert_to_translatable_error.go +++ b/command/translatableerror/convert_to_translatable_error.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/util/clissh/ssherror" - "code.cloudfoundry.org/cli/v8/util/download" - "code.cloudfoundry.org/cli/v8/util/manifest" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v9/util/download" + "code.cloudfoundry.org/cli/v9/util/manifest" log "github.com/sirupsen/logrus" ) diff --git a/command/translatableerror/convert_to_translatable_error_test.go b/command/translatableerror/convert_to_translatable_error_test.go index 32dc4f96e2..562f20eb6a 100644 --- a/command/translatableerror/convert_to_translatable_error_test.go +++ b/command/translatableerror/convert_to_translatable_error_test.go @@ -5,14 +5,14 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/plugin/pluginerror" - "code.cloudfoundry.org/cli/v8/api/uaa" - . "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/clissh/ssherror" - "code.cloudfoundry.org/cli/v8/util/download" - "code.cloudfoundry.org/cli/v8/util/manifest" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v9/api/uaa" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v9/util/download" + "code.cloudfoundry.org/cli/v9/util/manifest" . "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 f5b2919c68..fe86a81714 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 @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "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 af91c41133..198dc88f37 100644 --- a/command/translatableerror/minimum_cli_version_not_met_error_test.go +++ b/command/translatableerror/minimum_cli_version_not_met_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "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 7a4aa7338c..586b104466 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 @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "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 91d41b9b9e..b529dba98d 100644 --- a/command/translatableerror/missing_credential_error_test.go +++ b/command/translatableerror/missing_credential_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "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 666ff093c8..66211bee26 100644 --- a/command/translatableerror/service_instance_not_shareable_error_test.go +++ b/command/translatableerror/service_instance_not_shareable_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "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 447f473e78..1711a926a8 100644 --- a/command/translatableerror/service_plan_not_found_error_test.go +++ b/command/translatableerror/service_plan_not_found_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" . "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 6ae50a5ea1..871a340d06 100644 --- a/command/translatableerror/staging_timeout_error_test.go +++ b/command/translatableerror/staging_timeout_error_test.go @@ -6,7 +6,7 @@ import ( "text/template" "time" - . "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "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 edb2dd42ff..09bc84e2dd 100644 --- a/command/translatableerror/tip_decorator_error_test.go +++ b/command/translatableerror/tip_decorator_error_test.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - . "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/translatableerror/translatableerrorfakes" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror/translatableerrorfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/translatableerrorfakes/fake_translatable_error.go b/command/translatableerror/translatableerrorfakes/fake_translatable_error.go index 9515e31803..a8465852e8 100644 --- a/command/translatableerror/translatableerrorfakes/fake_translatable_error.go +++ b/command/translatableerror/translatableerrorfakes/fake_translatable_error.go @@ -4,7 +4,7 @@ package translatableerrorfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type FakeTranslatableError struct { @@ -38,15 +38,16 @@ func (fake *FakeTranslatableError) Error() string { ret, specificReturn := fake.errorReturnsOnCall[len(fake.errorArgsForCall)] fake.errorArgsForCall = append(fake.errorArgsForCall, struct { }{}) + stub := fake.ErrorStub + fakeReturns := fake.errorReturns fake.recordInvocation("Error", []interface{}{}) fake.errorMutex.Unlock() - if fake.ErrorStub != nil { - return fake.ErrorStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.errorReturns return fakeReturns.result1 } @@ -91,15 +92,16 @@ func (fake *FakeTranslatableError) Translate(arg1 func(string, ...interface{}) s fake.translateArgsForCall = append(fake.translateArgsForCall, struct { arg1 func(string, ...interface{}) string }{arg1}) + stub := fake.TranslateStub + fakeReturns := fake.translateReturns fake.recordInvocation("Translate", []interface{}{arg1}) fake.translateMutex.Unlock() - if fake.TranslateStub != nil { - return fake.TranslateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.translateReturns return fakeReturns.result1 } diff --git a/command/translatableerror/translate_test.go b/command/translatableerror/translate_test.go index 6603c1dc29..f2e594ac64 100644 --- a/command/translatableerror/translate_test.go +++ b/command/translatableerror/translate_test.go @@ -5,7 +5,7 @@ import ( "errors" "text/template" - . "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "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 c1cffe7eb8..86706d6f9f 100644 --- a/command/translatableerror/unauthorized_error_test.go +++ b/command/translatableerror/unauthorized_error_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "code.cloudfoundry.org/cli/v8/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/ui.go b/command/ui.go index bf1ef342a5..933ffe1026 100644 --- a/command/ui.go +++ b/command/ui.go @@ -4,7 +4,7 @@ import ( "io" "time" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) // UI is the interface to STDOUT, STDERR, and STDIN. diff --git a/command/v7/actor.go b/command/v7/actor.go index aba92fe147..b14394ded6 100644 --- a/command/v7/actor.go +++ b/command/v7/actor.go @@ -6,15 +6,15 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - uaa "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + uaa "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" "github.com/SermoDigital/jose/jwt" ) diff --git a/command/v7/add_network_policy_command.go b/command/v7/add_network_policy_command.go index 4d8c07b9e0..d0d9baad19 100644 --- a/command/v7/add_network_policy_command.go +++ b/command/v7/add_network_policy_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkingActor diff --git a/command/v7/add_network_policy_command_test.go b/command/v7/add_network_policy_command_test.go index b6fb10ef3a..229de25940 100644 --- a/command/v7/add_network_policy_command_test.go +++ b/command/v7/add_network_policy_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/allow_space_ssh_command.go b/command/v7/allow_space_ssh_command.go index 6e368c892c..0a44bc70f8 100644 --- a/command/v7/allow_space_ssh_command.go +++ b/command/v7/allow_space_ssh_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type AllowSpaceSSHCommand struct { diff --git a/command/v7/allow_space_ssh_command_test.go b/command/v7/allow_space_ssh_command_test.go index 122435e71a..a9ceada674 100644 --- a/command/v7/allow_space_ssh_command_test.go +++ b/command/v7/allow_space_ssh_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/api_command.go b/command/v7/api_command.go index bf57654f6c..c60f6ddb8d 100644 --- a/command/v7/api_command.go +++ b/command/v7/api_command.go @@ -6,10 +6,10 @@ import ( "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type APICommand struct { diff --git a/command/v7/api_command_test.go b/command/v7/api_command_test.go index efe8167a14..87285bb125 100644 --- a/command/v7/api_command_test.go +++ b/command/v7/api_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/app_command.go b/command/v7/app_command.go index bd7e3f3659..a67c5381d3 100644 --- a/command/v7/app_command.go +++ b/command/v7/app_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type AppCommand struct { diff --git a/command/v7/app_command_test.go b/command/v7/app_command_test.go index 1c5b2b064c..0a6f7261e9 100644 --- a/command/v7/app_command_test.go +++ b/command/v7/app_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/apply_manifest_command.go b/command/v7/apply_manifest_command.go index 0c9a60fa2c..f6e0587f26 100644 --- a/command/v7/apply_manifest_command.go +++ b/command/v7/apply_manifest_command.go @@ -3,13 +3,13 @@ package v7 import ( "os" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" "gopkg.in/yaml.v2" ) diff --git a/command/v7/apply_manifest_command_test.go b/command/v7/apply_manifest_command_test.go index 7b78dcd4c3..8343cf3bb0 100644 --- a/command/v7/apply_manifest_command_test.go +++ b/command/v7/apply_manifest_command_test.go @@ -6,18 +6,18 @@ import ( "gopkg.in/yaml.v2" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/manifestparser" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/apps_command.go b/command/v7/apps_command.go index e02fb68cf7..72a7def85a 100644 --- a/command/v7/apps_command.go +++ b/command/v7/apps_command.go @@ -3,8 +3,8 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type AppsCommand struct { diff --git a/command/v7/apps_command_test.go b/command/v7/apps_command_test.go index 5bb3cc30d7..e2b23fa356 100644 --- a/command/v7/apps_command_test.go +++ b/command/v7/apps_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/auth_command.go b/command/v7/auth_command.go index 6e5e410d89..17366d7fc0 100644 --- a/command/v7/auth_command.go +++ b/command/v7/auth_command.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type AuthCommand struct { diff --git a/command/v7/auth_command_test.go b/command/v7/auth_command_test.go index 398850cd12..78e376be25 100644 --- a/command/v7/auth_command_test.go +++ b/command/v7/auth_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/base_command.go b/command/v7/base_command.go index bf6ace6580..6714be6b73 100644 --- a/command/v7/base_command.go +++ b/command/v7/base_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/v7/shared" "code.cloudfoundry.org/clock" ) diff --git a/command/v7/bind_route_service_command.go b/command/v7/bind_route_service_command.go index c793182e25..b1c17cdc86 100644 --- a/command/v7/bind_route_service_command.go +++ b/command/v7/bind_route_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type BindRouteServiceCommand struct { diff --git a/command/v7/bind_route_service_command_test.go b/command/v7/bind_route_service_command_test.go index 4dce41620f..998378d95f 100644 --- a/command/v7/bind_route_service_command_test.go +++ b/command/v7/bind_route_service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_running_security_group_command.go b/command/v7/bind_running_security_group_command.go index cee69cd503..9024cd23b0 100644 --- a/command/v7/bind_running_security_group_command.go +++ b/command/v7/bind_running_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type BindRunningSecurityGroupCommand struct { diff --git a/command/v7/bind_running_security_group_command_test.go b/command/v7/bind_running_security_group_command_test.go index 9d965d88ce..2ac5f38f27 100644 --- a/command/v7/bind_running_security_group_command_test.go +++ b/command/v7/bind_running_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_security_group_command.go b/command/v7/bind_security_group_command.go index d0df084899..66a863c238 100644 --- a/command/v7/bind_security_group_command.go +++ b/command/v7/bind_security_group_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type BindSecurityGroupCommand struct { diff --git a/command/v7/bind_security_group_command_test.go b/command/v7/bind_security_group_command_test.go index 19f8f5d90c..ac4bf27c27 100644 --- a/command/v7/bind_security_group_command_test.go +++ b/command/v7/bind_security_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_service_command.go b/command/v7/bind_service_command.go index e9853276f1..04ab1a0b1e 100644 --- a/command/v7/bind_service_command.go +++ b/command/v7/bind_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type BindServiceCommand struct { diff --git a/command/v7/bind_service_command_test.go b/command/v7/bind_service_command_test.go index dcfa2cc427..88e30fbe23 100644 --- a/command/v7/bind_service_command_test.go +++ b/command/v7/bind_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/bind_staging_security_group_command.go b/command/v7/bind_staging_security_group_command.go index 4dd0b48ccf..98bb0ecb29 100644 --- a/command/v7/bind_staging_security_group_command.go +++ b/command/v7/bind_staging_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type BindStagingSecurityGroupCommand struct { diff --git a/command/v7/bind_staging_security_group_command_test.go b/command/v7/bind_staging_security_group_command_test.go index 43e57e2f55..f4d40cee61 100644 --- a/command/v7/bind_staging_security_group_command_test.go +++ b/command/v7/bind_staging_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/buildpacks_command.go b/command/v7/buildpacks_command.go index cfb87f62e7..4e520fcde3 100644 --- a/command/v7/buildpacks_command.go +++ b/command/v7/buildpacks_command.go @@ -3,8 +3,8 @@ package v7 import ( "strconv" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type BuildpacksCommand struct { diff --git a/command/v7/buildpacks_command_test.go b/command/v7/buildpacks_command_test.go index f293faaa91..7ae0441bd7 100644 --- a/command/v7/buildpacks_command_test.go +++ b/command/v7/buildpacks_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/cancel_deployment_command.go b/command/v7/cancel_deployment_command.go index 2cfbaf6d30..53bec2fa3c 100644 --- a/command/v7/cancel_deployment_command.go +++ b/command/v7/cancel_deployment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CancelDeploymentCommand struct { diff --git a/command/v7/cancel_deployment_command_test.go b/command/v7/cancel_deployment_command_test.go index 32ecb10ef6..6d7b8ec793 100644 --- a/command/v7/cancel_deployment_command_test.go +++ b/command/v7/cancel_deployment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/check_route_command.go b/command/v7/check_route_command.go index 00b28c3dc2..c1f152718f 100644 --- a/command/v7/check_route_command.go +++ b/command/v7/check_route_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CheckRouteCommand struct { diff --git a/command/v7/check_route_command_test.go b/command/v7/check_route_command_test.go index 251810ae29..84c8c35248 100644 --- a/command/v7/check_route_command_test.go +++ b/command/v7/check_route_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/config_command.go b/command/v7/config_command.go index 76256b6fd5..8fc64d04a9 100644 --- a/command/v7/config_command.go +++ b/command/v7/config_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type ConfigCommand struct { diff --git a/command/v7/config_command_test.go b/command/v7/config_command_test.go index f98d378ee9..fb5612d8de 100644 --- a/command/v7/config_command_test.go +++ b/command/v7/config_command_test.go @@ -1,13 +1,13 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/continue_deployment_command.go b/command/v7/continue_deployment_command.go index f1e243cda1..937253e51e 100644 --- a/command/v7/continue_deployment_command.go +++ b/command/v7/continue_deployment_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type ContinueDeploymentCommand struct { diff --git a/command/v7/continue_deployment_command_test.go b/command/v7/continue_deployment_command_test.go index 8057aac4c7..e60dc83f8f 100644 --- a/command/v7/continue_deployment_command_test.go +++ b/command/v7/continue_deployment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/copy_source_command.go b/command/v7/copy_source_command.go index d3a1d3c020..382186c057 100644 --- a/command/v7/copy_source_command.go +++ b/command/v7/copy_source_command.go @@ -1,14 +1,14 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/logcache" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type CopySourceCommand struct { diff --git a/command/v7/copy_source_command_test.go b/command/v7/copy_source_command_test.go index 613d554400..6cc9ebedcf 100644 --- a/command/v7/copy_source_command_test.go +++ b/command/v7/copy_source_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_app_command.go b/command/v7/create_app_command.go index d12bc2757a..2960348924 100644 --- a/command/v7/create_app_command.go +++ b/command/v7/create_app_command.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type CreateAppCommand struct { diff --git a/command/v7/create_app_command_test.go b/command/v7/create_app_command_test.go index 75fe728319..90726214db 100644 --- a/command/v7/create_app_command_test.go +++ b/command/v7/create_app_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_app_manifest_command.go b/command/v7/create_app_manifest_command.go index 58d7085ce2..aca22da739 100644 --- a/command/v7/create_app_manifest_command.go +++ b/command/v7/create_app_manifest_command.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type CreateAppManifestCommand struct { diff --git a/command/v7/create_app_manifest_command_test.go b/command/v7/create_app_manifest_command_test.go index c1b57ba05d..94694eefd1 100644 --- a/command/v7/create_app_manifest_command_test.go +++ b/command/v7/create_app_manifest_command_test.go @@ -6,14 +6,14 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_buildpack_command.go b/command/v7/create_buildpack_command.go index 97bf8274e5..294d6eb26d 100644 --- a/command/v7/create_buildpack_command.go +++ b/command/v7/create_buildpack_command.go @@ -4,14 +4,14 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/download" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/download" ) type CreateBuildpackCommand struct { diff --git a/command/v7/create_buildpack_command_test.go b/command/v7/create_buildpack_command_test.go index cb15759c56..612a45e282 100644 --- a/command/v7/create_buildpack_command_test.go +++ b/command/v7/create_buildpack_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_isolation_segment_command.go b/command/v7/create_isolation_segment_command.go index f9cf1f33ee..f8af3dde07 100644 --- a/command/v7/create_isolation_segment_command.go +++ b/command/v7/create_isolation_segment_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type CreateIsolationSegmentCommand struct { diff --git a/command/v7/create_isolation_segment_command_test.go b/command/v7/create_isolation_segment_command_test.go index bcd3385ddc..32b2d2dc4d 100644 --- a/command/v7/create_isolation_segment_command_test.go +++ b/command/v7/create_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_org_command.go b/command/v7/create_org_command.go index 5f8e7a4d07..bba155a76b 100644 --- a/command/v7/create_org_command.go +++ b/command/v7/create_org_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateOrgCommand struct { diff --git a/command/v7/create_org_command_test.go b/command/v7/create_org_command_test.go index ca78330f4c..abbf6dbd57 100644 --- a/command/v7/create_org_command_test.go +++ b/command/v7/create_org_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_org_quota_command.go b/command/v7/create_org_quota_command.go index 5de0fc31b8..f5d6ab0fb5 100644 --- a/command/v7/create_org_quota_command.go +++ b/command/v7/create_org_quota_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) type CreateOrgQuotaCommand struct { diff --git a/command/v7/create_org_quota_command_test.go b/command/v7/create_org_quota_command_test.go index 9acd82fbd5..edead36a57 100644 --- a/command/v7/create_org_quota_command_test.go +++ b/command/v7/create_org_quota_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_package_command.go b/command/v7/create_package_command.go index ff7736143a..9b95e9a674 100644 --- a/command/v7/create_package_command.go +++ b/command/v7/create_package_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type CreatePackageCommand struct { diff --git a/command/v7/create_package_command_test.go b/command/v7/create_package_command_test.go index 798b52a988..66afbfd69d 100644 --- a/command/v7/create_package_command_test.go +++ b/command/v7/create_package_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_private_domain_command.go b/command/v7/create_private_domain_command.go index f648dd61a6..2701ca91c4 100644 --- a/command/v7/create_private_domain_command.go +++ b/command/v7/create_private_domain_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreatePrivateDomainCommand struct { diff --git a/command/v7/create_private_domain_command_test.go b/command/v7/create_private_domain_command_test.go index 405f6adc91..67db5bf98c 100644 --- a/command/v7/create_private_domain_command_test.go +++ b/command/v7/create_private_domain_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_route_command.go b/command/v7/create_route_command.go index 25d957ebe2..f5336d9617 100644 --- a/command/v7/create_route_command.go +++ b/command/v7/create_route_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateRouteCommand struct { diff --git a/command/v7/create_route_command_test.go b/command/v7/create_route_command_test.go index 1224f4a3f9..ba03ddf81e 100644 --- a/command/v7/create_route_command_test.go +++ b/command/v7/create_route_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_security_group_command.go b/command/v7/create_security_group_command.go index 57764cce5e..aa548f647a 100644 --- a/command/v7/create_security_group_command.go +++ b/command/v7/create_security_group_command.go @@ -3,9 +3,9 @@ package v7 import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateSecurityGroupCommand struct { diff --git a/command/v7/create_security_group_command_test.go b/command/v7/create_security_group_command_test.go index ac08c73182..753cfb291b 100644 --- a/command/v7/create_security_group_command_test.go +++ b/command/v7/create_security_group_command_test.go @@ -5,15 +5,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_broker_command.go b/command/v7/create_service_broker_command.go index 267794e611..72902b8150 100644 --- a/command/v7/create_service_broker_command.go +++ b/command/v7/create_service_broker_command.go @@ -3,11 +3,11 @@ package v7 import ( "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type CreateServiceBrokerCommand struct { diff --git a/command/v7/create_service_broker_command_test.go b/command/v7/create_service_broker_command_test.go index 7673c620d3..4655fb95d9 100644 --- a/command/v7/create_service_broker_command_test.go +++ b/command/v7/create_service_broker_command_test.go @@ -5,14 +5,14 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_command.go b/command/v7/create_service_command.go index 34fa0829cd..6260e84423 100644 --- a/command/v7/create_service_command.go +++ b/command/v7/create_service_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type CreateServiceCommand struct { diff --git a/command/v7/create_service_command_test.go b/command/v7/create_service_command_test.go index 631955faca..f82df8701d 100644 --- a/command/v7/create_service_command_test.go +++ b/command/v7/create_service_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_service_key_command.go b/command/v7/create_service_key_command.go index 36f1381fd5..632d22c0e6 100644 --- a/command/v7/create_service_key_command.go +++ b/command/v7/create_service_key_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type CreateServiceKeyCommand struct { diff --git a/command/v7/create_service_key_command_test.go b/command/v7/create_service_key_command_test.go index 4982956d8c..f5b48cd804 100644 --- a/command/v7/create_service_key_command_test.go +++ b/command/v7/create_service_key_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_shared_domain_command.go b/command/v7/create_shared_domain_command.go index 2af8e50d5c..e48ec61dd6 100644 --- a/command/v7/create_shared_domain_command.go +++ b/command/v7/create_shared_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateSharedDomainCommand struct { diff --git a/command/v7/create_shared_domain_command_test.go b/command/v7/create_shared_domain_command_test.go index f3f71f8737..9df31c8cbb 100644 --- a/command/v7/create_shared_domain_command_test.go +++ b/command/v7/create_shared_domain_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/create_space_command.go b/command/v7/create_space_command.go index 196a7e8e2a..4ed949383c 100644 --- a/command/v7/create_space_command.go +++ b/command/v7/create_space_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type CreateSpaceActor interface { diff --git a/command/v7/create_space_command_test.go b/command/v7/create_space_command_test.go index 261c467f1e..7b10eef3f9 100644 --- a/command/v7/create_space_command_test.go +++ b/command/v7/create_space_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_space_quota_command.go b/command/v7/create_space_quota_command.go index 123cfa176b..f53ed3b3af 100644 --- a/command/v7/create_space_quota_command.go +++ b/command/v7/create_space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type CreateSpaceQuotaCommand struct { diff --git a/command/v7/create_space_quota_command_test.go b/command/v7/create_space_quota_command_test.go index 1e895060a2..88d2b29168 100644 --- a/command/v7/create_space_quota_command_test.go +++ b/command/v7/create_space_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_user_command.go b/command/v7/create_user_command.go index 54d83834b8..d77337b7bc 100644 --- a/command/v7/create_user_command.go +++ b/command/v7/create_user_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type CreateUserCommand struct { diff --git a/command/v7/create_user_command_test.go b/command/v7/create_user_command_test.go index 493c400e72..d2ee137e54 100644 --- a/command/v7/create_user_command_test.go +++ b/command/v7/create_user_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/create_user_provided_service_command.go b/command/v7/create_user_provided_service_command.go index f732309b3b..ef68c6b7b3 100644 --- a/command/v7/create_user_provided_service_command.go +++ b/command/v7/create_user_provided_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type CreateUserProvidedServiceCommand struct { diff --git a/command/v7/create_user_provided_service_command_test.go b/command/v7/create_user_provided_service_command_test.go index 1b017eec08..3213235dd9 100644 --- a/command/v7/create_user_provided_service_command_test.go +++ b/command/v7/create_user_provided_service_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/types" - - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/curl_command.go b/command/v7/curl_command.go index 752146aed1..2e283d82fe 100644 --- a/command/v7/curl_command.go +++ b/command/v7/curl_command.go @@ -4,8 +4,8 @@ import ( "net/http/httputil" "os" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type CurlCommand struct { diff --git a/command/v7/curl_command_test.go b/command/v7/curl_command_test.go index 7f64cef6b1..01cfad5ecb 100644 --- a/command/v7/curl_command_test.go +++ b/command/v7/curl_command_test.go @@ -5,12 +5,12 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_buildpack_command.go b/command/v7/delete_buildpack_command.go index 9feae4408e..df2de75096 100644 --- a/command/v7/delete_buildpack_command.go +++ b/command/v7/delete_buildpack_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteBuildpackCommand struct { diff --git a/command/v7/delete_buildpack_command_test.go b/command/v7/delete_buildpack_command_test.go index d9c4e6b8ce..67dd82b78d 100644 --- a/command/v7/delete_buildpack_command_test.go +++ b/command/v7/delete_buildpack_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_command.go b/command/v7/delete_command.go index 1767fe0ea6..3d0bfc281f 100644 --- a/command/v7/delete_command.go +++ b/command/v7/delete_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteCommand struct { diff --git a/command/v7/delete_command_test.go b/command/v7/delete_command_test.go index baa83816c3..0f5a4dd71a 100644 --- a/command/v7/delete_command_test.go +++ b/command/v7/delete_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_isolation_segment_command.go b/command/v7/delete_isolation_segment_command.go index dd68f5f0d9..d230c5f49e 100644 --- a/command/v7/delete_isolation_segment_command.go +++ b/command/v7/delete_isolation_segment_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteIsolationSegmentCommand struct { diff --git a/command/v7/delete_isolation_segment_command_test.go b/command/v7/delete_isolation_segment_command_test.go index 655c36510e..220725fa0d 100644 --- a/command/v7/delete_isolation_segment_command_test.go +++ b/command/v7/delete_isolation_segment_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_org_command.go b/command/v7/delete_org_command.go index 79a8d9ad4b..2b2109fc3d 100644 --- a/command/v7/delete_org_command.go +++ b/command/v7/delete_org_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteOrgCommand struct { diff --git a/command/v7/delete_org_command_test.go b/command/v7/delete_org_command_test.go index 45a29468a3..670a09abcc 100644 --- a/command/v7/delete_org_command_test.go +++ b/command/v7/delete_org_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_org_quota_command.go b/command/v7/delete_org_quota_command.go index 4f41c3242d..ce05f7c1d5 100644 --- a/command/v7/delete_org_quota_command.go +++ b/command/v7/delete_org_quota_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteOrgQuotaCommand struct { diff --git a/command/v7/delete_org_quota_command_test.go b/command/v7/delete_org_quota_command_test.go index ca45f2db99..5497311672 100644 --- a/command/v7/delete_org_quota_command_test.go +++ b/command/v7/delete_org_quota_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "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 dfe32013d9..b609abb13a 100644 --- a/command/v7/delete_orphaned_routes_command_test.go +++ b/command/v7/delete_orphaned_routes_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/delete_private_domain_command.go b/command/v7/delete_private_domain_command.go index 4ef1bdcf3b..f9ccb53912 100644 --- a/command/v7/delete_private_domain_command.go +++ b/command/v7/delete_private_domain_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeletePrivateDomainCommand struct { diff --git a/command/v7/delete_private_domain_command_test.go b/command/v7/delete_private_domain_command_test.go index 1c290dd657..eb47d2cc5a 100644 --- a/command/v7/delete_private_domain_command_test.go +++ b/command/v7/delete_private_domain_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/resources" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_route_command.go b/command/v7/delete_route_command.go index 50e1a5cc77..53175e2647 100644 --- a/command/v7/delete_route_command.go +++ b/command/v7/delete_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteRouteCommand struct { diff --git a/command/v7/delete_route_command_test.go b/command/v7/delete_route_command_test.go index 229d388caa..31ff69e20c 100644 --- a/command/v7/delete_route_command_test.go +++ b/command/v7/delete_route_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/delete_security_group_command.go b/command/v7/delete_security_group_command.go index 091ece4540..4f6b8a6eb6 100644 --- a/command/v7/delete_security_group_command.go +++ b/command/v7/delete_security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteSecurityGroupCommand struct { diff --git a/command/v7/delete_security_group_command_test.go b/command/v7/delete_security_group_command_test.go index 510bf7a356..2f38acb983 100644 --- a/command/v7/delete_security_group_command_test.go +++ b/command/v7/delete_security_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_broker_command.go b/command/v7/delete_service_broker_command.go index 5b33fa3286..79b348bbef 100644 --- a/command/v7/delete_service_broker_command.go +++ b/command/v7/delete_service_broker_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteServiceBrokerCommand struct { diff --git a/command/v7/delete_service_broker_command_test.go b/command/v7/delete_service_broker_command_test.go index cfab3c7abd..997f4c14e9 100644 --- a/command/v7/delete_service_broker_command_test.go +++ b/command/v7/delete_service_broker_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_command.go b/command/v7/delete_service_command.go index 3a6749a69f..d5b6e51bb3 100644 --- a/command/v7/delete_service_command.go +++ b/command/v7/delete_service_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type DeleteServiceCommand struct { diff --git a/command/v7/delete_service_command_test.go b/command/v7/delete_service_command_test.go index 5bbefe52bd..47f98a04a6 100644 --- a/command/v7/delete_service_command_test.go +++ b/command/v7/delete_service_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_service_key_command.go b/command/v7/delete_service_key_command.go index ef22c839b3..9a3d5d2b92 100644 --- a/command/v7/delete_service_key_command.go +++ b/command/v7/delete_service_key_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type DeleteServiceKeyCommand struct { diff --git a/command/v7/delete_service_key_command_test.go b/command/v7/delete_service_key_command_test.go index 4292f3365d..f6067f228c 100644 --- a/command/v7/delete_service_key_command_test.go +++ b/command/v7/delete_service_key_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_shared_domain_command.go b/command/v7/delete_shared_domain_command.go index c8a3242d64..e7d54ee393 100644 --- a/command/v7/delete_shared_domain_command.go +++ b/command/v7/delete_shared_domain_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type DeleteSharedDomainCommand struct { diff --git a/command/v7/delete_shared_domain_command_test.go b/command/v7/delete_shared_domain_command_test.go index 5da0318c84..1e0aa184c0 100644 --- a/command/v7/delete_shared_domain_command_test.go +++ b/command/v7/delete_shared_domain_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/resources" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_space_command.go b/command/v7/delete_space_command.go index 67f60388f5..eede1fc1bb 100644 --- a/command/v7/delete_space_command.go +++ b/command/v7/delete_space_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteSpaceCommand struct { diff --git a/command/v7/delete_space_command_test.go b/command/v7/delete_space_command_test.go index d86abce9c0..e059504e14 100644 --- a/command/v7/delete_space_command_test.go +++ b/command/v7/delete_space_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_space_quota_command.go b/command/v7/delete_space_quota_command.go index 83ffe42c07..d35f947a22 100644 --- a/command/v7/delete_space_quota_command.go +++ b/command/v7/delete_space_quota_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteSpaceQuotaCommand struct { diff --git a/command/v7/delete_space_quota_command_test.go b/command/v7/delete_space_quota_command_test.go index b1e8d1a2c5..c8b7d52e00 100644 --- a/command/v7/delete_space_quota_command_test.go +++ b/command/v7/delete_space_quota_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/delete_user_command.go b/command/v7/delete_user_command.go index 964f9bd2a0..ac6e5cc4fb 100644 --- a/command/v7/delete_user_command.go +++ b/command/v7/delete_user_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DeleteUserCommand struct { diff --git a/command/v7/delete_user_command_test.go b/command/v7/delete_user_command_test.go index 2c0176f242..0292aab0d8 100644 --- a/command/v7/delete_user_command_test.go +++ b/command/v7/delete_user_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disable_feature_flag_command.go b/command/v7/disable_feature_flag_command.go index f5000a4710..92d6e2ae8b 100644 --- a/command/v7/disable_feature_flag_command.go +++ b/command/v7/disable_feature_flag_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisableFeatureFlagCommand struct { diff --git a/command/v7/disable_feature_flag_command_test.go b/command/v7/disable_feature_flag_command_test.go index 82d95d0697..905d008d3c 100644 --- a/command/v7/disable_feature_flag_command_test.go +++ b/command/v7/disable_feature_flag_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/disable_org_isolation_command.go b/command/v7/disable_org_isolation_command.go index a411bf8ba4..1f28de762d 100644 --- a/command/v7/disable_org_isolation_command.go +++ b/command/v7/disable_org_isolation_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisableOrgIsolationCommand struct { diff --git a/command/v7/disable_org_isolation_command_test.go b/command/v7/disable_org_isolation_command_test.go index b45c563f90..7747a49d3b 100644 --- a/command/v7/disable_org_isolation_command_test.go +++ b/command/v7/disable_org_isolation_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disable_service_access_command.go b/command/v7/disable_service_access_command.go index aafe11ba2f..b1517a6c84 100644 --- a/command/v7/disable_service_access_command.go +++ b/command/v7/disable_service_access_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisableServiceAccessCommand struct { diff --git a/command/v7/disable_service_access_command_test.go b/command/v7/disable_service_access_command_test.go index eea499a5c3..66d59d1ab0 100644 --- a/command/v7/disable_service_access_command_test.go +++ b/command/v7/disable_service_access_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/disable_ssh_command.go b/command/v7/disable_ssh_command.go index 62690e6d4f..f9decf6433 100644 --- a/command/v7/disable_ssh_command.go +++ b/command/v7/disable_ssh_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisableSSHCommand struct { diff --git a/command/v7/disable_ssh_command_test.go b/command/v7/disable_ssh_command_test.go index 402c378810..64498e77c3 100644 --- a/command/v7/disable_ssh_command_test.go +++ b/command/v7/disable_ssh_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/disallow_space_ssh_command.go b/command/v7/disallow_space_ssh_command.go index f179c33f82..fa88f89f42 100644 --- a/command/v7/disallow_space_ssh_command.go +++ b/command/v7/disallow_space_ssh_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type DisallowSpaceSSHCommand struct { diff --git a/command/v7/disallow_space_ssh_command_test.go b/command/v7/disallow_space_ssh_command_test.go index 0abab028b5..59614b3768 100644 --- a/command/v7/disallow_space_ssh_command_test.go +++ b/command/v7/disallow_space_ssh_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "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 bcaa2cfe13..1aae65aab3 100644 --- a/command/v7/docker_password_getter_test.go +++ b/command/v7/docker_password_getter_test.go @@ -1,9 +1,9 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/domains_command.go b/command/v7/domains_command.go index 4e8d0aba55..ddf65c2f13 100644 --- a/command/v7/domains_command.go +++ b/command/v7/domains_command.go @@ -4,9 +4,9 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/sorting" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/sorting" + "code.cloudfoundry.org/cli/v9/util/ui" ) type DomainsCommand struct { diff --git a/command/v7/domains_command_test.go b/command/v7/domains_command_test.go index cc41b53368..4585b4d696 100644 --- a/command/v7/domains_command_test.go +++ b/command/v7/domains_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/download_droplet_command.go b/command/v7/download_droplet_command.go index 394b216450..4bb47d66d9 100644 --- a/command/v7/download_droplet_command.go +++ b/command/v7/download_droplet_command.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type DownloadDropletCommand struct { diff --git a/command/v7/download_droplet_command_test.go b/command/v7/download_droplet_command_test.go index 86834e69bd..39c58391d3 100644 --- a/command/v7/download_droplet_command_test.go +++ b/command/v7/download_droplet_command_test.go @@ -7,14 +7,14 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/droplets_command.go b/command/v7/droplets_command.go index 306921061b..3e6f78002c 100644 --- a/command/v7/droplets_command.go +++ b/command/v7/droplets_command.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type DropletsCommand struct { diff --git a/command/v7/droplets_command_test.go b/command/v7/droplets_command_test.go index bfc5805b68..fba89488cf 100644 --- a/command/v7/droplets_command_test.go +++ b/command/v7/droplets_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_feature_flag_command.go b/command/v7/enable_feature_flag_command.go index a0a72f59ee..f942cc8492 100644 --- a/command/v7/enable_feature_flag_command.go +++ b/command/v7/enable_feature_flag_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type EnableFeatureFlagCommand struct { diff --git a/command/v7/enable_feature_flag_command_test.go b/command/v7/enable_feature_flag_command_test.go index d218e1de47..1899f7a073 100644 --- a/command/v7/enable_feature_flag_command_test.go +++ b/command/v7/enable_feature_flag_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_org_isolation_command.go b/command/v7/enable_org_isolation_command.go index 98469f4594..5e5d9164b7 100644 --- a/command/v7/enable_org_isolation_command.go +++ b/command/v7/enable_org_isolation_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type EnableOrgIsolationCommand struct { diff --git a/command/v7/enable_org_isolation_command_test.go b/command/v7/enable_org_isolation_command_test.go index 70ae99503d..deb27c9e03 100644 --- a/command/v7/enable_org_isolation_command_test.go +++ b/command/v7/enable_org_isolation_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/enable_service_access_command.go b/command/v7/enable_service_access_command.go index bf7f235752..bf336f7b20 100644 --- a/command/v7/enable_service_access_command.go +++ b/command/v7/enable_service_access_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" ) type EnableServiceAccessCommand struct { diff --git a/command/v7/enable_service_access_command_test.go b/command/v7/enable_service_access_command_test.go index 5b4aa9e43c..a22fb83289 100644 --- a/command/v7/enable_service_access_command_test.go +++ b/command/v7/enable_service_access_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/enable_ssh_command.go b/command/v7/enable_ssh_command.go index 5a2ca8fc7b..90114f4783 100644 --- a/command/v7/enable_ssh_command.go +++ b/command/v7/enable_ssh_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type EnableSSHCommand struct { diff --git a/command/v7/enable_ssh_command_test.go b/command/v7/enable_ssh_command_test.go index 0f49457838..74c5733fbf 100644 --- a/command/v7/enable_ssh_command_test.go +++ b/command/v7/enable_ssh_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/env_command.go b/command/v7/env_command.go index 18597e5531..735d89261a 100644 --- a/command/v7/env_command.go +++ b/command/v7/env_command.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" log "github.com/sirupsen/logrus" ) diff --git a/command/v7/env_command_test.go b/command/v7/env_command_test.go index b7f7f6b31a..a914738452 100644 --- a/command/v7/env_command_test.go +++ b/command/v7/env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/events_command.go b/command/v7/events_command.go index b9c2ad7f40..4cc1844700 100644 --- a/command/v7/events_command.go +++ b/command/v7/events_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type EventsCommand struct { diff --git a/command/v7/events_command_test.go b/command/v7/events_command_test.go index 1daba9a70e..069f67f57a 100644 --- a/command/v7/events_command_test.go +++ b/command/v7/events_command_test.go @@ -5,16 +5,16 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/feature_flag_command.go b/command/v7/feature_flag_command.go index b271249b59..868708690c 100644 --- a/command/v7/feature_flag_command.go +++ b/command/v7/feature_flag_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FeatureFlagCommand struct { diff --git a/command/v7/feature_flag_command_test.go b/command/v7/feature_flag_command_test.go index a732e3bb03..0cf47253e3 100644 --- a/command/v7/feature_flag_command_test.go +++ b/command/v7/feature_flag_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/feature_flags_command.go b/command/v7/feature_flags_command.go index 8468be7d30..1bccc80266 100644 --- a/command/v7/feature_flags_command.go +++ b/command/v7/feature_flags_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FeatureFlagsCommand struct { diff --git a/command/v7/feature_flags_command_test.go b/command/v7/feature_flags_command_test.go index c17ca39a19..f5b0019327 100644 --- a/command/v7/feature_flags_command_test.go +++ b/command/v7/feature_flags_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/get_health_check_command.go b/command/v7/get_health_check_command.go index f8c2b5c795..5f077d13c6 100644 --- a/command/v7/get_health_check_command.go +++ b/command/v7/get_health_check_command.go @@ -3,9 +3,9 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type GetHealthCheckCommand struct { diff --git a/command/v7/get_health_check_command_test.go b/command/v7/get_health_check_command_test.go index 3b7537456a..a06963ac70 100644 --- a/command/v7/get_health_check_command_test.go +++ b/command/v7/get_health_check_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/isolation_segments_command.go b/command/v7/isolation_segments_command.go index 79870291de..1351f6d1ec 100644 --- a/command/v7/isolation_segments_command.go +++ b/command/v7/isolation_segments_command.go @@ -3,7 +3,7 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type IsolationSegmentsCommand struct { diff --git a/command/v7/isolation_segments_command_test.go b/command/v7/isolation_segments_command_test.go index b9f17d82ad..46447a87bd 100644 --- a/command/v7/isolation_segments_command_test.go +++ b/command/v7/isolation_segments_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/label_updater.go b/command/v7/label_updater.go index dd09dd9b64..67b72a4181 100644 --- a/command/v7/label_updater.go +++ b/command/v7/label_updater.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SetLabelActor diff --git a/command/v7/label_updater_test.go b/command/v7/label_updater_test.go index 78285a3874..985b100c35 100644 --- a/command/v7/label_updater_test.go +++ b/command/v7/label_updater_test.go @@ -5,14 +5,14 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/labels_command.go b/command/v7/labels_command.go index a8488ebbaa..36af62c8de 100644 --- a/command/v7/labels_command.go +++ b/command/v7/labels_command.go @@ -5,11 +5,11 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" ) type ResourceType string diff --git a/command/v7/labels_command_test.go b/command/v7/labels_command_test.go index b53f489e0b..9356dedcd2 100644 --- a/command/v7/labels_command_test.go +++ b/command/v7/labels_command_test.go @@ -5,15 +5,15 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/login_command.go b/command/v7/login_command.go index 83b0bc7d22..40466ff178 100644 --- a/command/v7/login_command.go +++ b/command/v7/login_command.go @@ -6,19 +6,19 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ActorReloader diff --git a/command/v7/login_command_test.go b/command/v7/login_command_test.go index a7a6a0c0f3..a5730fc134 100644 --- a/command/v7/login_command_test.go +++ b/command/v7/login_command_test.go @@ -5,19 +5,19 @@ import ( "fmt" "io" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/logout_command.go b/command/v7/logout_command.go index ec8bb59a6b..2b054d2d4e 100644 --- a/command/v7/logout_command.go +++ b/command/v7/logout_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/v7/shared" "code.cloudfoundry.org/clock" ) diff --git a/command/v7/logout_command_test.go b/command/v7/logout_command_test.go index dd7c8f72ac..a7381fd554 100644 --- a/command/v7/logout_command_test.go +++ b/command/v7/logout_command_test.go @@ -1,12 +1,12 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/logs_command.go b/command/v7/logs_command.go index 83d44fea7c..b03449a14b 100644 --- a/command/v7/logs_command.go +++ b/command/v7/logs_command.go @@ -5,12 +5,12 @@ import ( "os/signal" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/logcache" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" ) type LogsCommand struct { diff --git a/command/v7/logs_command_test.go b/command/v7/logs_command_test.go index d9c042026a..b389f8c28e 100644 --- a/command/v7/logs_command_test.go +++ b/command/v7/logs_command_test.go @@ -5,15 +5,15 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/map_route_command.go b/command/v7/map_route_command.go index 9a75656c76..f64cbb55bd 100644 --- a/command/v7/map_route_command.go +++ b/command/v7/map_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type MapRouteCommand struct { diff --git a/command/v7/map_route_command_test.go b/command/v7/map_route_command_test.go index 12a4cea302..aeff2feb31 100644 --- a/command/v7/map_route_command_test.go +++ b/command/v7/map_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/marketplace_command.go b/command/v7/marketplace_command.go index e250d5326d..1ae4a0737e 100644 --- a/command/v7/marketplace_command.go +++ b/command/v7/marketplace_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type MarketplaceCommand struct { diff --git a/command/v7/marketplace_command_test.go b/command/v7/marketplace_command_test.go index 1b998b61a5..5f4e61e421 100644 --- a/command/v7/marketplace_command_test.go +++ b/command/v7/marketplace_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/move_route_command.go b/command/v7/move_route_command.go index 2c2edf365f..9efadedf10 100644 --- a/command/v7/move_route_command.go +++ b/command/v7/move_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type MoveRouteCommand struct { diff --git a/command/v7/move_route_command_test.go b/command/v7/move_route_command_test.go index e6393fd20e..7299d2f6e1 100644 --- a/command/v7/move_route_command_test.go +++ b/command/v7/move_route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/network_policies_command.go b/command/v7/network_policies_command.go index 70bd175a62..8b6832bcc0 100644 --- a/command/v7/network_policies_command.go +++ b/command/v7/network_policies_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkPoliciesActor diff --git a/command/v7/network_policies_command_test.go b/command/v7/network_policies_command_test.go index 4b724915cf..f386afcc14 100644 --- a/command/v7/network_policies_command_test.go +++ b/command/v7/network_policies_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/oauth_token_command.go b/command/v7/oauth_token_command.go index 7ea580cb69..3ef68ec2fb 100644 --- a/command/v7/oauth_token_command.go +++ b/command/v7/oauth_token_command.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" ) type OauthTokenCommand struct { diff --git a/command/v7/oauth_token_command_test.go b/command/v7/oauth_token_command_test.go index 5f3f5beadc..1621b2a030 100644 --- a/command/v7/oauth_token_command_test.go +++ b/command/v7/oauth_token_command_test.go @@ -3,11 +3,11 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" . "github.com/onsi/ginkgo/v2" diff --git a/command/v7/org_command.go b/command/v7/org_command.go index 70c104a189..fe8a9335ff 100644 --- a/command/v7/org_command.go +++ b/command/v7/org_command.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type OrgCommand struct { diff --git a/command/v7/org_command_test.go b/command/v7/org_command_test.go index aab3538850..fda1655f7d 100644 --- a/command/v7/org_command_test.go +++ b/command/v7/org_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/org_quota_command.go b/command/v7/org_quota_command.go index 7a4a63967b..ded9fc71b0 100644 --- a/command/v7/org_quota_command.go +++ b/command/v7/org_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type OrgQuotaCommand struct { diff --git a/command/v7/org_quota_command_test.go b/command/v7/org_quota_command_test.go index 3ff8f1777c..0aa2c6b287 100644 --- a/command/v7/org_quota_command_test.go +++ b/command/v7/org_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/org_quotas_command.go b/command/v7/org_quotas_command.go index 7bc67a6b8e..b0251d4768 100644 --- a/command/v7/org_quotas_command.go +++ b/command/v7/org_quotas_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type OrgQuotasCommand struct { diff --git a/command/v7/org_quotas_command_test.go b/command/v7/org_quotas_command_test.go index 6a5e5391f0..24db5c7251 100644 --- a/command/v7/org_quotas_command_test.go +++ b/command/v7/org_quotas_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/org_users_command.go b/command/v7/org_users_command.go index 2a5060cfe5..736659cf32 100644 --- a/command/v7/org_users_command.go +++ b/command/v7/org_users_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type OrgUsersCommand struct { diff --git a/command/v7/org_users_command_test.go b/command/v7/org_users_command_test.go index d6881a3ef9..a77806a085 100644 --- a/command/v7/org_users_command_test.go +++ b/command/v7/org_users_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/orgs_command.go b/command/v7/orgs_command.go index 82cb8fddb7..d2293eee1e 100644 --- a/command/v7/orgs_command.go +++ b/command/v7/orgs_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type OrgsCommand struct { diff --git a/command/v7/orgs_command_test.go b/command/v7/orgs_command_test.go index c3126062bd..2d089f0a0f 100644 --- a/command/v7/orgs_command_test.go +++ b/command/v7/orgs_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/packages_command.go b/command/v7/packages_command.go index e6cfef70e8..c0c372ff3c 100644 --- a/command/v7/packages_command.go +++ b/command/v7/packages_command.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type PackagesCommand struct { diff --git a/command/v7/packages_command_test.go b/command/v7/packages_command_test.go index 0542dd1b7f..eab375f708 100644 --- a/command/v7/packages_command_test.go +++ b/command/v7/packages_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/passwd_command.go b/command/v7/passwd_command.go index 8b91693313..187d57b497 100644 --- a/command/v7/passwd_command.go +++ b/command/v7/passwd_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type PasswdCommand struct { diff --git a/command/v7/passwd_command_test.go b/command/v7/passwd_command_test.go index 129ef14116..23b67812de 100644 --- a/command/v7/passwd_command_test.go +++ b/command/v7/passwd_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/purge_service_instance_command.go b/command/v7/purge_service_instance_command.go index bc5cbc1296..7b0a07be3c 100644 --- a/command/v7/purge_service_instance_command.go +++ b/command/v7/purge_service_instance_command.go @@ -3,8 +3,8 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) const purgeServiceInstanceWarning = "WARNING: This operation assumes that the service broker responsible for this service instance is no longer available or is not responding with a 200 or 410, and the service instance has been deleted, leaving orphan records in Cloud Foundry's database. All knowledge of the service instance will be removed from Cloud Foundry, including service bindings and service keys." diff --git a/command/v7/purge_service_instance_command_test.go b/command/v7/purge_service_instance_command_test.go index 1b174c02be..c1e60b201b 100644 --- a/command/v7/purge_service_instance_command_test.go +++ b/command/v7/purge_service_instance_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/purge_service_offering_command.go b/command/v7/purge_service_offering_command.go index ec4aa8132c..cb7163e00d 100644 --- a/command/v7/purge_service_offering_command.go +++ b/command/v7/purge_service_offering_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type PurgeServiceOfferingCommand struct { diff --git a/command/v7/purge_service_offering_command_test.go b/command/v7/purge_service_offering_command_test.go index 9e37dfe69a..3536d688ef 100644 --- a/command/v7/purge_service_offering_command_test.go +++ b/command/v7/purge_service_offering_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/push_command.go b/command/v7/push_command.go index bd5a97f34c..d09c876491 100644 --- a/command/v7/push_command.go +++ b/command/v7/push_command.go @@ -10,22 +10,22 @@ import ( log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/logcache" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/manifestparser" - "code.cloudfoundry.org/cli/v8/util/progressbar" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/progressbar" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ProgressBar diff --git a/command/v7/push_command_test.go b/command/v7/push_command_test.go index 051fffc02e..eafa30ae10 100644 --- a/command/v7/push_command_test.go +++ b/command/v7/push_command_test.go @@ -5,23 +5,23 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/manifestparser" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/manifestparser" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" diff --git a/command/v7/remove_network_policy_command.go b/command/v7/remove_network_policy_command.go index 183d314118..632f476d4e 100644 --- a/command/v7/remove_network_policy_command.go +++ b/command/v7/remove_network_policy_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RemoveNetworkPolicyActor diff --git a/command/v7/remove_network_policy_command_test.go b/command/v7/remove_network_policy_command_test.go index 447d83f94f..387ec93287 100644 --- a/command/v7/remove_network_policy_command_test.go +++ b/command/v7/remove_network_policy_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_command.go b/command/v7/rename_command.go index 5cf755fb49..3a68934226 100644 --- a/command/v7/rename_command.go +++ b/command/v7/rename_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RenameCommand struct { diff --git a/command/v7/rename_command_test.go b/command/v7/rename_command_test.go index 7853d8a953..86051328d4 100644 --- a/command/v7/rename_command_test.go +++ b/command/v7/rename_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_org_command.go b/command/v7/rename_org_command.go index e0b059f3e2..a65c58f636 100644 --- a/command/v7/rename_org_command.go +++ b/command/v7/rename_org_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RenameOrgCommand struct { diff --git a/command/v7/rename_org_command_test.go b/command/v7/rename_org_command_test.go index 785b3e574c..8a53f76a2f 100644 --- a/command/v7/rename_org_command_test.go +++ b/command/v7/rename_org_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_service_broker_command.go b/command/v7/rename_service_broker_command.go index c44fd30cd5..7bc061185e 100644 --- a/command/v7/rename_service_broker_command.go +++ b/command/v7/rename_service_broker_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type RenameServiceBrokerCommand struct { diff --git a/command/v7/rename_service_broker_command_test.go b/command/v7/rename_service_broker_command_test.go index 1bd6a036c8..9d38d3ebce 100644 --- a/command/v7/rename_service_broker_command_test.go +++ b/command/v7/rename_service_broker_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_service_command.go b/command/v7/rename_service_command.go index 39e90a717d..68036d7938 100644 --- a/command/v7/rename_service_command.go +++ b/command/v7/rename_service_command.go @@ -3,9 +3,9 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type RenameServiceCommand struct { diff --git a/command/v7/rename_service_command_test.go b/command/v7/rename_service_command_test.go index 6ca31e7118..e7d42f6f2a 100644 --- a/command/v7/rename_service_command_test.go +++ b/command/v7/rename_service_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rename_space_command.go b/command/v7/rename_space_command.go index cfaba1f91e..44d76ca186 100644 --- a/command/v7/rename_space_command.go +++ b/command/v7/rename_space_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RenameSpaceCommand struct { diff --git a/command/v7/rename_space_command_test.go b/command/v7/rename_space_command_test.go index 51e0d2e460..48a446de86 100644 --- a/command/v7/rename_space_command_test.go +++ b/command/v7/rename_space_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "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.go b/command/v7/reset_org_default_isolation_segment_command.go index ba7413f3fc..4d5a066fe6 100644 --- a/command/v7/reset_org_default_isolation_segment_command.go +++ b/command/v7/reset_org_default_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type ResetOrgDefaultIsolationSegmentCommand struct { 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 26bb36687a..af9ba1fadf 100644 --- a/command/v7/reset_org_default_isolation_segment_command_test.go +++ b/command/v7/reset_org_default_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/reset_space_isolation_segment_command.go b/command/v7/reset_space_isolation_segment_command.go index 49a9fe2763..4c5e54d6e3 100644 --- a/command/v7/reset_space_isolation_segment_command.go +++ b/command/v7/reset_space_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type ResetSpaceIsolationSegmentCommand struct { diff --git a/command/v7/reset_space_isolation_segment_command_test.go b/command/v7/reset_space_isolation_segment_command_test.go index bfd7719223..c5dea91902 100644 --- a/command/v7/reset_space_isolation_segment_command_test.go +++ b/command/v7/reset_space_isolation_segment_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restage_command.go b/command/v7/restage_command.go index 2d01766abd..71000c6878 100644 --- a/command/v7/restage_command.go +++ b/command/v7/restage_command.go @@ -1,14 +1,14 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/logcache" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type RestageCommand struct { diff --git a/command/v7/restage_command_test.go b/command/v7/restage_command_test.go index 4034a9ea8a..2fc8351929 100644 --- a/command/v7/restage_command_test.go +++ b/command/v7/restage_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restart_app_instance_command.go b/command/v7/restart_app_instance_command.go index d1c0f1717b..59abb58690 100644 --- a/command/v7/restart_app_instance_command.go +++ b/command/v7/restart_app_instance_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RestartAppInstanceCommand struct { diff --git a/command/v7/restart_app_instance_command_test.go b/command/v7/restart_app_instance_command_test.go index fbdc905efc..e79f96cd47 100644 --- a/command/v7/restart_app_instance_command_test.go +++ b/command/v7/restart_app_instance_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/restart_command.go b/command/v7/restart_command.go index edf7070f55..a8d8101c56 100644 --- a/command/v7/restart_command.go +++ b/command/v7/restart_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/logcache" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type RestartCommand struct { diff --git a/command/v7/restart_command_test.go b/command/v7/restart_command_test.go index 57fb9370a7..bcd1e9592b 100644 --- a/command/v7/restart_command_test.go +++ b/command/v7/restart_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/revision_command.go b/command/v7/revision_command.go index 99afa99b2b..55ccad328c 100644 --- a/command/v7/revision_command.go +++ b/command/v7/revision_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" ) type RevisionCommand struct { diff --git a/command/v7/revision_command_test.go b/command/v7/revision_command_test.go index 5b54e62c53..3c6982c19e 100644 --- a/command/v7/revision_command_test.go +++ b/command/v7/revision_command_test.go @@ -1,10 +1,10 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/revisions_command.go b/command/v7/revisions_command.go index 72adf888b0..f066aa002e 100644 --- a/command/v7/revisions_command.go +++ b/command/v7/revisions_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RevisionsActor diff --git a/command/v7/revisions_command_test.go b/command/v7/revisions_command_test.go index fb4ed47d92..9e88f6bea0 100644 --- a/command/v7/revisions_command_test.go +++ b/command/v7/revisions_command_test.go @@ -4,16 +4,16 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/rollback_command.go b/command/v7/rollback_command.go index ab66530629..3a77b73d52 100644 --- a/command/v7/rollback_command.go +++ b/command/v7/rollback_command.go @@ -3,13 +3,13 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type RollbackCommand struct { diff --git a/command/v7/rollback_command_test.go b/command/v7/rollback_command_test.go index 5b4ea7745e..4b420ba306 100644 --- a/command/v7/rollback_command_test.go +++ b/command/v7/rollback_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/route_command.go b/command/v7/route_command.go index a969b5ef9b..8100568cbe 100644 --- a/command/v7/route_command.go +++ b/command/v7/route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" "strconv" ) diff --git a/command/v7/route_command_test.go b/command/v7/route_command_test.go index 661d81dc10..ed9521030c 100644 --- a/command/v7/route_command_test.go +++ b/command/v7/route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/router_groups_command.go b/command/v7/router_groups_command.go index 3f09258623..d89a7b6da5 100644 --- a/command/v7/router_groups_command.go +++ b/command/v7/router_groups_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/util/ui" ) type RouterGroupsCommand struct { diff --git a/command/v7/router_groups_command_test.go b/command/v7/router_groups_command_test.go index cf64597bcf..6bf1453c89 100644 --- a/command/v7/router_groups_command_test.go +++ b/command/v7/router_groups_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/routes_command.go b/command/v7/routes_command.go index fc59b0b85d..2220a25709 100644 --- a/command/v7/routes_command.go +++ b/command/v7/routes_command.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type RoutesCommand struct { diff --git a/command/v7/routes_command_test.go b/command/v7/routes_command_test.go index 96c67dfa10..0d0edf5c66 100644 --- a/command/v7/routes_command_test.go +++ b/command/v7/routes_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/run_task_command.go b/command/v7/run_task_command.go index 0125479959..d906b5e2d3 100644 --- a/command/v7/run_task_command.go +++ b/command/v7/run_task_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type RunTaskCommand struct { diff --git a/command/v7/run_task_command_test.go b/command/v7/run_task_command_test.go index 01c75b4537..1de9b1925f 100644 --- a/command/v7/run_task_command_test.go +++ b/command/v7/run_task_command_test.go @@ -3,17 +3,17 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/running_environment_variable_group_command.go b/command/v7/running_environment_variable_group_command.go index 2cead40194..596a740cfc 100644 --- a/command/v7/running_environment_variable_group_command.go +++ b/command/v7/running_environment_variable_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/util/ui" ) type RunningEnvironmentVariableGroupCommand struct { diff --git a/command/v7/running_environment_variable_group_command_test.go b/command/v7/running_environment_variable_group_command_test.go index d4cc8e7f03..0de38b2dbe 100644 --- a/command/v7/running_environment_variable_group_command_test.go +++ b/command/v7/running_environment_variable_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/running_security_groups_command.go b/command/v7/running_security_groups_command.go index 2a3aa419ff..14c5d75614 100644 --- a/command/v7/running_security_groups_command.go +++ b/command/v7/running_security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type RunningSecurityGroupsCommand struct { diff --git a/command/v7/running_security_groups_command_test.go b/command/v7/running_security_groups_command_test.go index b3a608bf62..d789fad8fc 100644 --- a/command/v7/running_security_groups_command_test.go +++ b/command/v7/running_security_groups_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/scale_command.go b/command/v7/scale_command.go index fc4eab322a..0af339878e 100644 --- a/command/v7/scale_command.go +++ b/command/v7/scale_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type ScaleCommand struct { diff --git a/command/v7/scale_command_test.go b/command/v7/scale_command_test.go index f1e04c31e2..e49027876f 100644 --- a/command/v7/scale_command_test.go +++ b/command/v7/scale_command_test.go @@ -4,18 +4,18 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/security_group_command.go b/command/v7/security_group_command.go index 195607df68..719b330623 100644 --- a/command/v7/security_group_command.go +++ b/command/v7/security_group_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type SecurityGroupCommand struct { diff --git a/command/v7/security_group_command_test.go b/command/v7/security_group_command_test.go index b05d61279b..fff05abcbf 100644 --- a/command/v7/security_group_command_test.go +++ b/command/v7/security_group_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/security_groups_command.go b/command/v7/security_groups_command.go index 976da4dee1..9f35a5e99c 100644 --- a/command/v7/security_groups_command.go +++ b/command/v7/security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type SecurityGroupsCommand struct { diff --git a/command/v7/security_groups_command_test.go b/command/v7/security_groups_command_test.go index 453ec62dbd..4b8ab81e93 100644 --- a/command/v7/security_groups_command_test.go +++ b/command/v7/security_groups_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_access_command.go b/command/v7/service_access_command.go index a9e30721e2..c9d133181a 100644 --- a/command/v7/service_access_command.go +++ b/command/v7/service_access_command.go @@ -3,10 +3,10 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" ) type ServiceAccessCommand struct { diff --git a/command/v7/service_access_command_test.go b/command/v7/service_access_command_test.go index 4029d0b09b..e8b47e56ff 100644 --- a/command/v7/service_access_command_test.go +++ b/command/v7/service_access_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/service_brokers_command.go b/command/v7/service_brokers_command.go index 59365e167d..759b9d3b0e 100644 --- a/command/v7/service_brokers_command.go +++ b/command/v7/service_brokers_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type ServiceBrokersCommand struct { diff --git a/command/v7/service_brokers_command_test.go b/command/v7/service_brokers_command_test.go index 490086a89a..61bd4f8fe8 100644 --- a/command/v7/service_brokers_command_test.go +++ b/command/v7/service_brokers_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_command.go b/command/v7/service_command.go index 0d70e17f5c..db4e3556d9 100644 --- a/command/v7/service_command.go +++ b/command/v7/service_command.go @@ -4,10 +4,10 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) const indent = " " diff --git a/command/v7/service_command_test.go b/command/v7/service_command_test.go index d08e068e77..200e4e7c95 100644 --- a/command/v7/service_command_test.go +++ b/command/v7/service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_key_command.go b/command/v7/service_key_command.go index bd317d4dd9..140be00ac7 100644 --- a/command/v7/service_key_command.go +++ b/command/v7/service_key_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type ServiceKeyCommand struct { diff --git a/command/v7/service_key_command_test.go b/command/v7/service_key_command_test.go index c046756bb5..0ec7d0cc1c 100644 --- a/command/v7/service_key_command_test.go +++ b/command/v7/service_key_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/service_keys_command.go b/command/v7/service_keys_command.go index 1c1d7a7f1c..2ce91c4761 100644 --- a/command/v7/service_keys_command.go +++ b/command/v7/service_keys_command.go @@ -3,9 +3,9 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type ServiceKeysCommand struct { diff --git a/command/v7/service_keys_command_test.go b/command/v7/service_keys_command_test.go index 76618ec75e..4f43977ab3 100644 --- a/command/v7/service_keys_command_test.go +++ b/command/v7/service_keys_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/services_command.go b/command/v7/services_command.go index 23787a1b06..07ec97ed5b 100644 --- a/command/v7/services_command.go +++ b/command/v7/services_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/resources" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" ) type ServicesCommand struct { diff --git a/command/v7/services_command_test.go b/command/v7/services_command_test.go index 3075e4cb69..1a09bf0fda 100644 --- a/command/v7/services_command_test.go +++ b/command/v7/services_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_droplet_command.go b/command/v7/set_droplet_command.go index 0a5888291c..343927a90c 100644 --- a/command/v7/set_droplet_command.go +++ b/command/v7/set_droplet_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetDropletCommand struct { diff --git a/command/v7/set_droplet_command_test.go b/command/v7/set_droplet_command_test.go index 945f0da021..c4bb327d11 100644 --- a/command/v7/set_droplet_command_test.go +++ b/command/v7/set_droplet_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_env_command.go b/command/v7/set_env_command.go index 69d965ab39..be2724dd51 100644 --- a/command/v7/set_env_command.go +++ b/command/v7/set_env_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetEnvCommand struct { diff --git a/command/v7/set_env_command_test.go b/command/v7/set_env_command_test.go index 4249001ae9..5d87bc7cb9 100644 --- a/command/v7/set_env_command_test.go +++ b/command/v7/set_env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_health_check_command.go b/command/v7/set_health_check_command.go index 24239921bf..abe0f5a83f 100644 --- a/command/v7/set_health_check_command.go +++ b/command/v7/set_health_check_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetHealthCheckCommand struct { diff --git a/command/v7/set_health_check_command_test.go b/command/v7/set_health_check_command_test.go index 2b746cffe4..22d73e2ef2 100644 --- a/command/v7/set_health_check_command_test.go +++ b/command/v7/set_health_check_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_label_command.go b/command/v7/set_label_command.go index dfb2d00068..cd3dce9056 100644 --- a/command/v7/set_label_command.go +++ b/command/v7/set_label_command.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LabelSetter diff --git a/command/v7/set_label_command_test.go b/command/v7/set_label_command_test.go index e8d630789d..9eb2e16b86 100644 --- a/command/v7/set_label_command_test.go +++ b/command/v7/set_label_command_test.go @@ -1,10 +1,10 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/set_org_default_isolation_segment_command.go b/command/v7/set_org_default_isolation_segment_command.go index da90098f0b..a7ceb39900 100644 --- a/command/v7/set_org_default_isolation_segment_command.go +++ b/command/v7/set_org_default_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetOrgDefaultIsolationSegmentCommand struct { 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 e911f5c9c3..4a1b4af481 100644 --- a/command/v7/set_org_default_isolation_segment_command_test.go +++ b/command/v7/set_org_default_isolation_segment_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_org_quota_command.go b/command/v7/set_org_quota_command.go index 506fa2f66e..36fb0d052f 100644 --- a/command/v7/set_org_quota_command.go +++ b/command/v7/set_org_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetOrgQuotaCommand struct { diff --git a/command/v7/set_org_quota_command_test.go b/command/v7/set_org_quota_command_test.go index d437549a34..d0381fad73 100644 --- a/command/v7/set_org_quota_command_test.go +++ b/command/v7/set_org_quota_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" - - . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" + + . "code.cloudfoundry.org/cli/v9/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_org_role_command.go b/command/v7/set_org_role_command.go index 66c3aab939..be5a5ec35d 100644 --- a/command/v7/set_org_role_command.go +++ b/command/v7/set_org_role_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type SetOrgRoleCommand struct { diff --git a/command/v7/set_org_role_command_test.go b/command/v7/set_org_role_command_test.go index 31f6042857..b5475baacc 100644 --- a/command/v7/set_org_role_command_test.go +++ b/command/v7/set_org_role_command_test.go @@ -1,19 +1,19 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "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.go b/command/v7/set_running_environment_variable_group_command.go index 7b14ada925..684c1047fe 100644 --- a/command/v7/set_running_environment_variable_group_command.go +++ b/command/v7/set_running_environment_variable_group_command.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type SetRunningEnvironmentVariableGroupCommand struct { 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 80aaa1e5a9..e4814a0ab7 100644 --- a/command/v7/set_running_environment_variable_group_command_test.go +++ b/command/v7/set_running_environment_variable_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/set_space_isolation_segment_command.go b/command/v7/set_space_isolation_segment_command.go index 6f9412d2bd..1a0638abdd 100644 --- a/command/v7/set_space_isolation_segment_command.go +++ b/command/v7/set_space_isolation_segment_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetSpaceIsolationSegmentCommand struct { diff --git a/command/v7/set_space_isolation_segment_command_test.go b/command/v7/set_space_isolation_segment_command_test.go index 74dc182542..2cb5c028ae 100644 --- a/command/v7/set_space_isolation_segment_command_test.go +++ b/command/v7/set_space_isolation_segment_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_space_quota_command.go b/command/v7/set_space_quota_command.go index 6371913cb5..10695248fc 100644 --- a/command/v7/set_space_quota_command.go +++ b/command/v7/set_space_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SetSpaceQuotaCommand struct { diff --git a/command/v7/set_space_quota_command_test.go b/command/v7/set_space_quota_command_test.go index 3a4aecad89..c142905662 100644 --- a/command/v7/set_space_quota_command_test.go +++ b/command/v7/set_space_quota_command_test.go @@ -1,17 +1,17 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" - - . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" + + . "code.cloudfoundry.org/cli/v9/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/set_space_role_command.go b/command/v7/set_space_role_command.go index 5b6133e960..60d6ea16b8 100644 --- a/command/v7/set_space_role_command.go +++ b/command/v7/set_space_role_command.go @@ -3,11 +3,11 @@ package v7 import ( "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type SetSpaceRoleCommand struct { diff --git a/command/v7/set_space_role_command_test.go b/command/v7/set_space_role_command_test.go index bdba102e83..d7e9da1a4b 100644 --- a/command/v7/set_space_role_command_test.go +++ b/command/v7/set_space_role_command_test.go @@ -1,19 +1,19 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "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.go b/command/v7/set_staging_environment_variable_group_command.go index bba7d047e0..4c6f679bc1 100644 --- a/command/v7/set_staging_environment_variable_group_command.go +++ b/command/v7/set_staging_environment_variable_group_command.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type SetStagingEnvironmentVariableGroupCommand struct { 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 82f1c354a9..610175e8a8 100644 --- a/command/v7/set_staging_environment_variable_group_command_test.go +++ b/command/v7/set_staging_environment_variable_group_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/share_private_domain_command.go b/command/v7/share_private_domain_command.go index 0dabac7bdb..75c38d3cd6 100644 --- a/command/v7/share_private_domain_command.go +++ b/command/v7/share_private_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SharePrivateDomainCommand struct { diff --git a/command/v7/share_private_domain_command_test.go b/command/v7/share_private_domain_command_test.go index e7b34460f1..5dba5fa191 100644 --- a/command/v7/share_private_domain_command_test.go +++ b/command/v7/share_private_domain_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/share_route_command.go b/command/v7/share_route_command.go index 767d9573eb..84354e8c31 100644 --- a/command/v7/share_route_command.go +++ b/command/v7/share_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type ShareRouteCommand struct { diff --git a/command/v7/share_route_command_test.go b/command/v7/share_route_command_test.go index 67047a8c10..9dd436d4ed 100644 --- a/command/v7/share_route_command_test.go +++ b/command/v7/share_route_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/share_service_command.go b/command/v7/share_service_command.go index 76a46b1504..937396759d 100644 --- a/command/v7/share_service_command.go +++ b/command/v7/share_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) type ShareServiceCommand struct { diff --git a/command/v7/share_service_command_test.go b/command/v7/share_service_command_test.go index 78026f1e36..9a6edfbfe9 100644 --- a/command/v7/share_service_command_test.go +++ b/command/v7/share_service_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/util/configv3" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" - "code.cloudfoundry.org/cli/v8/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/app_stager.go b/command/v7/shared/app_stager.go index 3389528306..338e2f90fb 100644 --- a/command/v7/shared/app_stager.go +++ b/command/v7/shared/app_stager.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) /* diff --git a/command/v7/shared/app_stager_test.go b/command/v7/shared/app_stager_test.go index b4bdfe1084..b516b5a008 100644 --- a/command/v7/shared/app_stager_test.go +++ b/command/v7/shared/app_stager_test.go @@ -5,17 +5,17 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/app_summary_displayer.go b/command/v7/shared/app_summary_displayer.go index 46a97218df..27840f375c 100644 --- a/command/v7/shared/app_summary_displayer.go +++ b/command/v7/shared/app_summary_displayer.go @@ -7,11 +7,11 @@ import ( "time" "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" log "github.com/sirupsen/logrus" ) diff --git a/command/v7/shared/app_summary_displayer_test.go b/command/v7/shared/app_summary_displayer_test.go index 20bcf234d4..0407c2ef1d 100644 --- a/command/v7/shared/app_summary_displayer_test.go +++ b/command/v7/shared/app_summary_displayer_test.go @@ -3,13 +3,13 @@ package shared_test import ( "time" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/manifest_diff_displayer.go b/command/v7/shared/manifest_diff_displayer.go index eaac038ad6..eabd6872eb 100644 --- a/command/v7/shared/manifest_diff_displayer.go +++ b/command/v7/shared/manifest_diff_displayer.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" "gopkg.in/yaml.v2" ) diff --git a/command/v7/shared/manifest_diff_displayer_test.go b/command/v7/shared/manifest_diff_displayer_test.go index f9d990911b..297357e433 100644 --- a/command/v7/shared/manifest_diff_displayer_test.go +++ b/command/v7/shared/manifest_diff_displayer_test.go @@ -1,9 +1,9 @@ package shared_test import ( - . "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/new_clients.go b/command/v7/shared/new_clients.go index 2c797a1e58..48b4bcc615 100644 --- a/command/v7/shared/new_clients.go +++ b/command/v7/shared/new_clients.go @@ -1,15 +1,15 @@ package shared import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - ccWrapper "code.cloudfoundry.org/cli/v8/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/v8/api/router" - routingWrapper "code.cloudfoundry.org/cli/v8/api/router/wrapper" - "code.cloudfoundry.org/cli/v8/api/uaa" - uaaWrapper "code.cloudfoundry.org/cli/v8/api/uaa/wrapper" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + ccWrapper "code.cloudfoundry.org/cli/v9/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v9/api/router" + routingWrapper "code.cloudfoundry.org/cli/v9/api/router/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" + uaaWrapper "code.cloudfoundry.org/cli/v9/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) func GetNewClientsAndConnectToCF(config command.Config, ui command.UI, minVersionV3 string) (*ccv3.Client, *uaa.Client, *router.Client, error) { diff --git a/command/v7/shared/new_clients_test.go b/command/v7/shared/new_clients_test.go index 0ba13a69be..7ccfe31403 100644 --- a/command/v7/shared/new_clients_test.go +++ b/command/v7/shared/new_clients_test.go @@ -4,10 +4,10 @@ import ( "runtime" "time" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/new_networking_client.go b/command/v7/shared/new_networking_client.go index 855a50408b..80dc67ebaf 100644 --- a/command/v7/shared/new_networking_client.go +++ b/command/v7/shared/new_networking_client.go @@ -3,9 +3,9 @@ package shared import ( "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/wrapper" - "code.cloudfoundry.org/cli/v8/api/uaa" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) // NewNetworkingClient creates a new cfnetworking client. diff --git a/command/v7/shared/new_networking_client_test.go b/command/v7/shared/new_networking_client_test.go index d1ec72d355..b054eaf390 100644 --- a/command/v7/shared/new_networking_client_test.go +++ b/command/v7/shared/new_networking_client_test.go @@ -1,11 +1,11 @@ package shared_test import ( - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/util/ui" - "code.cloudfoundry.org/cli/v8/api/uaa" + "code.cloudfoundry.org/cli/v9/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/package_displayer.go b/command/v7/shared/package_displayer.go index 3d013c3741..da4925a077 100644 --- a/command/v7/shared/package_displayer.go +++ b/command/v7/shared/package_displayer.go @@ -1,7 +1,7 @@ package shared import ( - "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v9/command" ) type PackageDisplayer struct { diff --git a/command/v7/shared/quota_displayer.go b/command/v7/shared/quota_displayer.go index 09815fa432..837823e425 100644 --- a/command/v7/shared/quota_displayer.go +++ b/command/v7/shared/quota_displayer.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/ui" ) const ( diff --git a/command/v7/shared/result_waiter.go b/command/v7/shared/result_waiter.go index 45922a9a1b..6467882aa9 100644 --- a/command/v7/shared/result_waiter.go +++ b/command/v7/shared/result_waiter.go @@ -3,8 +3,8 @@ package shared import ( "fmt" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" ) func WaitForResult(stream chan v7action.PollJobEvent, ui command.UI, waitForCompletion bool) (bool, error) { diff --git a/command/v7/shared/sharedfakes/fake_app_stager.go b/command/v7/shared/sharedfakes/fake_app_stager.go index ba9d830a0f..09bb3654f5 100644 --- a/command/v7/shared/sharedfakes/fake_app_stager.go +++ b/command/v7/shared/sharedfakes/fake_app_stager.go @@ -4,9 +4,9 @@ package sharedfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeAppStager struct { diff --git a/command/v7/shared/v3_poll_stage.go b/command/v7/shared/v3_poll_stage.go index 0898caf3f8..1688ee858c 100644 --- a/command/v7/shared/v3_poll_stage.go +++ b/command/v7/shared/v3_poll_stage.go @@ -1,11 +1,11 @@ package shared import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/resources" ) func PollStage(dropletStream <-chan resources.Droplet, warningsStream <-chan v7action.Warnings, errStream <-chan error, logStream <-chan sharedaction.LogMessage, logErrStream <-chan error, ui command.UI) (resources.Droplet, error) { diff --git a/command/v7/shared/v3_poll_stage_test.go b/command/v7/shared/v3_poll_stage_test.go index f1f06032ad..1ed46289bc 100644 --- a/command/v7/shared/v3_poll_stage_test.go +++ b/command/v7/shared/v3_poll_stage_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - . "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + . "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/version_checker.go b/command/v7/shared/version_checker.go index 58692449a1..835e688988 100644 --- a/command/v7/shared/version_checker.go +++ b/command/v7/shared/version_checker.go @@ -3,7 +3,7 @@ package shared import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" "github.com/blang/semver/v4" ) diff --git a/command/v7/shared/version_checker_test.go b/command/v7/shared/version_checker_test.go index 4df2d9fafe..f15d404cbb 100644 --- a/command/v7/shared/version_checker_test.go +++ b/command/v7/shared/version_checker_test.go @@ -1,7 +1,7 @@ package shared_test import ( - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/v7/shared" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/space_command.go b/command/v7/space_command.go index 533fb7dbf4..be77398f0d 100644 --- a/command/v7/space_command.go +++ b/command/v7/space_command.go @@ -4,10 +4,10 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type SpaceCommand struct { diff --git a/command/v7/space_command_test.go b/command/v7/space_command_test.go index ce33a303ca..4d0d747965 100644 --- a/command/v7/space_command_test.go +++ b/command/v7/space_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/space_quota_command.go b/command/v7/space_quota_command.go index 06161db629..12269bd38f 100644 --- a/command/v7/space_quota_command.go +++ b/command/v7/space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type SpaceQuotaCommand struct { diff --git a/command/v7/space_quota_command_test.go b/command/v7/space_quota_command_test.go index ce5d8467d3..57a37a6c68 100644 --- a/command/v7/space_quota_command_test.go +++ b/command/v7/space_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/space_quotas_command.go b/command/v7/space_quotas_command.go index 3903bc40a8..30ef0fc9d0 100644 --- a/command/v7/space_quotas_command.go +++ b/command/v7/space_quotas_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type SpaceQuotasCommand struct { diff --git a/command/v7/space_quotas_command_test.go b/command/v7/space_quotas_command_test.go index 81e671e606..f4b8fc17e9 100644 --- a/command/v7/space_quotas_command_test.go +++ b/command/v7/space_quotas_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/space_ssh_allowed_command.go b/command/v7/space_ssh_allowed_command.go index b6f552c182..9f15becf1e 100644 --- a/command/v7/space_ssh_allowed_command.go +++ b/command/v7/space_ssh_allowed_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type SpaceSSHAllowedCommand struct { diff --git a/command/v7/space_ssh_allowed_command_test.go b/command/v7/space_ssh_allowed_command_test.go index 75a6583ea1..eb61d00926 100644 --- a/command/v7/space_ssh_allowed_command_test.go +++ b/command/v7/space_ssh_allowed_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/space_users_command.go b/command/v7/space_users_command.go index b9aa2daae7..5053a148e9 100644 --- a/command/v7/space_users_command.go +++ b/command/v7/space_users_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type SpaceUsersCommand struct { diff --git a/command/v7/space_users_command_test.go b/command/v7/space_users_command_test.go index 35ac70c148..dc0b7f4e96 100644 --- a/command/v7/space_users_command_test.go +++ b/command/v7/space_users_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/spaces_command.go b/command/v7/spaces_command.go index 1c5e22cd85..82002bdc04 100644 --- a/command/v7/spaces_command.go +++ b/command/v7/spaces_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/ui" ) type SpacesCommand struct { diff --git a/command/v7/spaces_command_test.go b/command/v7/spaces_command_test.go index baa0e8902f..ede871bab8 100644 --- a/command/v7/spaces_command_test.go +++ b/command/v7/spaces_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "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 33199276fc..da3f3f4637 100644 --- a/command/v7/ssh_code_command_test.go +++ b/command/v7/ssh_code_command_test.go @@ -3,12 +3,12 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/ssh_command.go b/command/v7/ssh_command.go index 3cd2b72c57..4c6eedd858 100644 --- a/command/v7/ssh_command.go +++ b/command/v7/ssh_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/clissh" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/clissh" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedSSHActor diff --git a/command/v7/ssh_command_test.go b/command/v7/ssh_command_test.go index 9077596a4a..4944b9bdd0 100644 --- a/command/v7/ssh_command_test.go +++ b/command/v7/ssh_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/ssh_enabled_command.go b/command/v7/ssh_enabled_command.go index 17c725196c..08dbd4683b 100644 --- a/command/v7/ssh_enabled_command.go +++ b/command/v7/ssh_enabled_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type SSHEnabledCommand struct { diff --git a/command/v7/ssh_enabled_command_test.go b/command/v7/ssh_enabled_command_test.go index c0d1fd3c2c..48d8166a02 100644 --- a/command/v7/ssh_enabled_command_test.go +++ b/command/v7/ssh_enabled_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stack_command.go b/command/v7/stack_command.go index d721055442..fd2cd3777e 100644 --- a/command/v7/stack_command.go +++ b/command/v7/stack_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type StackCommand struct { diff --git a/command/v7/stack_command_test.go b/command/v7/stack_command_test.go index 5f8da5f189..685e09ae79 100644 --- a/command/v7/stack_command_test.go +++ b/command/v7/stack_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/resources" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stacks_command.go b/command/v7/stacks_command.go index 413339e76e..e125a689ea 100644 --- a/command/v7/stacks_command.go +++ b/command/v7/stacks_command.go @@ -3,9 +3,9 @@ package v7 import ( "sort" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/sorting" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/sorting" + "code.cloudfoundry.org/cli/v9/util/ui" ) type StacksCommand struct { diff --git a/command/v7/stacks_command_test.go b/command/v7/stacks_command_test.go index 08b14de0b1..f182d57b0e 100644 --- a/command/v7/stacks_command_test.go +++ b/command/v7/stacks_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/stage_package_command.go b/command/v7/stage_package_command.go index 9f08112d23..e5b4f401f2 100644 --- a/command/v7/stage_package_command.go +++ b/command/v7/stage_package_command.go @@ -4,13 +4,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/logcache" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/resources" ) type StagePackageCommand struct { diff --git a/command/v7/stage_package_command_test.go b/command/v7/stage_package_command_test.go index edb157f1a5..8be2dc5b77 100644 --- a/command/v7/stage_package_command_test.go +++ b/command/v7/stage_package_command_test.go @@ -5,18 +5,18 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/staging_environment_variable_group_command.go b/command/v7/staging_environment_variable_group_command.go index 54fdf36683..d76b80a5c3 100644 --- a/command/v7/staging_environment_variable_group_command.go +++ b/command/v7/staging_environment_variable_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/util/ui" ) type StagingEnvironmentVariableGroupCommand struct { diff --git a/command/v7/staging_environment_variable_group_command_test.go b/command/v7/staging_environment_variable_group_command_test.go index d9795fbf37..9e9d1ed826 100644 --- a/command/v7/staging_environment_variable_group_command_test.go +++ b/command/v7/staging_environment_variable_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/staging_security_groups_command.go b/command/v7/staging_security_groups_command.go index 82bcea7be8..02625e7eff 100644 --- a/command/v7/staging_security_groups_command.go +++ b/command/v7/staging_security_groups_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type StagingSecurityGroupsCommand struct { diff --git a/command/v7/staging_security_groups_command_test.go b/command/v7/staging_security_groups_command_test.go index 2cfd7097a4..9a7723ab6f 100644 --- a/command/v7/staging_security_groups_command_test.go +++ b/command/v7/staging_security_groups_command_test.go @@ -1,14 +1,14 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/start_command.go b/command/v7/start_command.go index babc0c6acf..9a3ca4b3e9 100644 --- a/command/v7/start_command.go +++ b/command/v7/start_command.go @@ -1,13 +1,13 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/logcache" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/logcache" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type StartCommand struct { diff --git a/command/v7/start_command_test.go b/command/v7/start_command_test.go index ef092aeab4..c12679734c 100644 --- a/command/v7/start_command_test.go +++ b/command/v7/start_command_test.go @@ -3,18 +3,18 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/sharedaction/sharedactionfakes" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/shared/sharedfakes" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/stop_command.go b/command/v7/stop_command.go index 7ba757456d..3b2c43aa60 100644 --- a/command/v7/stop_command.go +++ b/command/v7/stop_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type StopCommand struct { diff --git a/command/v7/stop_command_test.go b/command/v7/stop_command_test.go index c549b76825..8f46898197 100644 --- a/command/v7/stop_command_test.go +++ b/command/v7/stop_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/target_command.go b/command/v7/target_command.go index e894841980..b0daf6303d 100644 --- a/command/v7/target_command.go +++ b/command/v7/target_command.go @@ -3,8 +3,8 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type TargetCommand struct { diff --git a/command/v7/target_command_test.go b/command/v7/target_command_test.go index 92318dc4b4..222eac1e71 100644 --- a/command/v7/target_command_test.go +++ b/command/v7/target_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/tasks_command.go b/command/v7/tasks_command.go index 347890a6eb..cdf3213b26 100644 --- a/command/v7/tasks_command.go +++ b/command/v7/tasks_command.go @@ -4,9 +4,9 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type TasksCommand struct { diff --git a/command/v7/tasks_command_test.go b/command/v7/tasks_command_test.go index 433a441c0e..66282e5e45 100644 --- a/command/v7/tasks_command_test.go +++ b/command/v7/tasks_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/terminate_task_command.go b/command/v7/terminate_task_command.go index fffd268b27..3c6c0f1ce8 100644 --- a/command/v7/terminate_task_command.go +++ b/command/v7/terminate_task_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type TerminateTaskCommand struct { diff --git a/command/v7/terminate_task_command_test.go b/command/v7/terminate_task_command_test.go index dbff427df6..9bad2cb9d4 100644 --- a/command/v7/terminate_task_command_test.go +++ b/command/v7/terminate_task_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_route_service_command.go b/command/v7/unbind_route_service_command.go index d77a474b21..ab525bcb30 100644 --- a/command/v7/unbind_route_service_command.go +++ b/command/v7/unbind_route_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type UnbindRouteServiceCommand struct { diff --git a/command/v7/unbind_route_service_command_test.go b/command/v7/unbind_route_service_command_test.go index 05910c0157..29d76ae3fb 100644 --- a/command/v7/unbind_route_service_command_test.go +++ b/command/v7/unbind_route_service_command_test.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "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 c0f25e2a4f..d495b2922c 100644 --- a/command/v7/unbind_running_group_command_test.go +++ b/command/v7/unbind_running_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_running_security_group_command.go b/command/v7/unbind_running_security_group_command.go index 58d818c4b4..2a73389666 100644 --- a/command/v7/unbind_running_security_group_command.go +++ b/command/v7/unbind_running_security_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnbindRunningSecurityGroupCommand struct { diff --git a/command/v7/unbind_security_group.go b/command/v7/unbind_security_group.go index 6c5bd4f4c7..1da8821d6a 100644 --- a/command/v7/unbind_security_group.go +++ b/command/v7/unbind_security_group.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnbindSecurityGroupCommand struct { diff --git a/command/v7/unbind_security_group_test.go b/command/v7/unbind_security_group_test.go index 1140dd1f42..630a17bd0a 100644 --- a/command/v7/unbind_security_group_test.go +++ b/command/v7/unbind_security_group_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_service_command.go b/command/v7/unbind_service_command.go index 9ba1d95ae5..4389fc8e84 100644 --- a/command/v7/unbind_service_command.go +++ b/command/v7/unbind_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type UnbindServiceCommand struct { diff --git a/command/v7/unbind_service_command_test.go b/command/v7/unbind_service_command_test.go index 8085bef869..64c62b48c9 100644 --- a/command/v7/unbind_service_command_test.go +++ b/command/v7/unbind_service_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unbind_staging_security_group_command.go b/command/v7/unbind_staging_security_group_command.go index e67680127e..bd9dae34a7 100644 --- a/command/v7/unbind_staging_security_group_command.go +++ b/command/v7/unbind_staging_security_group_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnbindStagingSecurityGroupCommand struct { diff --git a/command/v7/unbind_staging_security_group_command_test.go b/command/v7/unbind_staging_security_group_command_test.go index 8e4a47dad8..c96254a843 100644 --- a/command/v7/unbind_staging_security_group_command_test.go +++ b/command/v7/unbind_staging_security_group_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unmap_route_command.go b/command/v7/unmap_route_command.go index 9e4d0176b7..6904783ced 100644 --- a/command/v7/unmap_route_command.go +++ b/command/v7/unmap_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnmapRouteCommand struct { diff --git a/command/v7/unmap_route_command_test.go b/command/v7/unmap_route_command_test.go index 12887207d7..3d6c9de4c7 100644 --- a/command/v7/unmap_route_command_test.go +++ b/command/v7/unmap_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/unset_env_command.go b/command/v7/unset_env_command.go index 7b1b639d11..e997961f03 100644 --- a/command/v7/unset_env_command.go +++ b/command/v7/unset_env_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnsetEnvCommand struct { diff --git a/command/v7/unset_env_command_test.go b/command/v7/unset_env_command_test.go index e12f63c9df..4269b56764 100644 --- a/command/v7/unset_env_command_test.go +++ b/command/v7/unset_env_command_test.go @@ -3,13 +3,13 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_label_command.go b/command/v7/unset_label_command.go index 3f93f2178b..e164e58c4a 100644 --- a/command/v7/unset_label_command.go +++ b/command/v7/unset_label_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . LabelUnsetter diff --git a/command/v7/unset_label_command_test.go b/command/v7/unset_label_command_test.go index e1607ce38c..c4a27fa4df 100644 --- a/command/v7/unset_label_command_test.go +++ b/command/v7/unset_label_command_test.go @@ -1,10 +1,10 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/unset_org_role_command.go b/command/v7/unset_org_role_command.go index 3c9782cf7a..8b4384ab36 100644 --- a/command/v7/unset_org_role_command.go +++ b/command/v7/unset_org_role_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type UnsetOrgRoleCommand struct { diff --git a/command/v7/unset_org_role_command_test.go b/command/v7/unset_org_role_command_test.go index 0a6b0c93c6..de6072be07 100644 --- a/command/v7/unset_org_role_command_test.go +++ b/command/v7/unset_org_role_command_test.go @@ -1,18 +1,18 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_space_quota_command.go b/command/v7/unset_space_quota_command.go index cf4d2374c2..5dbe2c9688 100644 --- a/command/v7/unset_space_quota_command.go +++ b/command/v7/unset_space_quota_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnsetSpaceQuotaCommand struct { diff --git a/command/v7/unset_space_quota_command_test.go b/command/v7/unset_space_quota_command_test.go index 0485ee6ece..4b3f38eb05 100644 --- a/command/v7/unset_space_quota_command_test.go +++ b/command/v7/unset_space_quota_command_test.go @@ -1,15 +1,15 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" - - . "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" + + . "code.cloudfoundry.org/cli/v9/command/v7" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unset_space_role_command.go b/command/v7/unset_space_role_command.go index 094d67de10..c4248f4eff 100644 --- a/command/v7/unset_space_role_command.go +++ b/command/v7/unset_space_role_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type UnsetSpaceRoleCommand struct { diff --git a/command/v7/unset_space_role_command_test.go b/command/v7/unset_space_role_command_test.go index 7a14d7e153..0fef83e151 100644 --- a/command/v7/unset_space_role_command_test.go +++ b/command/v7/unset_space_role_command_test.go @@ -1,18 +1,18 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unshare_private_domain_command.go b/command/v7/unshare_private_domain_command.go index 95cb25f20b..f93a814217 100644 --- a/command/v7/unshare_private_domain_command.go +++ b/command/v7/unshare_private_domain_command.go @@ -1,7 +1,7 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnsharePrivateDomainCommand struct { diff --git a/command/v7/unshare_private_domain_command_test.go b/command/v7/unshare_private_domain_command_test.go index 01c1c89969..75c7f31a11 100644 --- a/command/v7/unshare_private_domain_command_test.go +++ b/command/v7/unshare_private_domain_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/unshare_route_command.go b/command/v7/unshare_route_command.go index cc6eedc111..e8fa8be35c 100644 --- a/command/v7/unshare_route_command.go +++ b/command/v7/unshare_route_command.go @@ -1,8 +1,8 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UnshareRouteCommand struct { diff --git a/command/v7/unshare_route_command_test.go b/command/v7/unshare_route_command_test.go index 06afafc7fa..6183c7b0a0 100644 --- a/command/v7/unshare_route_command_test.go +++ b/command/v7/unshare_route_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/unshare_service_command.go b/command/v7/unshare_service_command.go index c6a8cbb649..3e71639189 100644 --- a/command/v7/unshare_service_command.go +++ b/command/v7/unshare_service_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/types" ) type UnshareServiceCommand struct { diff --git a/command/v7/unshare_service_command_test.go b/command/v7/unshare_service_command_test.go index d4addada98..15b11a15dc 100644 --- a/command/v7/unshare_service_command_test.go +++ b/command/v7/unshare_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_buildpack_command.go b/command/v7/update_buildpack_command.go index 61ed13094e..e0551b1462 100644 --- a/command/v7/update_buildpack_command.go +++ b/command/v7/update_buildpack_command.go @@ -4,16 +4,16 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/download" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/download" ) type UpdateBuildpackActor interface { diff --git a/command/v7/update_buildpack_command_test.go b/command/v7/update_buildpack_command_test.go index 293b10ec35..899983dd3f 100644 --- a/command/v7/update_buildpack_command_test.go +++ b/command/v7/update_buildpack_command_test.go @@ -3,20 +3,20 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - - "code.cloudfoundry.org/cli/v8/command/translatableerror" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/command/translatableerror" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_destination_command.go b/command/v7/update_destination_command.go index ad8b9fe7cc..b918717c97 100644 --- a/command/v7/update_destination_command.go +++ b/command/v7/update_destination_command.go @@ -3,8 +3,8 @@ package v7 import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UpdateDestinationCommand struct { diff --git a/command/v7/update_destination_command_test.go b/command/v7/update_destination_command_test.go index c81e32ff27..d708c0dc2c 100644 --- a/command/v7/update_destination_command_test.go +++ b/command/v7/update_destination_command_test.go @@ -1,16 +1,16 @@ package v7_test import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_org_quota_command.go b/command/v7/update_org_quota_command.go index d9199ac48a..3aec18ca71 100644 --- a/command/v7/update_org_quota_command.go +++ b/command/v7/update_org_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type UpdateOrgQuotaCommand struct { diff --git a/command/v7/update_org_quota_command_test.go b/command/v7/update_org_quota_command_test.go index 4d4409900b..294e1ab3d2 100644 --- a/command/v7/update_org_quota_command_test.go +++ b/command/v7/update_org_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_security_group_command.go b/command/v7/update_security_group_command.go index 47846ca151..ffbd31e46b 100644 --- a/command/v7/update_security_group_command.go +++ b/command/v7/update_security_group_command.go @@ -3,8 +3,8 @@ package v7 import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" ) type UpdateSecurityGroupCommand struct { diff --git a/command/v7/update_security_group_command_test.go b/command/v7/update_security_group_command_test.go index e59beea631..db57214701 100644 --- a/command/v7/update_security_group_command_test.go +++ b/command/v7/update_security_group_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_service_broker_command.go b/command/v7/update_service_broker_command.go index 15620eb0cd..193f5ca086 100644 --- a/command/v7/update_service_broker_command.go +++ b/command/v7/update_service_broker_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type UpdateServiceBrokerCommand struct { diff --git a/command/v7/update_service_broker_command_test.go b/command/v7/update_service_broker_command_test.go index d4ab809f14..8205c11437 100644 --- a/command/v7/update_service_broker_command_test.go +++ b/command/v7/update_service_broker_command_test.go @@ -4,15 +4,15 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/cf/errors" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/cf/errors" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_service_command.go b/command/v7/update_service_command.go index 2c10086cff..3a54a62f7b 100644 --- a/command/v7/update_service_command.go +++ b/command/v7/update_service_command.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/v7/shared" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/v7/shared" + "code.cloudfoundry.org/cli/v9/types" ) type UpdateServiceCommand struct { diff --git a/command/v7/update_service_command_test.go b/command/v7/update_service_command_test.go index 4d81b73ddb..a9f8e7c214 100644 --- a/command/v7/update_service_command_test.go +++ b/command/v7/update_service_command_test.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_space_quota_command.go b/command/v7/update_space_quota_command.go index 03d4498093..03511c4aa1 100644 --- a/command/v7/update_space_quota_command.go +++ b/command/v7/update_space_quota_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) type UpdateSpaceQuotaCommand struct { diff --git a/command/v7/update_space_quota_command_test.go b/command/v7/update_space_quota_command_test.go index 3f3ba55b81..8e60682470 100644 --- a/command/v7/update_space_quota_command_test.go +++ b/command/v7/update_space_quota_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/flag" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/update_user_provided_service_command.go b/command/v7/update_user_provided_service_command.go index ce10d10faf..2fd2c6c8fd 100644 --- a/command/v7/update_user_provided_service_command.go +++ b/command/v7/update_user_provided_service_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" ) type UpdateUserProvidedServiceCommand struct { diff --git a/command/v7/update_user_provided_service_command_test.go b/command/v7/update_user_provided_service_command_test.go index 4679e02fe1..9f9dded736 100644 --- a/command/v7/update_user_provided_service_command_test.go +++ b/command/v7/update_user_provided_service_command_test.go @@ -3,19 +3,19 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccerror" - - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/upgrade_service_command.go b/command/v7/upgrade_service_command.go index fccd013361..490b6e0d34 100644 --- a/command/v7/upgrade_service_command.go +++ b/command/v7/upgrade_service_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/command/v7/shared" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/v7/shared" ) type UpgradeServiceCommand struct { diff --git a/command/v7/upgrade_service_command_test.go b/command/v7/upgrade_service_command_test.go index 3c8acb319c..0f41ad25f0 100644 --- a/command/v7/upgrade_service_command_test.go +++ b/command/v7/upgrade_service_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/v8/actor/actionerror" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/command/commandfakes" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - . "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/command/v7/v7fakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/v7fakes/fake_actor.go b/command/v7/v7fakes/fake_actor.go index 4993d06ab7..7b3362723e 100644 --- a/command/v7/v7fakes/fake_actor.go +++ b/command/v7/v7fakes/fake_actor.go @@ -8,16 +8,16 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - constanta "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/api/uaa/constant" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + constanta "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/uaa/constant" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" "github.com/SermoDigital/jose/jwt" ) diff --git a/command/v7/v7fakes/fake_actor_reloader.go b/command/v7/v7fakes/fake_actor_reloader.go index 66243532d5..8787672958 100644 --- a/command/v7/v7fakes/fake_actor_reloader.go +++ b/command/v7/v7fakes/fake_actor_reloader.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/command" - v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/command" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeActorReloader struct { @@ -34,15 +34,16 @@ func (fake *FakeActorReloader) Reload(arg1 command.Config, arg2 command.UI) (v7. arg1 command.Config arg2 command.UI }{arg1, arg2}) + stub := fake.ReloadStub + fakeReturns := fake.reloadReturns fake.recordInvocation("Reload", []interface{}{arg1, arg2}) fake.reloadMutex.Unlock() - if fake.ReloadStub != nil { - return fake.ReloadStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.reloadReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_diff_displayer.go b/command/v7/v7fakes/fake_diff_displayer.go index 04a855c6e2..8287b97c16 100644 --- a/command/v7/v7fakes/fake_diff_displayer.go +++ b/command/v7/v7fakes/fake_diff_displayer.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/resources" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeDiffDisplayer struct { @@ -37,15 +37,16 @@ func (fake *FakeDiffDisplayer) DisplayDiff(arg1 []byte, arg2 resources.ManifestD arg1 []byte arg2 resources.ManifestDiff }{arg1Copy, arg2}) + stub := fake.DisplayDiffStub + fakeReturns := fake.displayDiffReturns fake.recordInvocation("DisplayDiff", []interface{}{arg1Copy, arg2}) fake.displayDiffMutex.Unlock() - if fake.DisplayDiffStub != nil { - return fake.DisplayDiffStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayDiffReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_label_setter.go b/command/v7/v7fakes/fake_label_setter.go index 27ab8ed55f..36443f1b9b 100644 --- a/command/v7/v7fakes/fake_label_setter.go +++ b/command/v7/v7fakes/fake_label_setter.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/types" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/types" ) type FakeLabelSetter struct { @@ -32,15 +32,16 @@ func (fake *FakeLabelSetter) Execute(arg1 v7.TargetResource, arg2 map[string]typ arg1 v7.TargetResource arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1, arg2}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_label_unsetter.go b/command/v7/v7fakes/fake_label_unsetter.go index e832c9698b..48ec32fe77 100644 --- a/command/v7/v7fakes/fake_label_unsetter.go +++ b/command/v7/v7fakes/fake_label_unsetter.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/types" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/types" ) type FakeLabelUnsetter struct { @@ -32,15 +32,16 @@ func (fake *FakeLabelUnsetter) Execute(arg1 v7.TargetResource, arg2 map[string]t arg1 v7.TargetResource arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.ExecuteStub + fakeReturns := fake.executeReturns fake.recordInvocation("Execute", []interface{}{arg1, arg2}) fake.executeMutex.Unlock() - if fake.ExecuteStub != nil { - return fake.ExecuteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_manifest_locator.go b/command/v7/v7fakes/fake_manifest_locator.go index 2e04f129ce..0e41343c30 100644 --- a/command/v7/v7fakes/fake_manifest_locator.go +++ b/command/v7/v7fakes/fake_manifest_locator.go @@ -4,7 +4,7 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/v8/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeManifestLocator struct { @@ -33,15 +33,16 @@ func (fake *FakeManifestLocator) Path(arg1 string) (string, bool, error) { fake.pathArgsForCall = append(fake.pathArgsForCall, struct { arg1 string }{arg1}) + stub := fake.PathStub + fakeReturns := fake.pathReturns fake.recordInvocation("Path", []interface{}{arg1}) fake.pathMutex.Unlock() - if fake.PathStub != nil { - return fake.PathStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pathReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v7/v7fakes/fake_manifest_parser.go b/command/v7/v7fakes/fake_manifest_parser.go index fbee9c86c4..dff85521ea 100644 --- a/command/v7/v7fakes/fake_manifest_parser.go +++ b/command/v7/v7fakes/fake_manifest_parser.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" ) @@ -74,15 +74,16 @@ func (fake *FakeManifestParser) InterpolateManifest(arg1 string, arg2 []string, arg2 []string arg3 []template.VarKV }{arg1, arg2Copy, arg3Copy}) + stub := fake.InterpolateManifestStub + fakeReturns := fake.interpolateManifestReturns fake.recordInvocation("InterpolateManifest", []interface{}{arg1, arg2Copy, arg3Copy}) fake.interpolateManifestMutex.Unlock() - if fake.InterpolateManifestStub != nil { - return fake.InterpolateManifestStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.interpolateManifestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -137,15 +138,16 @@ func (fake *FakeManifestParser) MarshalManifest(arg1 manifestparser.Manifest) ([ fake.marshalManifestArgsForCall = append(fake.marshalManifestArgsForCall, struct { arg1 manifestparser.Manifest }{arg1}) + stub := fake.MarshalManifestStub + fakeReturns := fake.marshalManifestReturns fake.recordInvocation("MarshalManifest", []interface{}{arg1}) fake.marshalManifestMutex.Unlock() - if fake.MarshalManifestStub != nil { - return fake.MarshalManifestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.marshalManifestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -206,15 +208,16 @@ func (fake *FakeManifestParser) ParseManifest(arg1 string, arg2 []byte) (manifes arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.ParseManifestStub + fakeReturns := fake.parseManifestReturns fake.recordInvocation("ParseManifest", []interface{}{arg1, arg2Copy}) fake.parseManifestMutex.Unlock() - if fake.ParseManifestStub != nil { - return fake.ParseManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.parseManifestReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_network_policies_actor.go b/command/v7/v7fakes/fake_network_policies_actor.go index 828062d617..8bcdf225bd 100644 --- a/command/v7/v7fakes/fake_network_policies_actor.go +++ b/command/v7/v7fakes/fake_network_policies_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeNetworkPoliciesActor struct { @@ -50,15 +50,16 @@ func (fake *FakeNetworkPoliciesActor) NetworkPoliciesBySpace(arg1 string) ([]cfn fake.networkPoliciesBySpaceArgsForCall = append(fake.networkPoliciesBySpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.NetworkPoliciesBySpaceStub + fakeReturns := fake.networkPoliciesBySpaceReturns fake.recordInvocation("NetworkPoliciesBySpace", []interface{}{arg1}) fake.networkPoliciesBySpaceMutex.Unlock() - if fake.NetworkPoliciesBySpaceStub != nil { - return fake.NetworkPoliciesBySpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.networkPoliciesBySpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -117,15 +118,16 @@ func (fake *FakeNetworkPoliciesActor) NetworkPoliciesBySpaceAndAppName(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.NetworkPoliciesBySpaceAndAppNameStub + fakeReturns := fake.networkPoliciesBySpaceAndAppNameReturns fake.recordInvocation("NetworkPoliciesBySpaceAndAppName", []interface{}{arg1, arg2}) fake.networkPoliciesBySpaceAndAppNameMutex.Unlock() - if fake.NetworkPoliciesBySpaceAndAppNameStub != nil { - return fake.NetworkPoliciesBySpaceAndAppNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.networkPoliciesBySpaceAndAppNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v7/v7fakes/fake_networking_actor.go b/command/v7/v7fakes/fake_networking_actor.go index cd409425f8..1ca88ae437 100644 --- a/command/v7/v7fakes/fake_networking_actor.go +++ b/command/v7/v7fakes/fake_networking_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeNetworkingActor struct { @@ -44,15 +44,16 @@ func (fake *FakeNetworkingActor) AddNetworkPolicy(arg1 string, arg2 string, arg3 arg6 int arg7 int }{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) + stub := fake.AddNetworkPolicyStub + fakeReturns := fake.addNetworkPolicyReturns fake.recordInvocation("AddNetworkPolicy", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) fake.addNetworkPolicyMutex.Unlock() - if fake.AddNetworkPolicyStub != nil { - return fake.AddNetworkPolicyStub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.addNetworkPolicyReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_progress_bar.go b/command/v7/v7fakes/fake_progress_bar.go index 73ca3a74a5..5311884376 100644 --- a/command/v7/v7fakes/fake_progress_bar.go +++ b/command/v7/v7fakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - v7 "code.cloudfoundry.org/cli/v8/command/v7" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeProgressBar struct { @@ -37,9 +37,10 @@ func (fake *FakeProgressBar) Complete() { fake.completeMutex.Lock() fake.completeArgsForCall = append(fake.completeArgsForCall, struct { }{}) + stub := fake.CompleteStub fake.recordInvocation("Complete", []interface{}{}) fake.completeMutex.Unlock() - if fake.CompleteStub != nil { + if stub != nil { fake.CompleteStub() } } @@ -63,15 +64,16 @@ func (fake *FakeProgressBar) NewProgressBarWrapper(arg1 io.Reader, arg2 int64) i arg1 io.Reader arg2 int64 }{arg1, arg2}) + stub := fake.NewProgressBarWrapperStub + fakeReturns := fake.newProgressBarWrapperReturns fake.recordInvocation("NewProgressBarWrapper", []interface{}{arg1, arg2}) fake.newProgressBarWrapperMutex.Unlock() - if fake.NewProgressBarWrapperStub != nil { - return fake.NewProgressBarWrapperStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.newProgressBarWrapperReturns return fakeReturns.result1 } @@ -121,9 +123,10 @@ func (fake *FakeProgressBar) Ready() { fake.readyMutex.Lock() fake.readyArgsForCall = append(fake.readyArgsForCall, struct { }{}) + stub := fake.ReadyStub fake.recordInvocation("Ready", []interface{}{}) fake.readyMutex.Unlock() - if fake.ReadyStub != nil { + if stub != nil { fake.ReadyStub() } } diff --git a/command/v7/v7fakes/fake_push_actor.go b/command/v7/v7fakes/fake_push_actor.go index 974f0a915e..4187b0adf6 100644 --- a/command/v7/v7fakes/fake_push_actor.go +++ b/command/v7/v7fakes/fake_push_actor.go @@ -4,10 +4,10 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" - "code.cloudfoundry.org/cli/v8/actor/v7pushaction" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/util/manifestparser" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7pushaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/util/manifestparser" ) type FakePushActor struct { @@ -66,15 +66,16 @@ func (fake *FakePushActor) Actualize(arg1 v7pushaction.PushPlan, arg2 v7pushacti arg1 v7pushaction.PushPlan arg2 v7pushaction.ProgressBar }{arg1, arg2}) + stub := fake.ActualizeStub + fakeReturns := fake.actualizeReturns fake.recordInvocation("Actualize", []interface{}{arg1, arg2}) fake.actualizeMutex.Unlock() - if fake.ActualizeStub != nil { - return fake.ActualizeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.actualizeReturns return fakeReturns.result1 } @@ -129,15 +130,16 @@ func (fake *FakePushActor) CreatePushPlans(arg1 string, arg2 string, arg3 manife arg3 manifestparser.Manifest arg4 v7pushaction.FlagOverrides }{arg1, arg2, arg3, arg4}) + stub := fake.CreatePushPlansStub + fakeReturns := fake.createPushPlansReturns fake.recordInvocation("CreatePushPlans", []interface{}{arg1, arg2, arg3, arg4}) fake.createPushPlansMutex.Unlock() - if fake.CreatePushPlansStub != nil { - return fake.CreatePushPlansStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createPushPlansReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -196,15 +198,16 @@ func (fake *FakePushActor) HandleFlagOverrides(arg1 manifestparser.Manifest, arg arg1 manifestparser.Manifest arg2 v7pushaction.FlagOverrides }{arg1, arg2}) + stub := fake.HandleFlagOverridesStub + fakeReturns := fake.handleFlagOverridesReturns fake.recordInvocation("HandleFlagOverrides", []interface{}{arg1, arg2}) fake.handleFlagOverridesMutex.Unlock() - if fake.HandleFlagOverridesStub != nil { - return fake.HandleFlagOverridesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.handleFlagOverridesReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_remove_network_policy_actor.go b/command/v7/v7fakes/fake_remove_network_policy_actor.go index ca873ebbc2..9c3a4d61aa 100644 --- a/command/v7/v7fakes/fake_remove_network_policy_actor.go +++ b/command/v7/v7fakes/fake_remove_network_policy_actor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/cfnetworkingaction" - v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeRemoveNetworkPolicyActor struct { @@ -44,15 +44,16 @@ func (fake *FakeRemoveNetworkPolicyActor) RemoveNetworkPolicy(arg1 string, arg2 arg6 int arg7 int }{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) + stub := fake.RemoveNetworkPolicyStub + fakeReturns := fake.removeNetworkPolicyReturns fake.recordInvocation("RemoveNetworkPolicy", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) fake.removeNetworkPolicyMutex.Unlock() - if fake.RemoveNetworkPolicyStub != nil { - return fake.RemoveNetworkPolicyStub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.removeNetworkPolicyReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_revisions_actor.go b/command/v7/v7fakes/fake_revisions_actor.go index 1f674f4074..e126f4ea24 100644 --- a/command/v7/v7fakes/fake_revisions_actor.go +++ b/command/v7/v7fakes/fake_revisions_actor.go @@ -4,9 +4,9 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/v7action" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeRevisionsActor struct { @@ -37,15 +37,16 @@ func (fake *FakeRevisionsActor) GetRevisionsByApplicationNameAndSpace(arg1 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetRevisionsByApplicationNameAndSpaceStub + fakeReturns := fake.getRevisionsByApplicationNameAndSpaceReturns fake.recordInvocation("GetRevisionsByApplicationNameAndSpace", []interface{}{arg1, arg2}) fake.getRevisionsByApplicationNameAndSpaceMutex.Unlock() - if fake.GetRevisionsByApplicationNameAndSpaceStub != nil { - return fake.GetRevisionsByApplicationNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRevisionsByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v7/v7fakes/fake_set_label_actor.go b/command/v7/v7fakes/fake_set_label_actor.go index 5438c37600..143545ae11 100644 --- a/command/v7/v7fakes/fake_set_label_actor.go +++ b/command/v7/v7fakes/fake_set_label_actor.go @@ -4,10 +4,10 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/v7action" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/actor/v7action" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeSetLabelActor struct { @@ -194,15 +194,16 @@ func (fake *FakeSetLabelActor) GetCurrentUser() (configv3.User, error) { ret, specificReturn := fake.getCurrentUserReturnsOnCall[len(fake.getCurrentUserArgsForCall)] fake.getCurrentUserArgsForCall = append(fake.getCurrentUserArgsForCall, struct { }{}) + stub := fake.GetCurrentUserStub + fakeReturns := fake.getCurrentUserReturns fake.recordInvocation("GetCurrentUser", []interface{}{}) fake.getCurrentUserMutex.Unlock() - if fake.GetCurrentUserStub != nil { - return fake.GetCurrentUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getCurrentUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -252,15 +253,16 @@ func (fake *FakeSetLabelActor) UpdateApplicationLabelsByApplicationName(arg1 str arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateApplicationLabelsByApplicationNameStub + fakeReturns := fake.updateApplicationLabelsByApplicationNameReturns fake.recordInvocation("UpdateApplicationLabelsByApplicationName", []interface{}{arg1, arg2, arg3}) fake.updateApplicationLabelsByApplicationNameMutex.Unlock() - if fake.UpdateApplicationLabelsByApplicationNameStub != nil { - return fake.UpdateApplicationLabelsByApplicationNameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateApplicationLabelsByApplicationNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -317,15 +319,16 @@ func (fake *FakeSetLabelActor) UpdateBuildpackLabelsByBuildpackNameAndStack(arg1 arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateBuildpackLabelsByBuildpackNameAndStackStub + fakeReturns := fake.updateBuildpackLabelsByBuildpackNameAndStackReturns fake.recordInvocation("UpdateBuildpackLabelsByBuildpackNameAndStack", []interface{}{arg1, arg2, arg3}) fake.updateBuildpackLabelsByBuildpackNameAndStackMutex.Unlock() - if fake.UpdateBuildpackLabelsByBuildpackNameAndStackStub != nil { - return fake.UpdateBuildpackLabelsByBuildpackNameAndStackStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateBuildpackLabelsByBuildpackNameAndStackReturns return fakeReturns.result1, fakeReturns.result2 } @@ -381,15 +384,16 @@ func (fake *FakeSetLabelActor) UpdateDomainLabelsByDomainName(arg1 string, arg2 arg1 string arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.UpdateDomainLabelsByDomainNameStub + fakeReturns := fake.updateDomainLabelsByDomainNameReturns fake.recordInvocation("UpdateDomainLabelsByDomainName", []interface{}{arg1, arg2}) fake.updateDomainLabelsByDomainNameMutex.Unlock() - if fake.UpdateDomainLabelsByDomainNameStub != nil { - return fake.UpdateDomainLabelsByDomainNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateDomainLabelsByDomainNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -445,15 +449,16 @@ func (fake *FakeSetLabelActor) UpdateOrganizationLabelsByOrganizationName(arg1 s arg1 string arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.UpdateOrganizationLabelsByOrganizationNameStub + fakeReturns := fake.updateOrganizationLabelsByOrganizationNameReturns fake.recordInvocation("UpdateOrganizationLabelsByOrganizationName", []interface{}{arg1, arg2}) fake.updateOrganizationLabelsByOrganizationNameMutex.Unlock() - if fake.UpdateOrganizationLabelsByOrganizationNameStub != nil { - return fake.UpdateOrganizationLabelsByOrganizationNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateOrganizationLabelsByOrganizationNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -510,15 +515,16 @@ func (fake *FakeSetLabelActor) UpdateRouteLabels(arg1 string, arg2 string, arg3 arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateRouteLabelsStub + fakeReturns := fake.updateRouteLabelsReturns fake.recordInvocation("UpdateRouteLabels", []interface{}{arg1, arg2, arg3}) fake.updateRouteLabelsMutex.Unlock() - if fake.UpdateRouteLabelsStub != nil { - return fake.UpdateRouteLabelsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateRouteLabelsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -574,15 +580,16 @@ func (fake *FakeSetLabelActor) UpdateServiceBrokerLabelsByServiceBrokerName(arg1 arg1 string arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.UpdateServiceBrokerLabelsByServiceBrokerNameStub + fakeReturns := fake.updateServiceBrokerLabelsByServiceBrokerNameReturns fake.recordInvocation("UpdateServiceBrokerLabelsByServiceBrokerName", []interface{}{arg1, arg2}) fake.updateServiceBrokerLabelsByServiceBrokerNameMutex.Unlock() - if fake.UpdateServiceBrokerLabelsByServiceBrokerNameStub != nil { - return fake.UpdateServiceBrokerLabelsByServiceBrokerNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceBrokerLabelsByServiceBrokerNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -639,15 +646,16 @@ func (fake *FakeSetLabelActor) UpdateServiceInstanceLabels(arg1 string, arg2 str arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateServiceInstanceLabelsStub + fakeReturns := fake.updateServiceInstanceLabelsReturns fake.recordInvocation("UpdateServiceInstanceLabels", []interface{}{arg1, arg2, arg3}) fake.updateServiceInstanceLabelsMutex.Unlock() - if fake.UpdateServiceInstanceLabelsStub != nil { - return fake.UpdateServiceInstanceLabelsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceInstanceLabelsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -704,15 +712,16 @@ func (fake *FakeSetLabelActor) UpdateServiceOfferingLabels(arg1 string, arg2 str arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateServiceOfferingLabelsStub + fakeReturns := fake.updateServiceOfferingLabelsReturns fake.recordInvocation("UpdateServiceOfferingLabels", []interface{}{arg1, arg2, arg3}) fake.updateServiceOfferingLabelsMutex.Unlock() - if fake.UpdateServiceOfferingLabelsStub != nil { - return fake.UpdateServiceOfferingLabelsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceOfferingLabelsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -770,15 +779,16 @@ func (fake *FakeSetLabelActor) UpdateServicePlanLabels(arg1 string, arg2 string, arg3 string arg4 map[string]types.NullString }{arg1, arg2, arg3, arg4}) + stub := fake.UpdateServicePlanLabelsStub + fakeReturns := fake.updateServicePlanLabelsReturns fake.recordInvocation("UpdateServicePlanLabels", []interface{}{arg1, arg2, arg3, arg4}) fake.updateServicePlanLabelsMutex.Unlock() - if fake.UpdateServicePlanLabelsStub != nil { - return fake.UpdateServicePlanLabelsStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServicePlanLabelsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -835,15 +845,16 @@ func (fake *FakeSetLabelActor) UpdateSpaceLabelsBySpaceName(arg1 string, arg2 st arg2 string arg3 map[string]types.NullString }{arg1, arg2, arg3}) + stub := fake.UpdateSpaceLabelsBySpaceNameStub + fakeReturns := fake.updateSpaceLabelsBySpaceNameReturns fake.recordInvocation("UpdateSpaceLabelsBySpaceName", []interface{}{arg1, arg2, arg3}) fake.updateSpaceLabelsBySpaceNameMutex.Unlock() - if fake.UpdateSpaceLabelsBySpaceNameStub != nil { - return fake.UpdateSpaceLabelsBySpaceNameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceLabelsBySpaceNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -899,15 +910,16 @@ func (fake *FakeSetLabelActor) UpdateStackLabelsByStackName(arg1 string, arg2 ma arg1 string arg2 map[string]types.NullString }{arg1, arg2}) + stub := fake.UpdateStackLabelsByStackNameStub + fakeReturns := fake.updateStackLabelsByStackNameReturns fake.recordInvocation("UpdateStackLabelsByStackName", []interface{}{arg1, arg2}) fake.updateStackLabelsByStackNameMutex.Unlock() - if fake.UpdateStackLabelsByStackNameStub != nil { - return fake.UpdateStackLabelsByStackNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateStackLabelsByStackNameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_shared_sshactor.go b/command/v7/v7fakes/fake_shared_sshactor.go index f1c067eaea..a7756d048b 100644 --- a/command/v7/v7fakes/fake_shared_sshactor.go +++ b/command/v7/v7fakes/fake_shared_sshactor.go @@ -4,8 +4,8 @@ package v7fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - v7 "code.cloudfoundry.org/cli/v8/command/v7" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + v7 "code.cloudfoundry.org/cli/v9/command/v7" ) type FakeSharedSSHActor struct { @@ -32,15 +32,16 @@ func (fake *FakeSharedSSHActor) ExecuteSecureShell(arg1 sharedaction.SecureShell arg1 sharedaction.SecureShellClient arg2 sharedaction.SSHOptions }{arg1, arg2}) + stub := fake.ExecuteSecureShellStub + fakeReturns := fake.executeSecureShellReturns fake.recordInvocation("ExecuteSecureShell", []interface{}{arg1, arg2}) fake.executeSecureShellMutex.Unlock() - if fake.ExecuteSecureShellStub != nil { - return fake.ExecuteSecureShellStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.executeSecureShellReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_v7actor_for_push.go b/command/v7/v7fakes/fake_v7actor_for_push.go index 634e191dba..2240735812 100644 --- a/command/v7/v7fakes/fake_v7actor_for_push.go +++ b/command/v7/v7fakes/fake_v7actor_for_push.go @@ -5,10 +5,10 @@ import ( "context" "sync" - "code.cloudfoundry.org/cli/v8/actor/sharedaction" - "code.cloudfoundry.org/cli/v8/actor/v7action" - v7 "code.cloudfoundry.org/cli/v8/command/v7" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/actor/sharedaction" + "code.cloudfoundry.org/cli/v9/actor/v7action" + v7 "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/resources" ) type FakeV7ActorForPush struct { @@ -105,15 +105,16 @@ func (fake *FakeV7ActorForPush) GetApplicationByNameAndSpace(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationByNameAndSpaceStub + fakeReturns := fake.getApplicationByNameAndSpaceReturns fake.recordInvocation("GetApplicationByNameAndSpace", []interface{}{arg1, arg2}) fake.getApplicationByNameAndSpaceMutex.Unlock() - if fake.GetApplicationByNameAndSpaceStub != nil { - return fake.GetApplicationByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -173,15 +174,16 @@ func (fake *FakeV7ActorForPush) GetDetailedAppSummary(arg1 string, arg2 string, arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.GetDetailedAppSummaryStub + fakeReturns := fake.getDetailedAppSummaryReturns fake.recordInvocation("GetDetailedAppSummary", []interface{}{arg1, arg2, arg3}) fake.getDetailedAppSummaryMutex.Unlock() - if fake.GetDetailedAppSummaryStub != nil { - return fake.GetDetailedAppSummaryStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDetailedAppSummaryReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -241,15 +243,16 @@ func (fake *FakeV7ActorForPush) GetStreamingLogsForApplicationByNameAndSpace(arg arg2 string arg3 sharedaction.LogCacheClient }{arg1, arg2, arg3}) + stub := fake.GetStreamingLogsForApplicationByNameAndSpaceStub + fakeReturns := fake.getStreamingLogsForApplicationByNameAndSpaceReturns fake.recordInvocation("GetStreamingLogsForApplicationByNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.getStreamingLogsForApplicationByNameAndSpaceMutex.Unlock() - if fake.GetStreamingLogsForApplicationByNameAndSpaceStub != nil { - return fake.GetStreamingLogsForApplicationByNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4, ret.result5 } - fakeReturns := fake.getStreamingLogsForApplicationByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4, fakeReturns.result5 } @@ -314,15 +317,16 @@ func (fake *FakeV7ActorForPush) RestartApplication(arg1 string, arg2 bool) (v7ac arg1 string arg2 bool }{arg1, arg2}) + stub := fake.RestartApplicationStub + fakeReturns := fake.restartApplicationReturns fake.recordInvocation("RestartApplication", []interface{}{arg1, arg2}) fake.restartApplicationMutex.Unlock() - if fake.RestartApplicationStub != nil { - return fake.RestartApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.restartApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -383,15 +387,16 @@ func (fake *FakeV7ActorForPush) SetSpaceManifest(arg1 string, arg2 []byte) (v7ac arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.SetSpaceManifestStub + fakeReturns := fake.setSpaceManifestReturns fake.recordInvocation("SetSpaceManifest", []interface{}{arg1, arg2Copy}) fake.setSpaceManifestMutex.Unlock() - if fake.SetSpaceManifestStub != nil { - return fake.SetSpaceManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setSpaceManifestReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/fixtures/plugins/alias_conflicts.go b/fixtures/plugins/alias_conflicts.go index 987b96dfee..1dba396c20 100644 --- a/fixtures/plugins/alias_conflicts.go +++ b/fixtures/plugins/alias_conflicts.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type AliasConflicts struct { diff --git a/fixtures/plugins/call_core_cmd.go b/fixtures/plugins/call_core_cmd.go index ec33b21317..aee37e1688 100644 --- a/fixtures/plugins/call_core_cmd.go +++ b/fixtures/plugins/call_core_cmd.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type CoreCmd struct{} diff --git a/fixtures/plugins/empty_plugin.go b/fixtures/plugins/empty_plugin.go index b88dc7e139..d996baafac 100644 --- a/fixtures/plugins/empty_plugin.go +++ b/fixtures/plugins/empty_plugin.go @@ -1,6 +1,6 @@ package main -import "code.cloudfoundry.org/cli/v8/plugin" +import "code.cloudfoundry.org/cli/v9/plugin" type EmptyPlugin struct{} diff --git a/fixtures/plugins/input.go b/fixtures/plugins/input.go index 2dd8058632..31def96bc4 100644 --- a/fixtures/plugins/input.go +++ b/fixtures/plugins/input.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Input struct { diff --git a/fixtures/plugins/my_say.go b/fixtures/plugins/my_say.go index 066f6cad22..1a3ce03e90 100644 --- a/fixtures/plugins/my_say.go +++ b/fixtures/plugins/my_say.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type MySay struct { diff --git a/fixtures/plugins/panics.go b/fixtures/plugins/panics.go index 4106d47dd2..d8997e316f 100644 --- a/fixtures/plugins/panics.go +++ b/fixtures/plugins/panics.go @@ -10,7 +10,7 @@ package main import ( "os" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Panics struct { diff --git a/fixtures/plugins/test_1.go b/fixtures/plugins/test_1.go index d334df78db..681c60d991 100644 --- a/fixtures/plugins/test_1.go +++ b/fixtures/plugins/test_1.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Test1 struct { diff --git a/fixtures/plugins/test_2.go b/fixtures/plugins/test_2.go index c9b60c705b..70362393c3 100644 --- a/fixtures/plugins/test_2.go +++ b/fixtures/plugins/test_2.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Test2 struct{} diff --git a/fixtures/plugins/test_with_help.go b/fixtures/plugins/test_with_help.go index 03224f6bfc..51681aaff5 100644 --- a/fixtures/plugins/test_with_help.go +++ b/fixtures/plugins/test_with_help.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithHelp struct { diff --git a/fixtures/plugins/test_with_orgs.go b/fixtures/plugins/test_with_orgs.go index db5a65e0b8..4cf2e0657e 100644 --- a/fixtures/plugins/test_with_orgs.go +++ b/fixtures/plugins/test_with_orgs.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithOrgs struct { diff --git a/fixtures/plugins/test_with_orgs_short_name.go b/fixtures/plugins/test_with_orgs_short_name.go index 3064736541..890cd92528 100644 --- a/fixtures/plugins/test_with_orgs_short_name.go +++ b/fixtures/plugins/test_with_orgs_short_name.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithOrgsShortName struct { diff --git a/fixtures/plugins/test_with_push.go b/fixtures/plugins/test_with_push.go index 2d4afe0fed..c2be3cc486 100644 --- a/fixtures/plugins/test_with_push.go +++ b/fixtures/plugins/test_with_push.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithPush struct { diff --git a/fixtures/plugins/test_with_push_short_name.go b/fixtures/plugins/test_with_push_short_name.go index d538f5853c..eca78cb83f 100644 --- a/fixtures/plugins/test_with_push_short_name.go +++ b/fixtures/plugins/test_with_push_short_name.go @@ -10,7 +10,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestWithPushShortName struct { diff --git a/go.mod b/go.mod index cc0a5b8860..dc04dd2cd5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.cloudfoundry.org/cli/v8 +module code.cloudfoundry.org/cli/v9 go 1.23.1 diff --git a/integration/assets/configurable_plugin/test_plugin.go b/integration/assets/configurable_plugin/test_plugin.go index 6d63413259..0e0fffe27e 100644 --- a/integration/assets/configurable_plugin/test_plugin.go +++ b/integration/assets/configurable_plugin/test_plugin.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" "github.com/blang/semver/v4" ) diff --git a/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go b/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go index 0f83415ab1..1552459aed 100644 --- a/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go +++ b/integration/assets/configurable_plugin_fails_uninstall/test_plugin_fails_uninstall.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" "github.com/blang/semver/v4" ) diff --git a/integration/assets/hydrabroker/app/app.go b/integration/assets/hydrabroker/app/app.go index 2041334360..d1bd49619e 100644 --- a/integration/assets/hydrabroker/app/app.go +++ b/integration/assets/hydrabroker/app/app.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" "github.com/gorilla/mux" ) diff --git a/integration/assets/hydrabroker/app/broker.go b/integration/assets/hydrabroker/app/broker.go index a4e1fa981b..6dfa03426a 100644 --- a/integration/assets/hydrabroker/app/broker.go +++ b/integration/assets/hydrabroker/app/broker.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" "github.com/pivotal-cf/brokerapi/v7/domain" "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) diff --git a/integration/assets/hydrabroker/app/config.go b/integration/assets/hydrabroker/app/config.go index d65953dd34..82c97215e0 100644 --- a/integration/assets/hydrabroker/app/config.go +++ b/integration/assets/hydrabroker/app/config.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" "github.com/go-playground/validator/v10" ) diff --git a/integration/assets/hydrabroker/app/helpers.go b/integration/assets/hydrabroker/app/helpers.go index c504c2882e..0ccbbb945c 100644 --- a/integration/assets/hydrabroker/app/helpers.go +++ b/integration/assets/hydrabroker/app/helpers.go @@ -6,7 +6,7 @@ import ( "log" "net/http" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" "github.com/gorilla/mux" uuid "github.com/nu7hatch/gouuid" ) diff --git a/integration/assets/hydrabroker/database/database_suite_test.go b/integration/assets/hydrabroker/database/database_suite_test.go index a22064d811..6b7d74ae09 100644 --- a/integration/assets/hydrabroker/database/database_suite_test.go +++ b/integration/assets/hydrabroker/database/database_suite_test.go @@ -2,6 +2,9 @@ package database_test import ( "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) func TestDatabase(t *testing.T) { diff --git a/integration/assets/hydrabroker/database/database_test.go b/integration/assets/hydrabroker/database/database_test.go index 23c87b60f7..00faebd56e 100644 --- a/integration/assets/hydrabroker/database/database_test.go +++ b/integration/assets/hydrabroker/database/database_test.go @@ -4,7 +4,9 @@ import ( "fmt" "sync" - . "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" + . "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Database", func() { diff --git a/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go b/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go index 6260592539..4d20e0df1c 100644 --- a/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go +++ b/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go @@ -2,6 +2,9 @@ package integrationtest_test import ( "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) func TestIntegrationtest(t *testing.T) { diff --git a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go index 7cd0fb2cbc..dbb584d8bd 100644 --- a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go +++ b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go @@ -11,10 +11,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/app" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/app" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" uuid2 "github.com/nu7hatch/gouuid" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gstruct" "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) diff --git a/integration/assets/hydrabroker/main.go b/integration/assets/hydrabroker/main.go index b7ee02d778..2df98b324a 100644 --- a/integration/assets/hydrabroker/main.go +++ b/integration/assets/hydrabroker/main.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/app" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/app" ) func main() { diff --git a/integration/assets/hydrabroker/store/bindings.go b/integration/assets/hydrabroker/store/bindings.go index cc7c30f214..fbf7039126 100644 --- a/integration/assets/hydrabroker/store/bindings.go +++ b/integration/assets/hydrabroker/store/bindings.go @@ -3,8 +3,8 @@ package store import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" ) func (st *Store) CreateBinding(brokerID BrokerID, instanceID InstanceID, bindingID BindingID, details resources.BindingDetails) error { diff --git a/integration/assets/hydrabroker/store/bindings_test.go b/integration/assets/hydrabroker/store/bindings_test.go index d982988877..e610eca98d 100644 --- a/integration/assets/hydrabroker/store/bindings_test.go +++ b/integration/assets/hydrabroker/store/bindings_test.go @@ -3,10 +3,12 @@ package store_test import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" uuid "github.com/nu7hatch/gouuid" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Bindings", func() { diff --git a/integration/assets/hydrabroker/store/brokers.go b/integration/assets/hydrabroker/store/brokers.go index b01907f273..62d12825d8 100644 --- a/integration/assets/hydrabroker/store/brokers.go +++ b/integration/assets/hydrabroker/store/brokers.go @@ -1,8 +1,8 @@ package store import ( - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" ) func (st *Store) CreateBroker(cfg config.BrokerConfiguration) BrokerID { diff --git a/integration/assets/hydrabroker/store/brokers_test.go b/integration/assets/hydrabroker/store/brokers_test.go index 37622d3eb3..e83fac907e 100644 --- a/integration/assets/hydrabroker/store/brokers_test.go +++ b/integration/assets/hydrabroker/store/brokers_test.go @@ -1,8 +1,11 @@ package store_test import ( - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Brokers", func() { diff --git a/integration/assets/hydrabroker/store/instances.go b/integration/assets/hydrabroker/store/instances.go index 161eb04759..2cf2c6d2b8 100644 --- a/integration/assets/hydrabroker/store/instances.go +++ b/integration/assets/hydrabroker/store/instances.go @@ -3,9 +3,9 @@ package store import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" ) func (st *Store) CreateInstance(brokerID BrokerID, instanceID InstanceID, details resources.ServiceInstanceDetails) error { diff --git a/integration/assets/hydrabroker/store/instances_test.go b/integration/assets/hydrabroker/store/instances_test.go index c3d0c1d785..986c31a0f0 100644 --- a/integration/assets/hydrabroker/store/instances_test.go +++ b/integration/assets/hydrabroker/store/instances_test.go @@ -3,10 +3,13 @@ package store_test import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/resources" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/store" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/resources" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/store" uuid "github.com/nu7hatch/gouuid" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Instances", func() { diff --git a/integration/assets/hydrabroker/store/store.go b/integration/assets/hydrabroker/store/store.go index 9ac592cbd2..9b7d731444 100644 --- a/integration/assets/hydrabroker/store/store.go +++ b/integration/assets/hydrabroker/store/store.go @@ -1,7 +1,7 @@ package store import ( - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/database" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/database" ) type BrokerID database.ID diff --git a/integration/assets/hydrabroker/store/store_suite_test.go b/integration/assets/hydrabroker/store/store_suite_test.go index 0851085ea1..aa685e16a7 100644 --- a/integration/assets/hydrabroker/store/store_suite_test.go +++ b/integration/assets/hydrabroker/store/store_suite_test.go @@ -2,6 +2,9 @@ package store_test import ( "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) func TestStore(t *testing.T) { diff --git a/integration/assets/test_plugin/test_plugin.go b/integration/assets/test_plugin/test_plugin.go index 020c297c3f..564bad0fcf 100644 --- a/integration/assets/test_plugin/test_plugin.go +++ b/integration/assets/test_plugin/test_plugin.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Test1 struct { diff --git a/integration/assets/test_plugin_fails_metadata/test_plugin.go b/integration/assets/test_plugin_fails_metadata/test_plugin.go index 167dff3307..528d90d6e3 100644 --- a/integration/assets/test_plugin_fails_metadata/test_plugin.go +++ b/integration/assets/test_plugin_fails_metadata/test_plugin.go @@ -3,7 +3,7 @@ package main import ( "os" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestPluginFailsMetadata struct{} diff --git a/integration/assets/test_plugin_with_command_overrides/test_plugin.go b/integration/assets/test_plugin_with_command_overrides/test_plugin.go index e880019c31..b5664d7afd 100644 --- a/integration/assets/test_plugin_with_command_overrides/test_plugin.go +++ b/integration/assets/test_plugin_with_command_overrides/test_plugin.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type TestPluginWithCommandOverrides struct { diff --git a/integration/assets/test_plugin_with_panic/test_plugin.go b/integration/assets/test_plugin_with_panic/test_plugin.go index 9eff20dc99..4e7abdecb3 100644 --- a/integration/assets/test_plugin_with_panic/test_plugin.go +++ b/integration/assets/test_plugin_with_panic/test_plugin.go @@ -1,6 +1,6 @@ package main -import "code.cloudfoundry.org/cli/v8/plugin" +import "code.cloudfoundry.org/cli/v9/plugin" type TestPluginWithPanic struct { } diff --git a/integration/helpers/app_instance_table_test.go b/integration/helpers/app_instance_table_test.go index 137ac11d72..43f41bdd59 100644 --- a/integration/helpers/app_instance_table_test.go +++ b/integration/helpers/app_instance_table_test.go @@ -1,7 +1,7 @@ package helpers_test import ( - . "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/helpers/app_test.go b/integration/helpers/app_test.go index 8e305c61d6..1efca0230b 100644 --- a/integration/helpers/app_test.go +++ b/integration/helpers/app_test.go @@ -1,7 +1,7 @@ package helpers_test import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 2484345e3d..cca16527a1 100644 --- a/integration/helpers/commonisolated/common_isolated_setup.go +++ b/integration/helpers/commonisolated/common_isolated_setup.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/config.go b/integration/helpers/config.go index a2c6f8f582..d6e76b3edc 100644 --- a/integration/helpers/config.go +++ b/integration/helpers/config.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/helpers/plugin.go b/integration/helpers/plugin.go index 40e4cf1137..b2ad1909b4 100644 --- a/integration/helpers/plugin.go +++ b/integration/helpers/plugin.go @@ -37,7 +37,7 @@ func BuildConfigurablePlugin(pluginType string, name string, version string, plu commandHelps = append(commandHelps, command.Help) } - pluginPath, err := Build(fmt.Sprintf("code.cloudfoundry.org/cli/v8/integration/assets/%s", pluginType), + pluginPath, err := Build(fmt.Sprintf("code.cloudfoundry.org/cli/v9/integration/assets/%s", pluginType), "-o", name, "-ldflags", diff --git a/integration/helpers/plugin_repo.go b/integration/helpers/plugin_repo.go index d7fd29e6a4..45c200027a 100644 --- a/integration/helpers/plugin_repo.go +++ b/integration/helpers/plugin_repo.go @@ -9,8 +9,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/util" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/util" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/integration/helpers/route.go b/integration/helpers/route.go index 844d498aea..7c379fcbc2 100644 --- a/integration/helpers/route.go +++ b/integration/helpers/route.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/helpers/security_group.go b/integration/helpers/security_group.go index 8dcb01f9a6..633042a6eb 100644 --- a/integration/helpers/security_group.go +++ b/integration/helpers/security_group.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/servicebrokerstub/api.go b/integration/helpers/servicebrokerstub/api.go index b15236a8d8..49a6f421c1 100644 --- a/integration/helpers/servicebrokerstub/api.go +++ b/integration/helpers/servicebrokerstub/api.go @@ -3,9 +3,9 @@ package servicebrokerstub import ( "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" ) type ServiceAccessConfig struct { diff --git a/integration/helpers/servicebrokerstub/app_config.go b/integration/helpers/servicebrokerstub/app_config.go index 145102c47b..6f566759da 100644 --- a/integration/helpers/servicebrokerstub/app_config.go +++ b/integration/helpers/servicebrokerstub/app_config.go @@ -7,8 +7,8 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/app_deploy.go b/integration/helpers/servicebrokerstub/app_deploy.go index 0216fc3817..18f7ee02de 100644 --- a/integration/helpers/servicebrokerstub/app_deploy.go +++ b/integration/helpers/servicebrokerstub/app_deploy.go @@ -11,7 +11,7 @@ import ( "github.com/onsi/ginkgo/v2" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/cf.go b/integration/helpers/servicebrokerstub/cf.go index 53f486909e..de63781e17 100644 --- a/integration/helpers/servicebrokerstub/cf.go +++ b/integration/helpers/servicebrokerstub/cf.go @@ -3,7 +3,7 @@ package servicebrokerstub import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/version.go b/integration/helpers/version.go index e5caab51e6..43a902fde5 100644 --- a/integration/helpers/version.go +++ b/integration/helpers/version.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/v8/actor/versioncheck" + "code.cloudfoundry.org/cli/v9/actor/versioncheck" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/shared/experimental/experimental_suite_test.go b/integration/shared/experimental/experimental_suite_test.go index 888a588247..fd6d0590d3 100644 --- a/integration/shared/experimental/experimental_suite_test.go +++ b/integration/shared/experimental/experimental_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 f5d0b38b1a..e935a06e15 100644 --- a/integration/shared/global/global_suite_test.go +++ b/integration/shared/global/global_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" 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 dd2fca8661..4771216e7e 100644 --- a/integration/shared/global/running_environment_variable_group_command_test.go +++ b/integration/shared/global/running_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 4c156f8560..b55041d517 100644 --- a/integration/shared/global/staging_environment_variable_group_command_test.go +++ b/integration/shared/global/staging_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 cd2a3c976d..62b18f7f93 100644 --- a/integration/shared/isolated/apps_command_test.go +++ b/integration/shared/isolated/apps_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/config_test.go b/integration/shared/isolated/config_test.go index 4dfbf3d917..8b8b1e2ee4 100644 --- a/integration/shared/isolated/config_test.go +++ b/integration/shared/isolated/config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - helpers "code.cloudfoundry.org/cli/v8/integration/helpers" + helpers "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/error_handling_test.go b/integration/shared/isolated/error_handling_test.go index 64e39faf43..56979f590a 100644 --- a/integration/shared/isolated/error_handling_test.go +++ b/integration/shared/isolated/error_handling_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/internationalization_test.go b/integration/shared/isolated/internationalization_test.go index 4aea8f32cc..53ef9ed929 100644 --- a/integration/shared/isolated/internationalization_test.go +++ b/integration/shared/isolated/internationalization_test.go @@ -1,7 +1,7 @@ package isolated import ( - helpers "code.cloudfoundry.org/cli/v8/integration/helpers" + helpers "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/isolated_suite_test.go b/integration/shared/isolated/isolated_suite_test.go index f60a885055..5ff88c40ef 100644 --- a/integration/shared/isolated/isolated_suite_test.go +++ b/integration/shared/isolated/isolated_suite_test.go @@ -3,7 +3,7 @@ package isolated import ( "testing" - "code.cloudfoundry.org/cli/v8/integration/helpers/commonisolated" + "code.cloudfoundry.org/cli/v9/integration/helpers/commonisolated" ) var ( diff --git a/integration/shared/isolated/logs_command_test.go b/integration/shared/isolated/logs_command_test.go index 7139e9706d..316ec9b3e1 100644 --- a/integration/shared/isolated/logs_command_test.go +++ b/integration/shared/isolated/logs_command_test.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/restart_app_instance_command_test.go b/integration/shared/isolated/restart_app_instance_command_test.go index 5b6d275b3d..e9d117d4e2 100644 --- a/integration/shared/isolated/restart_app_instance_command_test.go +++ b/integration/shared/isolated/restart_app_instance_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/spaces_command_test.go b/integration/shared/isolated/spaces_command_test.go index 9b932b1b27..823a22197c 100644 --- a/integration/shared/isolated/spaces_command_test.go +++ b/integration/shared/isolated/spaces_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/version_command_test.go b/integration/shared/isolated/version_command_test.go index 2f51b3961d..6e302f0726 100644 --- a/integration/shared/isolated/version_command_test.go +++ b/integration/shared/isolated/version_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "strings" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" "github.com/blang/semver/v4" . "github.com/onsi/ginkgo/v2" diff --git a/integration/shared/performance/performance_suite_test.go b/integration/shared/performance/performance_suite_test.go index 86070962f1..858589535d 100644 --- a/integration/shared/performance/performance_suite_test.go +++ b/integration/shared/performance/performance_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 c3275aeeb7..941c7eab7b 100644 --- a/integration/shared/plugin/add_plugin_repo_test.go +++ b/integration/shared/plugin/add_plugin_repo_test.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/api_test.go b/integration/shared/plugin/api_test.go index 09e86d1c52..2a6d9751d4 100644 --- a/integration/shared/plugin/api_test.go +++ b/integration/shared/plugin/api_test.go @@ -3,9 +3,9 @@ package plugin import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/help_test.go b/integration/shared/plugin/help_test.go index 783c2fe017..35e64f5f72 100644 --- a/integration/shared/plugin/help_test.go +++ b/integration/shared/plugin/help_test.go @@ -1,7 +1,7 @@ package plugin import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/install_plugin_command_test.go b/integration/shared/plugin/install_plugin_command_test.go index 1a14289b42..8b9268d1e5 100644 --- a/integration/shared/plugin/install_plugin_command_test.go +++ b/integration/shared/plugin/install_plugin_command_test.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -253,7 +253,7 @@ var _ = Describe("install-plugin command", func() { When("the file is not a plugin", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/non_plugin") + pluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/non_plugin") Expect(err).ToNot(HaveOccurred()) }) @@ -268,7 +268,7 @@ var _ = Describe("install-plugin command", func() { When("getting metadata from the plugin errors", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/test_plugin_fails_metadata") + pluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/test_plugin_fails_metadata") Expect(err).ToNot(HaveOccurred()) }) @@ -767,7 +767,7 @@ var _ = Describe("install-plugin command", func() { When("the file is not a plugin", func() { BeforeEach(func() { var err error - pluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/non_plugin") + pluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/non_plugin") Expect(err).ToNot(HaveOccurred()) pluginData, err := os.ReadFile(pluginPath) diff --git a/integration/shared/plugin/install_plugin_command_unix_test.go b/integration/shared/plugin/install_plugin_command_unix_test.go index b324a3cdc7..e1a8249091 100644 --- a/integration/shared/plugin/install_plugin_command_unix_test.go +++ b/integration/shared/plugin/install_plugin_command_unix_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 7d41fd58f0..56c35924ce 100644 --- a/integration/shared/plugin/install_plugin_from_repo_command_test.go +++ b/integration/shared/plugin/install_plugin_from_repo_command_test.go @@ -4,8 +4,8 @@ import ( "net/http" "runtime" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/logs_test.go b/integration/shared/plugin/logs_test.go index 85eaaae160..b943b8a83c 100644 --- a/integration/shared/plugin/logs_test.go +++ b/integration/shared/plugin/logs_test.go @@ -1,7 +1,7 @@ package plugin import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/plugin_suite_test.go b/integration/shared/plugin/plugin_suite_test.go index 9899a4a8a5..0a2f928dfd 100644 --- a/integration/shared/plugin/plugin_suite_test.go +++ b/integration/shared/plugin/plugin_suite_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -44,13 +44,13 @@ var _ = SynchronizedBeforeSuite(func() []byte { helpers.TurnOffColors() var err error - testPluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/test_plugin") + testPluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/test_plugin") Expect(err).ToNot(HaveOccurred()) - overrideTestPluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/test_plugin_with_command_overrides") + overrideTestPluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/test_plugin_with_command_overrides") Expect(err).ToNot(HaveOccurred()) - panicTestPluginPath, err = Build("code.cloudfoundry.org/cli/v8/integration/assets/test_plugin_with_panic") + panicTestPluginPath, err = Build("code.cloudfoundry.org/cli/v9/integration/assets/test_plugin_with_panic") Expect(err).ToNot(HaveOccurred()) }) diff --git a/integration/shared/plugin/plugins_command_test.go b/integration/shared/plugin/plugins_command_test.go index 06842649b8..ca9d63a281 100644 --- a/integration/shared/plugin/plugins_command_test.go +++ b/integration/shared/plugin/plugins_command_test.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/runner_test.go b/integration/shared/plugin/runner_test.go index 3062c5f595..1cb0a9f9d0 100644 --- a/integration/shared/plugin/runner_test.go +++ b/integration/shared/plugin/runner_test.go @@ -3,7 +3,7 @@ package plugin import ( "os" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/uninstall_plugin_command_test.go b/integration/shared/plugin/uninstall_plugin_command_test.go index a076ab3f14..8d4889aeda 100644 --- a/integration/shared/plugin/uninstall_plugin_command_test.go +++ b/integration/shared/plugin/uninstall_plugin_command_test.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/plugin/uninstall_plugin_command_unix_test.go b/integration/shared/plugin/uninstall_plugin_command_unix_test.go index 4637713dc7..da24e81319 100644 --- a/integration/shared/plugin/uninstall_plugin_command_unix_test.go +++ b/integration/shared/plugin/uninstall_plugin_command_unix_test.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 fee39e81b6..6f50f58812 100644 --- a/integration/v7/global/bind_running_security_group_command_test.go +++ b/integration/v7/global/bind_running_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/bind_security_group_command_test.go b/integration/v7/global/bind_security_group_command_test.go index cac63d0ad9..56d9e0e35f 100644 --- a/integration/v7/global/bind_security_group_command_test.go +++ b/integration/v7/global/bind_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 aaace6d40f..f8e5e2aaf3 100644 --- a/integration/v7/global/bind_staging_security_group_command_test.go +++ b/integration/v7/global/bind_staging_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/create_buildpack_command_test.go b/integration/v7/global/create_buildpack_command_test.go index e992866b9a..de37a4cbeb 100644 --- a/integration/v7/global/create_buildpack_command_test.go +++ b/integration/v7/global/create_buildpack_command_test.go @@ -7,7 +7,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/create_security_group_command_test.go b/integration/v7/global/create_security_group_command_test.go index 6c314202fb..544f6880cb 100644 --- a/integration/v7/global/create_security_group_command_test.go +++ b/integration/v7/global/create_security_group_command_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/delete_buildpack_command_test.go b/integration/v7/global/delete_buildpack_command_test.go index c085e8479d..9df0330d6e 100644 --- a/integration/v7/global/delete_buildpack_command_test.go +++ b/integration/v7/global/delete_buildpack_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/disable_feature_flag_command_test.go b/integration/v7/global/disable_feature_flag_command_test.go index dce622f1cb..c25a386a27 100644 --- a/integration/v7/global/disable_feature_flag_command_test.go +++ b/integration/v7/global/disable_feature_flag_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/enable_feature_flag_command_test.go b/integration/v7/global/enable_feature_flag_command_test.go index e9a4f94b54..ceef6de406 100644 --- a/integration/v7/global/enable_feature_flag_command_test.go +++ b/integration/v7/global/enable_feature_flag_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/env_command_test.go b/integration/v7/global/env_command_test.go index 2dd17e1946..b41c55f043 100644 --- a/integration/v7/global/env_command_test.go +++ b/integration/v7/global/env_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/global_suite_test.go b/integration/v7/global/global_suite_test.go index f5d0b38b1a..e935a06e15 100644 --- a/integration/v7/global/global_suite_test.go +++ b/integration/v7/global/global_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/global/org_quota_command_test.go b/integration/v7/global/org_quota_command_test.go index 8886b56cca..74b2c8915e 100644 --- a/integration/v7/global/org_quota_command_test.go +++ b/integration/v7/global/org_quota_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/org_quotas_command_test.go b/integration/v7/global/org_quotas_command_test.go index c6aab764af..c3c7097a6c 100644 --- a/integration/v7/global/org_quotas_command_test.go +++ b/integration/v7/global/org_quotas_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 958b713f1b..df26161417 100644 --- a/integration/v7/global/running_environment_variable_group_command_test.go +++ b/integration/v7/global/running_environment_variable_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/running_security_groups_command_test.go b/integration/v7/global/running_security_groups_command_test.go index b916617ca2..0a8a8d2c00 100644 --- a/integration/v7/global/running_security_groups_command_test.go +++ b/integration/v7/global/running_security_groups_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/security_group_command_test.go b/integration/v7/global/security_group_command_test.go index 64b831f4c4..11482dbcfd 100644 --- a/integration/v7/global/security_group_command_test.go +++ b/integration/v7/global/security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/set_org_role_command_test.go b/integration/v7/global/set_org_role_command_test.go index 353dc3445c..f58328a962 100644 --- a/integration/v7/global/set_org_role_command_test.go +++ b/integration/v7/global/set_org_role_command_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" ) var _ = Describe("set-org-role command", func() { 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 a1cbc8fa9b..f4a4ebd09b 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 @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/set_space_role_command_test.go b/integration/v7/global/set_space_role_command_test.go index e4a020b4da..428aef465a 100644 --- a/integration/v7/global/set_space_role_command_test.go +++ b/integration/v7/global/set_space_role_command_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" ) var _ = Describe("set-space-role command", func() { 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 a83b028347..7174e88b13 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 @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 a503c847e0..d73db66695 100644 --- a/integration/v7/global/staging_environment_variable_group_command_test.go +++ b/integration/v7/global/staging_environment_variable_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/staging_security_groups_command_test.go b/integration/v7/global/staging_security_groups_command_test.go index 82edb5288e..cddabcfbfe 100644 --- a/integration/v7/global/staging_security_groups_command_test.go +++ b/integration/v7/global/staging_security_groups_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 359d2b69df..f9b76b6935 100644 --- a/integration/v7/global/unbind_running_security_group_command_test.go +++ b/integration/v7/global/unbind_running_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/unbind_security_group_command_test.go b/integration/v7/global/unbind_security_group_command_test.go index bb002c43b7..5a1cc5a097 100644 --- a/integration/v7/global/unbind_security_group_command_test.go +++ b/integration/v7/global/unbind_security_group_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 dc7262e851..94e6b62d8f 100644 --- a/integration/v7/global/unbind_staging_security_group_command_test.go +++ b/integration/v7/global/unbind_staging_security_group_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/update_buildpack_command_test.go b/integration/v7/global/update_buildpack_command_test.go index a394764bfa..9eb212bfb2 100644 --- a/integration/v7/global/update_buildpack_command_test.go +++ b/integration/v7/global/update_buildpack_command_test.go @@ -7,7 +7,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/update_security_group_command_test.go b/integration/v7/global/update_security_group_command_test.go index e3fef97558..94d9305d44 100644 --- a/integration/v7/global/update_security_group_command_test.go +++ b/integration/v7/global/update_security_group_command_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/add_network_policy_command_test.go b/integration/v7/isolated/add_network_policy_command_test.go index 9e4148d32e..a37118c2b8 100644 --- a/integration/v7/isolated/add_network_policy_command_test.go +++ b/integration/v7/isolated/add_network_policy_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/allow_space_ssh_command_test.go b/integration/v7/isolated/allow_space_ssh_command_test.go index ac74ed37a6..fdcd075cf4 100644 --- a/integration/v7/isolated/allow_space_ssh_command_test.go +++ b/integration/v7/isolated/allow_space_ssh_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/api_command_test.go b/integration/v7/isolated/api_command_test.go index a70844659b..552371b34a 100644 --- a/integration/v7/isolated/api_command_test.go +++ b/integration/v7/isolated/api_command_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/app_command_test.go b/integration/v7/isolated/app_command_test.go index 5b0fcb8f0d..0ea78923f6 100644 --- a/integration/v7/isolated/app_command_test.go +++ b/integration/v7/isolated/app_command_test.go @@ -6,8 +6,8 @@ import ( "path" "path/filepath" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/apply_manifest_command_test.go b/integration/v7/isolated/apply_manifest_command_test.go index b04974d0e0..68aa7297c7 100644 --- a/integration/v7/isolated/apply_manifest_command_test.go +++ b/integration/v7/isolated/apply_manifest_command_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/apps_command_test.go b/integration/v7/isolated/apps_command_test.go index cfe9f822dd..8032678b0a 100644 --- a/integration/v7/isolated/apps_command_test.go +++ b/integration/v7/isolated/apps_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/auth_command_test.go b/integration/v7/isolated/auth_command_test.go index 3dc04b0219..57e1955a14 100644 --- a/integration/v7/isolated/auth_command_test.go +++ b/integration/v7/isolated/auth_command_test.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/bind_route_service_command_test.go b/integration/v7/isolated/bind_route_service_command_test.go index ae1f5c44db..359b21815f 100644 --- a/integration/v7/isolated/bind_route_service_command_test.go +++ b/integration/v7/isolated/bind_route_service_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/bind_service_command_test.go b/integration/v7/isolated/bind_service_command_test.go index 304367f515..c9062090a1 100644 --- a/integration/v7/isolated/bind_service_command_test.go +++ b/integration/v7/isolated/bind_service_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/buildpacks_command_test.go b/integration/v7/isolated/buildpacks_command_test.go index fb66bf351b..00822e67ce 100644 --- a/integration/v7/isolated/buildpacks_command_test.go +++ b/integration/v7/isolated/buildpacks_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/cancel_deployment_test.go b/integration/v7/isolated/cancel_deployment_test.go index 5c342bd0ba..f49814d913 100644 --- a/integration/v7/isolated/cancel_deployment_test.go +++ b/integration/v7/isolated/cancel_deployment_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/check_route_command_test.go b/integration/v7/isolated/check_route_command_test.go index 4be8811751..a77ceaf2cf 100644 --- a/integration/v7/isolated/check_route_command_test.go +++ b/integration/v7/isolated/check_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/config_command_test.go b/integration/v7/isolated/config_command_test.go index b69979e9eb..7ac858e29e 100644 --- a/integration/v7/isolated/config_command_test.go +++ b/integration/v7/isolated/config_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "strings" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/config_test.go b/integration/v7/isolated/config_test.go index 357cb6edad..548086cfc8 100644 --- a/integration/v7/isolated/config_test.go +++ b/integration/v7/isolated/config_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/isolated/continue_deployment_test.go b/integration/v7/isolated/continue_deployment_test.go index 3f7e54b608..6503fca4e3 100644 --- a/integration/v7/isolated/continue_deployment_test.go +++ b/integration/v7/isolated/continue_deployment_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" . "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 937f4a53cf..8cdc2eb0ee 100644 --- a/integration/v7/isolated/copy_source_command_test.go +++ b/integration/v7/isolated/copy_source_command_test.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_app_command_test.go b/integration/v7/isolated/create_app_command_test.go index 25bcbbed85..c7bb75a31e 100644 --- a/integration/v7/isolated/create_app_command_test.go +++ b/integration/v7/isolated/create_app_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_app_manifest_command_test.go b/integration/v7/isolated/create_app_manifest_command_test.go index c6ed633cea..205cea7a65 100644 --- a/integration/v7/isolated/create_app_manifest_command_test.go +++ b/integration/v7/isolated/create_app_manifest_command_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_isolation_segment_command_test.go b/integration/v7/isolated/create_isolation_segment_command_test.go index c9daa22270..9595db4af1 100644 --- a/integration/v7/isolated/create_isolation_segment_command_test.go +++ b/integration/v7/isolated/create_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_org_command_test.go b/integration/v7/isolated/create_org_command_test.go index fb7f999068..af66b30285 100644 --- a/integration/v7/isolated/create_org_command_test.go +++ b/integration/v7/isolated/create_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_org_quota_command_test.go b/integration/v7/isolated/create_org_quota_command_test.go index f39d9adede..9c0baea347 100644 --- a/integration/v7/isolated/create_org_quota_command_test.go +++ b/integration/v7/isolated/create_org_quota_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_package_cfignore_test.go b/integration/v7/isolated/create_package_cfignore_test.go index 342af75b3d..97db93dd0c 100644 --- a/integration/v7/isolated/create_package_cfignore_test.go +++ b/integration/v7/isolated/create_package_cfignore_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 8344d40d25..60c4c33912 100644 --- a/integration/v7/isolated/create_package_command_test.go +++ b/integration/v7/isolated/create_package_command_test.go @@ -4,9 +4,9 @@ import ( "os" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_private_domain_test.go b/integration/v7/isolated/create_private_domain_test.go index cfbbf41130..69f62dbf89 100644 --- a/integration/v7/isolated/create_private_domain_test.go +++ b/integration/v7/isolated/create_private_domain_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_route_command_test.go b/integration/v7/isolated/create_route_command_test.go index 64ddc35540..0e4b1ec579 100644 --- a/integration/v7/isolated/create_route_command_test.go +++ b/integration/v7/isolated/create_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_broker_command_test.go b/integration/v7/isolated/create_service_broker_command_test.go index f50f799402..ff288566ce 100644 --- a/integration/v7/isolated/create_service_broker_command_test.go +++ b/integration/v7/isolated/create_service_broker_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "io" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_command_test.go b/integration/v7/isolated/create_service_command_test.go index 5fa3810f27..a8a3b216f6 100644 --- a/integration/v7/isolated/create_service_command_test.go +++ b/integration/v7/isolated/create_service_command_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_service_key_command_test.go b/integration/v7/isolated/create_service_key_command_test.go index 14ce9453d4..02eace10b3 100644 --- a/integration/v7/isolated/create_service_key_command_test.go +++ b/integration/v7/isolated/create_service_key_command_test.go @@ -4,9 +4,9 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_shared_domain_test.go b/integration/v7/isolated/create_shared_domain_test.go index 3716a355d7..d118ad4a63 100644 --- a/integration/v7/isolated/create_shared_domain_test.go +++ b/integration/v7/isolated/create_shared_domain_test.go @@ -4,8 +4,8 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_space_command_test.go b/integration/v7/isolated/create_space_command_test.go index ad8ffcf234..40ffa796bc 100644 --- a/integration/v7/isolated/create_space_command_test.go +++ b/integration/v7/isolated/create_space_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_space_quota_command_test.go b/integration/v7/isolated/create_space_quota_command_test.go index 9ba3f40fca..e81832ba69 100644 --- a/integration/v7/isolated/create_space_quota_command_test.go +++ b/integration/v7/isolated/create_space_quota_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/create_user_command_test.go b/integration/v7/isolated/create_user_command_test.go index 405de9ac3a..2f8cba570a 100644 --- a/integration/v7/isolated/create_user_command_test.go +++ b/integration/v7/isolated/create_user_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/create_user_provided_service_command_test.go b/integration/v7/isolated/create_user_provided_service_command_test.go index 0775f7f825..4f056ab2b5 100644 --- a/integration/v7/isolated/create_user_provided_service_command_test.go +++ b/integration/v7/isolated/create_user_provided_service_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "os" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/curl_command_test.go b/integration/v7/isolated/curl_command_test.go index 71dc3102c7..bb8f1fc8ed 100644 --- a/integration/v7/isolated/curl_command_test.go +++ b/integration/v7/isolated/curl_command_test.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_command_test.go b/integration/v7/isolated/delete_command_test.go index 52189edd10..8b7cbd9afe 100644 --- a/integration/v7/isolated/delete_command_test.go +++ b/integration/v7/isolated/delete_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_isolation_segment_command_test.go b/integration/v7/isolated/delete_isolation_segment_command_test.go index d5e3616115..b0b97c2e42 100644 --- a/integration/v7/isolated/delete_isolation_segment_command_test.go +++ b/integration/v7/isolated/delete_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_org_command_test.go b/integration/v7/isolated/delete_org_command_test.go index 794fd1f192..8df411c789 100644 --- a/integration/v7/isolated/delete_org_command_test.go +++ b/integration/v7/isolated/delete_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_org_quota_command_test.go b/integration/v7/isolated/delete_org_quota_command_test.go index 9303042738..97d1b6fca1 100644 --- a/integration/v7/isolated/delete_org_quota_command_test.go +++ b/integration/v7/isolated/delete_org_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_orphaned_routes_command_test.go b/integration/v7/isolated/delete_orphaned_routes_command_test.go index 68f14b5739..c3fba868ab 100644 --- a/integration/v7/isolated/delete_orphaned_routes_command_test.go +++ b/integration/v7/isolated/delete_orphaned_routes_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_private_domain_command_test.go b/integration/v7/isolated/delete_private_domain_command_test.go index e3a274dbfb..c7c7afce7f 100644 --- a/integration/v7/isolated/delete_private_domain_command_test.go +++ b/integration/v7/isolated/delete_private_domain_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_route_command_test.go b/integration/v7/isolated/delete_route_command_test.go index 151efc80ac..17c51fd3c9 100644 --- a/integration/v7/isolated/delete_route_command_test.go +++ b/integration/v7/isolated/delete_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_security_group_command_test.go b/integration/v7/isolated/delete_security_group_command_test.go index 2356fbcf56..f3876e375d 100644 --- a/integration/v7/isolated/delete_security_group_command_test.go +++ b/integration/v7/isolated/delete_security_group_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_broker_command_test.go b/integration/v7/isolated/delete_service_broker_command_test.go index 550fb08f84..c8b9070e7f 100644 --- a/integration/v7/isolated/delete_service_broker_command_test.go +++ b/integration/v7/isolated/delete_service_broker_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_command_test.go b/integration/v7/isolated/delete_service_command_test.go index 3a9b0d7221..17d1c02c7d 100644 --- a/integration/v7/isolated/delete_service_command_test.go +++ b/integration/v7/isolated/delete_service_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_service_key_command_test.go b/integration/v7/isolated/delete_service_key_command_test.go index dc33e368bf..ed0ab42394 100644 --- a/integration/v7/isolated/delete_service_key_command_test.go +++ b/integration/v7/isolated/delete_service_key_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_shared_domain_command_test.go b/integration/v7/isolated/delete_shared_domain_command_test.go index e87b6c0ba8..ef760b9c95 100644 --- a/integration/v7/isolated/delete_shared_domain_command_test.go +++ b/integration/v7/isolated/delete_shared_domain_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_space_command_test.go b/integration/v7/isolated/delete_space_command_test.go index bc802432bf..0194bddafd 100644 --- a/integration/v7/isolated/delete_space_command_test.go +++ b/integration/v7/isolated/delete_space_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_space_quota_command_test.go b/integration/v7/isolated/delete_space_quota_command_test.go index 3eed3ed7d4..99da198eea 100644 --- a/integration/v7/isolated/delete_space_quota_command_test.go +++ b/integration/v7/isolated/delete_space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/delete_user_command_test.go b/integration/v7/isolated/delete_user_command_test.go index 09681834dc..73ab73abe7 100644 --- a/integration/v7/isolated/delete_user_command_test.go +++ b/integration/v7/isolated/delete_user_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_org_isolation_command_test.go b/integration/v7/isolated/disable_org_isolation_command_test.go index 2caf3aaf18..7b777affce 100644 --- a/integration/v7/isolated/disable_org_isolation_command_test.go +++ b/integration/v7/isolated/disable_org_isolation_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_service_access_command_test.go b/integration/v7/isolated/disable_service_access_command_test.go index 949648e628..422e418e08 100644 --- a/integration/v7/isolated/disable_service_access_command_test.go +++ b/integration/v7/isolated/disable_service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disable_ssh_command_test.go b/integration/v7/isolated/disable_ssh_command_test.go index b15c334af8..89d213f92b 100644 --- a/integration/v7/isolated/disable_ssh_command_test.go +++ b/integration/v7/isolated/disable_ssh_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/disallow_space_ssh_command_test.go b/integration/v7/isolated/disallow_space_ssh_command_test.go index 27e35b5030..1d0a56d708 100644 --- a/integration/v7/isolated/disallow_space_ssh_command_test.go +++ b/integration/v7/isolated/disallow_space_ssh_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/domains_command_test.go b/integration/v7/isolated/domains_command_test.go index b00ba1b20c..b8f8d94af2 100644 --- a/integration/v7/isolated/domains_command_test.go +++ b/integration/v7/isolated/domains_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/download_droplet_command_test.go b/integration/v7/isolated/download_droplet_command_test.go index 80e5d322fd..ed4b4e11fd 100644 --- a/integration/v7/isolated/download_droplet_command_test.go +++ b/integration/v7/isolated/download_droplet_command_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/droplets_command_test.go b/integration/v7/isolated/droplets_command_test.go index 6fb879ee56..60b1a68136 100644 --- a/integration/v7/isolated/droplets_command_test.go +++ b/integration/v7/isolated/droplets_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_org_isolation_command_test.go b/integration/v7/isolated/enable_org_isolation_command_test.go index d5073490b3..b4f0bfd3f6 100644 --- a/integration/v7/isolated/enable_org_isolation_command_test.go +++ b/integration/v7/isolated/enable_org_isolation_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_service_access_command_test.go b/integration/v7/isolated/enable_service_access_command_test.go index f0aa4a6ce6..38a988d0ef 100644 --- a/integration/v7/isolated/enable_service_access_command_test.go +++ b/integration/v7/isolated/enable_service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/enable_ssh_command_test.go b/integration/v7/isolated/enable_ssh_command_test.go index 4e44c8fba5..b88658a97f 100644 --- a/integration/v7/isolated/enable_ssh_command_test.go +++ b/integration/v7/isolated/enable_ssh_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/error_on_extra_arguments_test.go b/integration/v7/isolated/error_on_extra_arguments_test.go index 84cb4e44c0..984bfbbec2 100644 --- a/integration/v7/isolated/error_on_extra_arguments_test.go +++ b/integration/v7/isolated/error_on_extra_arguments_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/events_command_test.go b/integration/v7/isolated/events_command_test.go index 90b3a72691..ef718acb82 100644 --- a/integration/v7/isolated/events_command_test.go +++ b/integration/v7/isolated/events_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/feature_flag_command_test.go b/integration/v7/isolated/feature_flag_command_test.go index 10a42dab0c..e1bc1c7326 100644 --- a/integration/v7/isolated/feature_flag_command_test.go +++ b/integration/v7/isolated/feature_flag_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/feature_flags_command_test.go b/integration/v7/isolated/feature_flags_command_test.go index ea599be811..d62c8380e4 100644 --- a/integration/v7/isolated/feature_flags_command_test.go +++ b/integration/v7/isolated/feature_flags_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/get_health_check_command_test.go b/integration/v7/isolated/get_health_check_command_test.go index ab834cae20..7db02d1c20 100644 --- a/integration/v7/isolated/get_health_check_command_test.go +++ b/integration/v7/isolated/get_health_check_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/help_command_test.go b/integration/v7/isolated/help_command_test.go index 52dd5752e4..c80b9f1abf 100644 --- a/integration/v7/isolated/help_command_test.go +++ b/integration/v7/isolated/help_command_test.go @@ -4,8 +4,8 @@ import ( "os/exec" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/isolated_suite_test.go b/integration/v7/isolated/isolated_suite_test.go index caac57a4da..aaa413d683 100644 --- a/integration/v7/isolated/isolated_suite_test.go +++ b/integration/v7/isolated/isolated_suite_test.go @@ -3,7 +3,7 @@ package isolated import ( "testing" - "code.cloudfoundry.org/cli/v8/integration/helpers/commonisolated" + "code.cloudfoundry.org/cli/v9/integration/helpers/commonisolated" ) const ( diff --git a/integration/v7/isolated/isolation_segments_command_test.go b/integration/v7/isolated/isolation_segments_command_test.go index 3b9765546d..e75a3573e2 100644 --- a/integration/v7/isolated/isolation_segments_command_test.go +++ b/integration/v7/isolated/isolation_segments_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/labels_command_test.go b/integration/v7/isolated/labels_command_test.go index 0fd5af3484..4adf09e4ba 100644 --- a/integration/v7/isolated/labels_command_test.go +++ b/integration/v7/isolated/labels_command_test.go @@ -4,10 +4,10 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/login_command_test.go b/integration/v7/isolated/login_command_test.go index fb4490ca18..51190f389f 100644 --- a/integration/v7/isolated/login_command_test.go +++ b/integration/v7/isolated/login_command_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/logout_command_test.go b/integration/v7/isolated/logout_command_test.go index 45709ccf38..2c2ec01a94 100644 --- a/integration/v7/isolated/logout_command_test.go +++ b/integration/v7/isolated/logout_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/logs_command_test.go b/integration/v7/isolated/logs_command_test.go index 6331e89fa0..dab0d91dd5 100644 --- a/integration/v7/isolated/logs_command_test.go +++ b/integration/v7/isolated/logs_command_test.go @@ -6,9 +6,9 @@ import ( "os/exec" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/map_route_command_test.go b/integration/v7/isolated/map_route_command_test.go index 61b1df6ede..a7882a7dcf 100644 --- a/integration/v7/isolated/map_route_command_test.go +++ b/integration/v7/isolated/map_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/marketplace_command_test.go b/integration/v7/isolated/marketplace_command_test.go index 4411a450f5..00725df8d5 100644 --- a/integration/v7/isolated/marketplace_command_test.go +++ b/integration/v7/isolated/marketplace_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/move_route_command_test.go b/integration/v7/isolated/move_route_command_test.go index bb7e7fa0fc..bf83e96925 100644 --- a/integration/v7/isolated/move_route_command_test.go +++ b/integration/v7/isolated/move_route_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/network_policies_command_test.go b/integration/v7/isolated/network_policies_command_test.go index 3d8c66f944..3c6b6fe355 100644 --- a/integration/v7/isolated/network_policies_command_test.go +++ b/integration/v7/isolated/network_policies_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/oauth_client_test.go b/integration/v7/isolated/oauth_client_test.go index 171fbca9a5..8e03de5d21 100644 --- a/integration/v7/isolated/oauth_client_test.go +++ b/integration/v7/isolated/oauth_client_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/oauth_token_command_test.go b/integration/v7/isolated/oauth_token_command_test.go index 705ec53cbe..4a3d3e2b98 100644 --- a/integration/v7/isolated/oauth_token_command_test.go +++ b/integration/v7/isolated/oauth_token_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/org_command_test.go b/integration/v7/isolated/org_command_test.go index e4e3eeda04..4bbd1dd9fd 100644 --- a/integration/v7/isolated/org_command_test.go +++ b/integration/v7/isolated/org_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "sort" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/org_users_command_test.go b/integration/v7/isolated/org_users_command_test.go index 031fc9285e..7df37dcb8a 100644 --- a/integration/v7/isolated/org_users_command_test.go +++ b/integration/v7/isolated/org_users_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/orgs_command_test.go b/integration/v7/isolated/orgs_command_test.go index d5a4039f0b..7380c7a9a4 100644 --- a/integration/v7/isolated/orgs_command_test.go +++ b/integration/v7/isolated/orgs_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/packages_command_test.go b/integration/v7/isolated/packages_command_test.go index f3ddd3e11f..55c264e8ca 100644 --- a/integration/v7/isolated/packages_command_test.go +++ b/integration/v7/isolated/packages_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/passwd_command_test.go b/integration/v7/isolated/passwd_command_test.go index 5d654d6a82..eb9db7c997 100644 --- a/integration/v7/isolated/passwd_command_test.go +++ b/integration/v7/isolated/passwd_command_test.go @@ -5,8 +5,8 @@ import ( "io" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/proxy_connection_test.go b/integration/v7/isolated/proxy_connection_test.go index 073775f02a..df25cb3670 100644 --- a/integration/v7/isolated/proxy_connection_test.go +++ b/integration/v7/isolated/proxy_connection_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/purge_service_instance_command_test.go b/integration/v7/isolated/purge_service_instance_command_test.go index f1b6b3ab21..fb78fec6b9 100644 --- a/integration/v7/isolated/purge_service_instance_command_test.go +++ b/integration/v7/isolated/purge_service_instance_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/purge_service_offering_command_test.go b/integration/v7/isolated/purge_service_offering_command_test.go index 47124b6364..227b8a3cc9 100644 --- a/integration/v7/isolated/purge_service_offering_command_test.go +++ b/integration/v7/isolated/purge_service_offering_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/remove_network_policy_command_test.go b/integration/v7/isolated/remove_network_policy_command_test.go index 92891d65b7..fd4fc35979 100644 --- a/integration/v7/isolated/remove_network_policy_command_test.go +++ b/integration/v7/isolated/remove_network_policy_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_command_test.go b/integration/v7/isolated/rename_command_test.go index 2a2b8f9746..c2ec53e1c9 100644 --- a/integration/v7/isolated/rename_command_test.go +++ b/integration/v7/isolated/rename_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_org_command_test.go b/integration/v7/isolated/rename_org_command_test.go index 342ff13d92..e440ca3457 100644 --- a/integration/v7/isolated/rename_org_command_test.go +++ b/integration/v7/isolated/rename_org_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_service_broker_command_test.go b/integration/v7/isolated/rename_service_broker_command_test.go index 05db1856ca..006418abd7 100644 --- a/integration/v7/isolated/rename_service_broker_command_test.go +++ b/integration/v7/isolated/rename_service_broker_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_service_command_test.go b/integration/v7/isolated/rename_service_command_test.go index dc26857e0a..9bcb0f6fa9 100644 --- a/integration/v7/isolated/rename_service_command_test.go +++ b/integration/v7/isolated/rename_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rename_space_command_test.go b/integration/v7/isolated/rename_space_command_test.go index fc082895c6..a8f1ce582a 100644 --- a/integration/v7/isolated/rename_space_command_test.go +++ b/integration/v7/isolated/rename_space_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 33bde2dc53..31548f3dcb 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 @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/reset_space_isolation_segment_test.go b/integration/v7/isolated/reset_space_isolation_segment_test.go index 3ecaaef669..ed6b862287 100644 --- a/integration/v7/isolated/reset_space_isolation_segment_test.go +++ b/integration/v7/isolated/reset_space_isolation_segment_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/restage_command_test.go b/integration/v7/isolated/restage_command_test.go index 41f5080e7b..03bbf59438 100644 --- a/integration/v7/isolated/restage_command_test.go +++ b/integration/v7/isolated/restage_command_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/restart_app_instance_command_test.go b/integration/v7/isolated/restart_app_instance_command_test.go index aefdffdc9c..38f7eb2e9e 100644 --- a/integration/v7/isolated/restart_app_instance_command_test.go +++ b/integration/v7/isolated/restart_app_instance_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/restart_command_test.go b/integration/v7/isolated/restart_command_test.go index 3cfb0e8335..32d6e6a0eb 100644 --- a/integration/v7/isolated/restart_command_test.go +++ b/integration/v7/isolated/restart_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/revision_command_test.go b/integration/v7/isolated/revision_command_test.go index 2da4188233..3cc23a1cf6 100644 --- a/integration/v7/isolated/revision_command_test.go +++ b/integration/v7/isolated/revision_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/revisions_command_test.go b/integration/v7/isolated/revisions_command_test.go index 5c4d5cfd18..403869c51b 100644 --- a/integration/v7/isolated/revisions_command_test.go +++ b/integration/v7/isolated/revisions_command_test.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/rollback_command_test.go b/integration/v7/isolated/rollback_command_test.go index d9d18850d0..9a26ed4f74 100644 --- a/integration/v7/isolated/rollback_command_test.go +++ b/integration/v7/isolated/rollback_command_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/route_command_test.go b/integration/v7/isolated/route_command_test.go index a552ca8313..4ed6a55ba0 100644 --- a/integration/v7/isolated/route_command_test.go +++ b/integration/v7/isolated/route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/router_groups_command_test.go b/integration/v7/isolated/router_groups_command_test.go index 28d93036a8..8471e4fd78 100644 --- a/integration/v7/isolated/router_groups_command_test.go +++ b/integration/v7/isolated/router_groups_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/routes_command_test.go b/integration/v7/isolated/routes_command_test.go index f960a92ebb..7c30d78f3f 100644 --- a/integration/v7/isolated/routes_command_test.go +++ b/integration/v7/isolated/routes_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/run_task_command_test.go b/integration/v7/isolated/run_task_command_test.go index 60ad1268ce..f9d8ad19d1 100644 --- a/integration/v7/isolated/run_task_command_test.go +++ b/integration/v7/isolated/run_task_command_test.go @@ -4,8 +4,8 @@ import ( "fmt" "path" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/scale_command_test.go b/integration/v7/isolated/scale_command_test.go index 73d8a68ab2..8715deac58 100644 --- a/integration/v7/isolated/scale_command_test.go +++ b/integration/v7/isolated/scale_command_test.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/security_groups_command_test.go b/integration/v7/isolated/security_groups_command_test.go index 68da0d3e6a..bee8a02bc2 100644 --- a/integration/v7/isolated/security_groups_command_test.go +++ b/integration/v7/isolated/security_groups_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_access_command_test.go b/integration/v7/isolated/service_access_command_test.go index 300153531e..19a27160ae 100644 --- a/integration/v7/isolated/service_access_command_test.go +++ b/integration/v7/isolated/service_access_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_brokers_command_test.go b/integration/v7/isolated/service_brokers_command_test.go index cf6d867eda..5a7a6a3cb0 100644 --- a/integration/v7/isolated/service_brokers_command_test.go +++ b/integration/v7/isolated/service_brokers_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_command_test.go b/integration/v7/isolated/service_command_test.go index 98a0d00342..6bc11c1a6e 100644 --- a/integration/v7/isolated/service_command_test.go +++ b/integration/v7/isolated/service_command_test.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/service_key_command_test.go b/integration/v7/isolated/service_key_command_test.go index e5083ff5f0..0dc87059b6 100644 --- a/integration/v7/isolated/service_key_command_test.go +++ b/integration/v7/isolated/service_key_command_test.go @@ -1,12 +1,12 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/gomega/gexec" . "github.com/onsi/gomega/gbytes" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/isolated/service_keys_command_test.go b/integration/v7/isolated/service_keys_command_test.go index 0d56cbb84b..2b520a4f74 100644 --- a/integration/v7/isolated/service_keys_command_test.go +++ b/integration/v7/isolated/service_keys_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/services_command_test.go b/integration/v7/isolated/services_command_test.go index c6017f9297..44af6c2b8f 100644 --- a/integration/v7/isolated/services_command_test.go +++ b/integration/v7/isolated/services_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_droplet_command_test.go b/integration/v7/isolated/set_droplet_command_test.go index 22067f86ed..1967011420 100644 --- a/integration/v7/isolated/set_droplet_command_test.go +++ b/integration/v7/isolated/set_droplet_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_env_command_test.go b/integration/v7/isolated/set_env_command_test.go index 63ad8c5fc6..ffd3bce40c 100644 --- a/integration/v7/isolated/set_env_command_test.go +++ b/integration/v7/isolated/set_env_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_health_check_command_test.go b/integration/v7/isolated/set_health_check_command_test.go index 111a46b56a..88da54718f 100644 --- a/integration/v7/isolated/set_health_check_command_test.go +++ b/integration/v7/isolated/set_health_check_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_label_command_test.go b/integration/v7/isolated/set_label_command_test.go index 4c96795ac8..623fd782d0 100644 --- a/integration/v7/isolated/set_label_command_test.go +++ b/integration/v7/isolated/set_label_command_test.go @@ -4,10 +4,10 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 1fe0a20d18..2bbe4fa13c 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 @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_org_quota_command_test.go b/integration/v7/isolated/set_org_quota_command_test.go index 7773d871fe..98d3479724 100644 --- a/integration/v7/isolated/set_org_quota_command_test.go +++ b/integration/v7/isolated/set_org_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_org_role_command_test.go b/integration/v7/isolated/set_org_role_command_test.go index b77b7a1c0f..ac64e821f9 100644 --- a/integration/v7/isolated/set_org_role_command_test.go +++ b/integration/v7/isolated/set_org_role_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 f339a3e9a5..56885b7c23 100644 --- a/integration/v7/isolated/set_space_isolation_segment_command_test.go +++ b/integration/v7/isolated/set_space_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_space_quota_command_test.go b/integration/v7/isolated/set_space_quota_command_test.go index e427e3de53..514ead410e 100644 --- a/integration/v7/isolated/set_space_quota_command_test.go +++ b/integration/v7/isolated/set_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/set_space_role_command_test.go b/integration/v7/isolated/set_space_role_command_test.go index b669ef7bf9..9e88603745 100644 --- a/integration/v7/isolated/set_space_role_command_test.go +++ b/integration/v7/isolated/set_space_role_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_private_domain_test.go b/integration/v7/isolated/share_private_domain_test.go index 04739efbf6..c660b0c1c1 100644 --- a/integration/v7/isolated/share_private_domain_test.go +++ b/integration/v7/isolated/share_private_domain_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_route_command_test.go b/integration/v7/isolated/share_route_command_test.go index e815320ecc..51a0191a72 100644 --- a/integration/v7/isolated/share_route_command_test.go +++ b/integration/v7/isolated/share_route_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/share_service_command_test.go b/integration/v7/isolated/share_service_command_test.go index 79412ff26e..98693616ec 100644 --- a/integration/v7/isolated/share_service_command_test.go +++ b/integration/v7/isolated/share_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/space_command_test.go b/integration/v7/isolated/space_command_test.go index 0bcb5cf870..bc9cd85e2e 100644 --- a/integration/v7/isolated/space_command_test.go +++ b/integration/v7/isolated/space_command_test.go @@ -3,10 +3,10 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_quota_command_test.go b/integration/v7/isolated/space_quota_command_test.go index 9dbcccda5b..c1336c668e 100644 --- a/integration/v7/isolated/space_quota_command_test.go +++ b/integration/v7/isolated/space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_quotas_command_test.go b/integration/v7/isolated/space_quotas_command_test.go index 7a9b7b3456..1bee5b4bc0 100644 --- a/integration/v7/isolated/space_quotas_command_test.go +++ b/integration/v7/isolated/space_quotas_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_ssh_allowed_command_test.go b/integration/v7/isolated/space_ssh_allowed_command_test.go index a4b402bfee..e519887432 100644 --- a/integration/v7/isolated/space_ssh_allowed_command_test.go +++ b/integration/v7/isolated/space_ssh_allowed_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_users_command_test.go b/integration/v7/isolated/space_users_command_test.go index 6ffe3f7704..fb1a37ad22 100644 --- a/integration/v7/isolated/space_users_command_test.go +++ b/integration/v7/isolated/space_users_command_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" ) var _ = Describe("space-users command", func() { diff --git a/integration/v7/isolated/spaces_command_test.go b/integration/v7/isolated/spaces_command_test.go index 4a14345ee0..fdbb27b54a 100644 --- a/integration/v7/isolated/spaces_command_test.go +++ b/integration/v7/isolated/spaces_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/ssh_code_command_test.go b/integration/v7/isolated/ssh_code_command_test.go index cbf7397b97..4f6ed4211b 100644 --- a/integration/v7/isolated/ssh_code_command_test.go +++ b/integration/v7/isolated/ssh_code_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/ssh_command_test.go b/integration/v7/isolated/ssh_command_test.go index 0770d107b8..557644a860 100644 --- a/integration/v7/isolated/ssh_command_test.go +++ b/integration/v7/isolated/ssh_command_test.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/ssh_enabled_command_test.go b/integration/v7/isolated/ssh_enabled_command_test.go index 60d74540eb..f3b3ad8be3 100644 --- a/integration/v7/isolated/ssh_enabled_command_test.go +++ b/integration/v7/isolated/ssh_enabled_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stack_command_test.go b/integration/v7/isolated/stack_command_test.go index 8f065a8b64..f394e5dad0 100644 --- a/integration/v7/isolated/stack_command_test.go +++ b/integration/v7/isolated/stack_command_test.go @@ -4,9 +4,9 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stacks_command_test.go b/integration/v7/isolated/stacks_command_test.go index e451c0f40b..2f9467040d 100644 --- a/integration/v7/isolated/stacks_command_test.go +++ b/integration/v7/isolated/stacks_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/stage_package_command_test.go b/integration/v7/isolated/stage_package_command_test.go index 59e86673fe..e2edc18cc6 100644 --- a/integration/v7/isolated/stage_package_command_test.go +++ b/integration/v7/isolated/stage_package_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/start_command_test.go b/integration/v7/isolated/start_command_test.go index 9afd8bd854..ed42395fde 100644 --- a/integration/v7/isolated/start_command_test.go +++ b/integration/v7/isolated/start_command_test.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/stop_command_test.go b/integration/v7/isolated/stop_command_test.go index 534095e88e..fd8955be88 100644 --- a/integration/v7/isolated/stop_command_test.go +++ b/integration/v7/isolated/stop_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/table_alignment_test.go b/integration/v7/isolated/table_alignment_test.go index ff2599f9ac..34cafe4b0c 100644 --- a/integration/v7/isolated/table_alignment_test.go +++ b/integration/v7/isolated/table_alignment_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/target_command_test.go b/integration/v7/isolated/target_command_test.go index 6364407877..fa2b6aaae6 100644 --- a/integration/v7/isolated/target_command_test.go +++ b/integration/v7/isolated/target_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/tasks_command_test.go b/integration/v7/isolated/tasks_command_test.go index 19f13d45ac..129dc75ce0 100644 --- a/integration/v7/isolated/tasks_command_test.go +++ b/integration/v7/isolated/tasks_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/terminate_task_command_test.go b/integration/v7/isolated/terminate_task_command_test.go index f78dce2b36..ff0836db85 100644 --- a/integration/v7/isolated/terminate_task_command_test.go +++ b/integration/v7/isolated/terminate_task_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/token_refresh_test.go b/integration/v7/isolated/token_refresh_test.go index e0fd08ad2c..2ff4e1369f 100644 --- a/integration/v7/isolated/token_refresh_test.go +++ b/integration/v7/isolated/token_refresh_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/unbind_route_service_command_test.go b/integration/v7/isolated/unbind_route_service_command_test.go index 6bb192438c..c6f50952d9 100644 --- a/integration/v7/isolated/unbind_route_service_command_test.go +++ b/integration/v7/isolated/unbind_route_service_command_test.go @@ -4,9 +4,9 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unbind_service_command_test.go b/integration/v7/isolated/unbind_service_command_test.go index 4d6617762a..f8440ded0f 100644 --- a/integration/v7/isolated/unbind_service_command_test.go +++ b/integration/v7/isolated/unbind_service_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/v8/resources" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unmap_route_command_test.go b/integration/v7/isolated/unmap_route_command_test.go index 3f100bf678..4920a81d30 100644 --- a/integration/v7/isolated/unmap_route_command_test.go +++ b/integration/v7/isolated/unmap_route_command_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_env_command_test.go b/integration/v7/isolated/unset_env_command_test.go index 9419e5c0a6..b56a0e0c58 100644 --- a/integration/v7/isolated/unset_env_command_test.go +++ b/integration/v7/isolated/unset_env_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_label_command_test.go b/integration/v7/isolated/unset_label_command_test.go index 696ffb3614..6999188ee8 100644 --- a/integration/v7/isolated/unset_label_command_test.go +++ b/integration/v7/isolated/unset_label_command_test.go @@ -4,9 +4,9 @@ import ( "fmt" "regexp" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_org_role_command_test.go b/integration/v7/isolated/unset_org_role_command_test.go index 22de6551aa..8b5da5edb2 100644 --- a/integration/v7/isolated/unset_org_role_command_test.go +++ b/integration/v7/isolated/unset_org_role_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_space_quota_command_test.go b/integration/v7/isolated/unset_space_quota_command_test.go index 318492f8f9..90f3dbd740 100644 --- a/integration/v7/isolated/unset_space_quota_command_test.go +++ b/integration/v7/isolated/unset_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unset_space_role_command_test.go b/integration/v7/isolated/unset_space_role_command_test.go index 4495014257..0369861154 100644 --- a/integration/v7/isolated/unset_space_role_command_test.go +++ b/integration/v7/isolated/unset_space_role_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_private_domain_test.go b/integration/v7/isolated/unshare_private_domain_test.go index 2a7fb3f809..3ff7bc00b4 100644 --- a/integration/v7/isolated/unshare_private_domain_test.go +++ b/integration/v7/isolated/unshare_private_domain_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_route_command_test.go b/integration/v7/isolated/unshare_route_command_test.go index 58e25213bd..1fb1851123 100644 --- a/integration/v7/isolated/unshare_route_command_test.go +++ b/integration/v7/isolated/unshare_route_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/unshare_service_command_test.go b/integration/v7/isolated/unshare_service_command_test.go index 30ce0a17e1..10af9bcc2c 100644 --- a/integration/v7/isolated/unshare_service_command_test.go +++ b/integration/v7/isolated/unshare_service_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_destination_command_test.go b/integration/v7/isolated/update_destination_command_test.go index 0521239228..ca9a7eedfd 100644 --- a/integration/v7/isolated/update_destination_command_test.go +++ b/integration/v7/isolated/update_destination_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - . "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_org_quota_command_test.go b/integration/v7/isolated/update_org_quota_command_test.go index d5aa26e693..4c9b12e9ce 100644 --- a/integration/v7/isolated/update_org_quota_command_test.go +++ b/integration/v7/isolated/update_org_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_service_broker_command_test.go b/integration/v7/isolated/update_service_broker_command_test.go index 44246fadd9..76417dc2ae 100644 --- a/integration/v7/isolated/update_service_broker_command_test.go +++ b/integration/v7/isolated/update_service_broker_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_service_command_test.go b/integration/v7/isolated/update_service_command_test.go index 78fff6507a..88a91b6213 100644 --- a/integration/v7/isolated/update_service_command_test.go +++ b/integration/v7/isolated/update_service_command_test.go @@ -4,8 +4,8 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/update_space_quota_command_test.go b/integration/v7/isolated/update_space_quota_command_test.go index 235d4fb3a4..6642b240f0 100644 --- a/integration/v7/isolated/update_space_quota_command_test.go +++ b/integration/v7/isolated/update_space_quota_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 1eeee35ebe..dc13643e71 100644 --- a/integration/v7/isolated/update_user_provided_service_command_test.go +++ b/integration/v7/isolated/update_user_provided_service_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "os" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/upgrade_service_command_test.go b/integration/v7/isolated/upgrade_service_command_test.go index 91d05eabfb..e3a57c7cb8 100644 --- a/integration/v7/isolated/upgrade_service_command_test.go +++ b/integration/v7/isolated/upgrade_service_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/v8/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/verbose_flag_test.go b/integration/v7/isolated/verbose_flag_test.go index 19c38d4982..82d28cf8c5 100644 --- a/integration/v7/isolated/verbose_flag_test.go +++ b/integration/v7/isolated/verbose_flag_test.go @@ -6,8 +6,8 @@ import ( "runtime" "strings" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/app_start_timeout_flag_test.go b/integration/v7/push/app_start_timeout_flag_test.go index bc2f9f3f8a..23962be5f2 100644 --- a/integration/v7/push/app_start_timeout_flag_test.go +++ b/integration/v7/push/app_start_timeout_flag_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 fb8fb06504..fcc3288c4c 100644 --- a/integration/v7/push/buildpacks_test.go +++ b/integration/v7/push/buildpacks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/canary_push_test.go b/integration/v7/push/canary_push_test.go index 71520bb90d..69a04d64e8 100644 --- a/integration/v7/push/canary_push_test.go +++ b/integration/v7/push/canary_push_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/cfignore_test.go b/integration/v7/push/cfignore_test.go index 5f80245fb6..15fd602827 100644 --- a/integration/v7/push/cfignore_test.go +++ b/integration/v7/push/cfignore_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 95a5f98414..1b8823ba3e 100644 --- a/integration/v7/push/combination_manifest_and_flag_test.go +++ b/integration/v7/push/combination_manifest_and_flag_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/disk_flag_test.go b/integration/v7/push/disk_flag_test.go index 538c41afae..1e41bc022e 100644 --- a/integration/v7/push/disk_flag_test.go +++ b/integration/v7/push/disk_flag_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/docker_test.go b/integration/v7/push/docker_test.go index 370d778fc5..39123dd8bc 100644 --- a/integration/v7/push/docker_test.go +++ b/integration/v7/push/docker_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/droplet_flag_test.go b/integration/v7/push/droplet_flag_test.go index bb517de1c6..ce8a8cd755 100644 --- a/integration/v7/push/droplet_flag_test.go +++ b/integration/v7/push/droplet_flag_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/health_check_test.go b/integration/v7/push/health_check_test.go index f94359e50a..ac39a46b20 100644 --- a/integration/v7/push/health_check_test.go +++ b/integration/v7/push/health_check_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/help_test.go b/integration/v7/push/help_test.go index 40e49a7267..cbb7e79884 100644 --- a/integration/v7/push/help_test.go +++ b/integration/v7/push/help_test.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/ignore_app_files_test.go b/integration/v7/push/ignore_app_files_test.go index f8af82b10d..4efa6f39f4 100644 --- a/integration/v7/push/ignore_app_files_test.go +++ b/integration/v7/push/ignore_app_files_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/input_errors_test.go b/integration/v7/push/input_errors_test.go index f912cd5675..8ebf2aaaa3 100644 --- a/integration/v7/push/input_errors_test.go +++ b/integration/v7/push/input_errors_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/instances_flag_test.go b/integration/v7/push/instances_flag_test.go index b40b03451c..516cfa8f51 100644 --- a/integration/v7/push/instances_flag_test.go +++ b/integration/v7/push/instances_flag_test.go @@ -3,7 +3,7 @@ package push import ( "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/log_rate_limit_flag_test.go b/integration/v7/push/log_rate_limit_flag_test.go index 5c49eb8f99..0f207bd315 100644 --- a/integration/v7/push/log_rate_limit_flag_test.go +++ b/integration/v7/push/log_rate_limit_flag_test.go @@ -1,8 +1,8 @@ package push import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/manifest_diff_test.go b/integration/v7/push/manifest_diff_test.go index b29a4fe52e..1066301f47 100644 --- a/integration/v7/push/manifest_diff_test.go +++ b/integration/v7/push/manifest_diff_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/manifest_location_test.go b/integration/v7/push/manifest_location_test.go index 00370cda5e..2826879bc3 100644 --- a/integration/v7/push/manifest_location_test.go +++ b/integration/v7/push/manifest_location_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" 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 65f78f99bc..a1faaf097e 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 @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/manifest_with_app_name_test.go b/integration/v7/push/manifest_with_app_name_test.go index ee4871cae4..1a6d6d4fb8 100644 --- a/integration/v7/push/manifest_with_app_name_test.go +++ b/integration/v7/push/manifest_with_app_name_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/memory_flag_test.go b/integration/v7/push/memory_flag_test.go index d61e24c9bc..b110ab768c 100644 --- a/integration/v7/push/memory_flag_test.go +++ b/integration/v7/push/memory_flag_test.go @@ -3,7 +3,7 @@ package push import ( "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/name_only_test.go b/integration/v7/push/name_only_test.go index 538bac17a6..7d2fa38264 100644 --- a/integration/v7/push/name_only_test.go +++ b/integration/v7/push/name_only_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/no_route_test.go b/integration/v7/push/no_route_test.go index 01df38ab4b..1a9952e26a 100644 --- a/integration/v7/push/no_route_test.go +++ b/integration/v7/push/no_route_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/no_start_test.go b/integration/v7/push/no_start_test.go index 6a3ec5a0b7..024454f23a 100644 --- a/integration/v7/push/no_start_test.go +++ b/integration/v7/push/no_start_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/no_wait_test.go b/integration/v7/push/no_wait_test.go index 2c58fbc08c..ec0c85326f 100644 --- a/integration/v7/push/no_wait_test.go +++ b/integration/v7/push/no_wait_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/path_test.go b/integration/v7/push/path_test.go index ca62a36b0a..59ea8b3f16 100644 --- a/integration/v7/push/path_test.go +++ b/integration/v7/push/path_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "runtime" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/push_output_test.go b/integration/v7/push/push_output_test.go index 0fabbf92a9..5e52f6b22c 100644 --- a/integration/v7/push/push_output_test.go +++ b/integration/v7/push/push_output_test.go @@ -5,7 +5,7 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/push_suite_test.go b/integration/v7/push/push_suite_test.go index 0ff9050701..ace3ca7b67 100644 --- a/integration/v7/push/push_suite_test.go +++ b/integration/v7/push/push_suite_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/push/random_route_test.go b/integration/v7/push/random_route_test.go index ec48339518..997c966e68 100644 --- a/integration/v7/push/random_route_test.go +++ b/integration/v7/push/random_route_test.go @@ -5,7 +5,7 @@ import ( "path" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/resource_matching_test.go b/integration/v7/push/resource_matching_test.go index 4a91485cc6..548a8c1f3c 100644 --- a/integration/v7/push/resource_matching_test.go +++ b/integration/v7/push/resource_matching_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/rolling_push_test.go b/integration/v7/push/rolling_push_test.go index 77be25e400..3dcc7752bc 100644 --- a/integration/v7/push/rolling_push_test.go +++ b/integration/v7/push/rolling_push_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/simple_manifest_only_test.go b/integration/v7/push/simple_manifest_only_test.go index 76733d3fdb..d4d57d7a95 100644 --- a/integration/v7/push/simple_manifest_only_test.go +++ b/integration/v7/push/simple_manifest_only_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/stacks_test.go b/integration/v7/push/stacks_test.go index 0c2d6954e0..4c9a98bce5 100644 --- a/integration/v7/push/stacks_test.go +++ b/integration/v7/push/stacks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/push/start_command_test.go b/integration/v7/push/start_command_test.go index 9fddd54d33..d10a2b2408 100644 --- a/integration/v7/push/start_command_test.go +++ b/integration/v7/push/start_command_test.go @@ -3,7 +3,7 @@ package push import ( "fmt" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/symlink_resources_test.go b/integration/v7/push/symlink_resources_test.go index f45314ae8a..65d7a3af4f 100644 --- a/integration/v7/push/symlink_resources_test.go +++ b/integration/v7/push/symlink_resources_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/push/symlink_test.go b/integration/v7/push/symlink_test.go index 7853d3c183..7b6bf34055 100644 --- a/integration/v7/push/symlink_test.go +++ b/integration/v7/push/symlink_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "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 923eca4ab6..e818154d38 100644 --- a/integration/v7/push/targeting_test.go +++ b/integration/v7/push/targeting_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" ) diff --git a/integration/v7/push/tasks_test.go b/integration/v7/push/tasks_test.go index 1ff434146b..3d3f955ad0 100644 --- a/integration/v7/push/tasks_test.go +++ b/integration/v7/push/tasks_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/selfcontained/api_command_test.go b/integration/v7/selfcontained/api_command_test.go index 7b78ad4128..99eddef6d5 100644 --- a/integration/v7/selfcontained/api_command_test.go +++ b/integration/v7/selfcontained/api_command_test.go @@ -3,10 +3,10 @@ package selfcontained_test import ( "net/http" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/integration/v7/selfcontained/create_space_command_test.go b/integration/v7/selfcontained/create_space_command_test.go index 236412a6c3..078973944a 100644 --- a/integration/v7/selfcontained/create_space_command_test.go +++ b/integration/v7/selfcontained/create_space_command_test.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/selfcontained/kubernetes_auth_log_test.go b/integration/v7/selfcontained/kubernetes_auth_log_test.go index d80aa25a90..3cd5d1b214 100644 --- a/integration/v7/selfcontained/kubernetes_auth_log_test.go +++ b/integration/v7/selfcontained/kubernetes_auth_log_test.go @@ -4,15 +4,15 @@ import ( "net/http" "path/filepath" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("logclient auth-provider", func() { diff --git a/integration/v7/selfcontained/kubernetes_auth_test.go b/integration/v7/selfcontained/kubernetes_auth_test.go index d1bdefd93c..25d8860d05 100644 --- a/integration/v7/selfcontained/kubernetes_auth_test.go +++ b/integration/v7/selfcontained/kubernetes_auth_test.go @@ -9,10 +9,10 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("auth-provider", func() { diff --git a/integration/v7/selfcontained/login_command_test.go b/integration/v7/selfcontained/login_command_test.go index 2f3d8b9d26..d1304e05db 100644 --- a/integration/v7/selfcontained/login_command_test.go +++ b/integration/v7/selfcontained/login_command_test.go @@ -12,11 +12,11 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("LoginCommand", func() { diff --git a/integration/v7/selfcontained/logout_command_test.go b/integration/v7/selfcontained/logout_command_test.go index 6d3e0230b0..0b5d52dcb9 100644 --- a/integration/v7/selfcontained/logout_command_test.go +++ b/integration/v7/selfcontained/logout_command_test.go @@ -9,9 +9,9 @@ import ( "github.com/onsi/gomega/gexec" apiv1 "k8s.io/client-go/tools/clientcmd/api/v1" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("cf logout", func() { diff --git a/integration/v7/selfcontained/selfcontained_suite_test.go b/integration/v7/selfcontained/selfcontained_suite_test.go index bfb928a7a1..a60303fbac 100644 --- a/integration/v7/selfcontained/selfcontained_suite_test.go +++ b/integration/v7/selfcontained/selfcontained_suite_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/integration/v7/selfcontained/fake" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/v7/selfcontained/fake" + "code.cloudfoundry.org/cli/v9/util/configv3" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" . "github.com/onsi/ginkgo/v2" diff --git a/main.go b/main.go index c0dfc6acee..fb2f7529b4 100644 --- a/main.go +++ b/main.go @@ -7,13 +7,13 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/v8/cf/cmd" - "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/util/command_parser" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/panichandler" - plugin_util "code.cloudfoundry.org/cli/v8/util/plugin" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/cf/cmd" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/util/command_parser" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/panichandler" + plugin_util "code.cloudfoundry.org/cli/v9/util/plugin" + "code.cloudfoundry.org/cli/v9/util/ui" ) func main() { diff --git a/plugin/cli_connection.go b/plugin/cli_connection.go index 4d02a140a2..2348894ee6 100644 --- a/plugin/cli_connection.go +++ b/plugin/cli_connection.go @@ -8,7 +8,7 @@ import ( "os" "time" - plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" ) type cliConnection struct { diff --git a/plugin/plugin.go b/plugin/plugin.go index 596301fb4c..f7aeadf3ad 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -1,6 +1,6 @@ package plugin -import plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" +import plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" /* * diff --git a/plugin/plugin_examples/basic_plugin.go b/plugin/plugin_examples/basic_plugin.go index 083319ffc2..f6941b5797 100644 --- a/plugin/plugin_examples/basic_plugin.go +++ b/plugin/plugin_examples/basic_plugin.go @@ -3,11 +3,11 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) // BasicPlugin is the struct implementing the interface defined by the core CLI. It can -// be found at "code.cloudfoundry.org/cli/v8/plugin/plugin.go" +// be found at "code.cloudfoundry.org/cli/v9/plugin/plugin.go" type BasicPlugin struct{} // Run must be implemented by any plugin because it is part of the @@ -77,7 +77,7 @@ func main() { // Any initialization for your plugin can be handled here // // Note: to run the plugin.Start method, we pass in a pointer to the struct - // implementing the interface defined at "code.cloudfoundry.org/cli/v8/plugin/plugin.go" + // implementing the interface defined at "code.cloudfoundry.org/cli/v9/plugin/plugin.go" // // Note: The plugin's main() method is invoked at install time to collect // metadata. The plugin will exit 0 and the Run([]string) method will not be diff --git a/plugin/plugin_examples/echo.go b/plugin/plugin_examples/echo.go index 98111a71bd..dc797b9a09 100644 --- a/plugin/plugin_examples/echo.go +++ b/plugin/plugin_examples/echo.go @@ -11,7 +11,7 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type PluginDemonstratingParams struct { diff --git a/plugin/plugin_examples/interactive.go b/plugin/plugin_examples/interactive.go index 88d958794a..4782c77ac4 100644 --- a/plugin/plugin_examples/interactive.go +++ b/plugin/plugin_examples/interactive.go @@ -9,7 +9,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type Interactive struct{} diff --git a/plugin/plugin_examples/multiple_commands.go b/plugin/plugin_examples/multiple_commands.go index d759acab57..281e75eb34 100644 --- a/plugin/plugin_examples/multiple_commands.go +++ b/plugin/plugin_examples/multiple_commands.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/plugin" ) type MultiCmd struct{} diff --git a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go index 50d950ad69..a8fe65d07b 100644 --- a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go +++ b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/plugin" ) type DemoCmd struct{} 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 e6594a9bd4..05edc46d93 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 ( "testing" "time" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) 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 a1f895c36d..eba99410f2 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 @@ -5,10 +5,10 @@ import ( "errors" "os/exec" - . "code.cloudfoundry.org/cli/v8/plugin/plugin_examples/test_rpc_server_example" + . "code.cloudfoundry.org/cli/v9/plugin/plugin_examples/test_rpc_server_example" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver/rpcserverfakes" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver/rpcserverfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/plugin/plugin_shim_test.go b/plugin/plugin_shim_test.go index 61f513e8d8..031e6a3922 100644 --- a/plugin/plugin_shim_test.go +++ b/plugin/plugin_shim_test.go @@ -4,9 +4,9 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/rpcserver/rpcserverfakes" - "code.cloudfoundry.org/cli/v8/plugin" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/rpcserver/rpcserverfakes" + "code.cloudfoundry.org/cli/v9/plugin" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/plugin/plugin_suite_test.go b/plugin/plugin_suite_test.go index b3204d3b75..e907d3dc63 100644 --- a/plugin/plugin_suite_test.go +++ b/plugin/plugin_suite_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/pluginbuilder" + "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/pluginbuilder" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugin/pluginfakes/fake_cli_connection.go b/plugin/pluginfakes/fake_cli_connection.go index 283bb69fa8..dc1c9c5e95 100644 --- a/plugin/pluginfakes/fake_cli_connection.go +++ b/plugin/pluginfakes/fake_cli_connection.go @@ -4,8 +4,8 @@ package pluginfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/plugin" - plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" + "code.cloudfoundry.org/cli/v9/plugin" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" ) type FakeCliConnection struct { @@ -352,15 +352,16 @@ func (fake *FakeCliConnection) AccessToken() (string, error) { ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.accessTokenReturns return fakeReturns.result1, fakeReturns.result2 } @@ -407,15 +408,16 @@ func (fake *FakeCliConnection) ApiEndpoint() (string, error) { ret, specificReturn := fake.apiEndpointReturnsOnCall[len(fake.apiEndpointArgsForCall)] fake.apiEndpointArgsForCall = append(fake.apiEndpointArgsForCall, struct { }{}) + stub := fake.ApiEndpointStub + fakeReturns := fake.apiEndpointReturns fake.recordInvocation("ApiEndpoint", []interface{}{}) fake.apiEndpointMutex.Unlock() - if fake.ApiEndpointStub != nil { - return fake.ApiEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.apiEndpointReturns return fakeReturns.result1, fakeReturns.result2 } @@ -462,15 +464,16 @@ func (fake *FakeCliConnection) ApiVersion() (string, error) { ret, specificReturn := fake.apiVersionReturnsOnCall[len(fake.apiVersionArgsForCall)] fake.apiVersionArgsForCall = append(fake.apiVersionArgsForCall, struct { }{}) + stub := fake.ApiVersionStub + fakeReturns := fake.apiVersionReturns fake.recordInvocation("ApiVersion", []interface{}{}) fake.apiVersionMutex.Unlock() - if fake.ApiVersionStub != nil { - return fake.ApiVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.apiVersionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -518,15 +521,16 @@ func (fake *FakeCliConnection) CliCommand(arg1 ...string) ([]string, error) { fake.cliCommandArgsForCall = append(fake.cliCommandArgsForCall, struct { arg1 []string }{arg1}) + stub := fake.CliCommandStub + fakeReturns := fake.cliCommandReturns fake.recordInvocation("CliCommand", []interface{}{arg1}) fake.cliCommandMutex.Unlock() - if fake.CliCommandStub != nil { - return fake.CliCommandStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.cliCommandReturns return fakeReturns.result1, fakeReturns.result2 } @@ -581,15 +585,16 @@ func (fake *FakeCliConnection) CliCommandWithoutTerminalOutput(arg1 ...string) ( fake.cliCommandWithoutTerminalOutputArgsForCall = append(fake.cliCommandWithoutTerminalOutputArgsForCall, struct { arg1 []string }{arg1}) + stub := fake.CliCommandWithoutTerminalOutputStub + fakeReturns := fake.cliCommandWithoutTerminalOutputReturns fake.recordInvocation("CliCommandWithoutTerminalOutput", []interface{}{arg1}) fake.cliCommandWithoutTerminalOutputMutex.Unlock() - if fake.CliCommandWithoutTerminalOutputStub != nil { - return fake.CliCommandWithoutTerminalOutputStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.cliCommandWithoutTerminalOutputReturns return fakeReturns.result1, fakeReturns.result2 } @@ -643,15 +648,16 @@ func (fake *FakeCliConnection) DopplerEndpoint() (string, error) { ret, specificReturn := fake.dopplerEndpointReturnsOnCall[len(fake.dopplerEndpointArgsForCall)] fake.dopplerEndpointArgsForCall = append(fake.dopplerEndpointArgsForCall, struct { }{}) + stub := fake.DopplerEndpointStub + fakeReturns := fake.dopplerEndpointReturns fake.recordInvocation("DopplerEndpoint", []interface{}{}) fake.dopplerEndpointMutex.Unlock() - if fake.DopplerEndpointStub != nil { - return fake.DopplerEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dopplerEndpointReturns return fakeReturns.result1, fakeReturns.result2 } @@ -699,15 +705,16 @@ func (fake *FakeCliConnection) GetApp(arg1 string) (plugin_models.GetAppModel, e fake.getAppArgsForCall = append(fake.getAppArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetAppStub + fakeReturns := fake.getAppReturns fake.recordInvocation("GetApp", []interface{}{arg1}) fake.getAppMutex.Unlock() - if fake.GetAppStub != nil { - return fake.GetAppStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAppReturns return fakeReturns.result1, fakeReturns.result2 } @@ -761,15 +768,16 @@ func (fake *FakeCliConnection) GetApps() ([]plugin_models.GetAppsModel, error) { ret, specificReturn := fake.getAppsReturnsOnCall[len(fake.getAppsArgsForCall)] fake.getAppsArgsForCall = append(fake.getAppsArgsForCall, struct { }{}) + stub := fake.GetAppsStub + fakeReturns := fake.getAppsReturns fake.recordInvocation("GetApps", []interface{}{}) fake.getAppsMutex.Unlock() - if fake.GetAppsStub != nil { - return fake.GetAppsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getAppsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -816,15 +824,16 @@ func (fake *FakeCliConnection) GetCurrentOrg() (plugin_models.Organization, erro ret, specificReturn := fake.getCurrentOrgReturnsOnCall[len(fake.getCurrentOrgArgsForCall)] fake.getCurrentOrgArgsForCall = append(fake.getCurrentOrgArgsForCall, struct { }{}) + stub := fake.GetCurrentOrgStub + fakeReturns := fake.getCurrentOrgReturns fake.recordInvocation("GetCurrentOrg", []interface{}{}) fake.getCurrentOrgMutex.Unlock() - if fake.GetCurrentOrgStub != nil { - return fake.GetCurrentOrgStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getCurrentOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -871,15 +880,16 @@ func (fake *FakeCliConnection) GetCurrentSpace() (plugin_models.Space, error) { ret, specificReturn := fake.getCurrentSpaceReturnsOnCall[len(fake.getCurrentSpaceArgsForCall)] fake.getCurrentSpaceArgsForCall = append(fake.getCurrentSpaceArgsForCall, struct { }{}) + stub := fake.GetCurrentSpaceStub + fakeReturns := fake.getCurrentSpaceReturns fake.recordInvocation("GetCurrentSpace", []interface{}{}) fake.getCurrentSpaceMutex.Unlock() - if fake.GetCurrentSpaceStub != nil { - return fake.GetCurrentSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getCurrentSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -927,15 +937,16 @@ func (fake *FakeCliConnection) GetOrg(arg1 string) (plugin_models.GetOrg_Model, fake.getOrgArgsForCall = append(fake.getOrgArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrgStub + fakeReturns := fake.getOrgReturns fake.recordInvocation("GetOrg", []interface{}{arg1}) fake.getOrgMutex.Unlock() - if fake.GetOrgStub != nil { - return fake.GetOrgStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -991,15 +1002,16 @@ func (fake *FakeCliConnection) GetOrgUsers(arg1 string, arg2 ...string) ([]plugi arg1 string arg2 []string }{arg1, arg2}) + stub := fake.GetOrgUsersStub + fakeReturns := fake.getOrgUsersReturns fake.recordInvocation("GetOrgUsers", []interface{}{arg1, arg2}) fake.getOrgUsersMutex.Unlock() - if fake.GetOrgUsersStub != nil { - return fake.GetOrgUsersStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getOrgUsersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1053,15 +1065,16 @@ func (fake *FakeCliConnection) GetOrgs() ([]plugin_models.GetOrgs_Model, error) ret, specificReturn := fake.getOrgsReturnsOnCall[len(fake.getOrgsArgsForCall)] fake.getOrgsArgsForCall = append(fake.getOrgsArgsForCall, struct { }{}) + stub := fake.GetOrgsStub + fakeReturns := fake.getOrgsReturns fake.recordInvocation("GetOrgs", []interface{}{}) fake.getOrgsMutex.Unlock() - if fake.GetOrgsStub != nil { - return fake.GetOrgsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1109,15 +1122,16 @@ func (fake *FakeCliConnection) GetService(arg1 string) (plugin_models.GetService fake.getServiceArgsForCall = append(fake.getServiceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceStub + fakeReturns := fake.getServiceReturns fake.recordInvocation("GetService", []interface{}{arg1}) fake.getServiceMutex.Unlock() - if fake.GetServiceStub != nil { - return fake.GetServiceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServiceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1171,15 +1185,16 @@ func (fake *FakeCliConnection) GetServices() ([]plugin_models.GetServices_Model, ret, specificReturn := fake.getServicesReturnsOnCall[len(fake.getServicesArgsForCall)] fake.getServicesArgsForCall = append(fake.getServicesArgsForCall, struct { }{}) + stub := fake.GetServicesStub + fakeReturns := fake.getServicesReturns fake.recordInvocation("GetServices", []interface{}{}) fake.getServicesMutex.Unlock() - if fake.GetServicesStub != nil { - return fake.GetServicesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getServicesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1227,15 +1242,16 @@ func (fake *FakeCliConnection) GetSpace(arg1 string) (plugin_models.GetSpace_Mod fake.getSpaceArgsForCall = append(fake.getSpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceStub + fakeReturns := fake.getSpaceReturns fake.recordInvocation("GetSpace", []interface{}{arg1}) fake.getSpaceMutex.Unlock() - if fake.GetSpaceStub != nil { - return fake.GetSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1291,15 +1307,16 @@ func (fake *FakeCliConnection) GetSpaceUsers(arg1 string, arg2 string) ([]plugin arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSpaceUsersStub + fakeReturns := fake.getSpaceUsersReturns fake.recordInvocation("GetSpaceUsers", []interface{}{arg1, arg2}) fake.getSpaceUsersMutex.Unlock() - if fake.GetSpaceUsersStub != nil { - return fake.GetSpaceUsersStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSpaceUsersReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1353,15 +1370,16 @@ func (fake *FakeCliConnection) GetSpaces() ([]plugin_models.GetSpaces_Model, err ret, specificReturn := fake.getSpacesReturnsOnCall[len(fake.getSpacesArgsForCall)] fake.getSpacesArgsForCall = append(fake.getSpacesArgsForCall, struct { }{}) + stub := fake.GetSpacesStub + fakeReturns := fake.getSpacesReturns fake.recordInvocation("GetSpaces", []interface{}{}) fake.getSpacesMutex.Unlock() - if fake.GetSpacesStub != nil { - return fake.GetSpacesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSpacesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1408,15 +1426,16 @@ func (fake *FakeCliConnection) HasAPIEndpoint() (bool, error) { ret, specificReturn := fake.hasAPIEndpointReturnsOnCall[len(fake.hasAPIEndpointArgsForCall)] fake.hasAPIEndpointArgsForCall = append(fake.hasAPIEndpointArgsForCall, struct { }{}) + stub := fake.HasAPIEndpointStub + fakeReturns := fake.hasAPIEndpointReturns fake.recordInvocation("HasAPIEndpoint", []interface{}{}) fake.hasAPIEndpointMutex.Unlock() - if fake.HasAPIEndpointStub != nil { - return fake.HasAPIEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.hasAPIEndpointReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1463,15 +1482,16 @@ func (fake *FakeCliConnection) HasOrganization() (bool, error) { ret, specificReturn := fake.hasOrganizationReturnsOnCall[len(fake.hasOrganizationArgsForCall)] fake.hasOrganizationArgsForCall = append(fake.hasOrganizationArgsForCall, struct { }{}) + stub := fake.HasOrganizationStub + fakeReturns := fake.hasOrganizationReturns fake.recordInvocation("HasOrganization", []interface{}{}) fake.hasOrganizationMutex.Unlock() - if fake.HasOrganizationStub != nil { - return fake.HasOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.hasOrganizationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1518,15 +1538,16 @@ func (fake *FakeCliConnection) HasSpace() (bool, error) { ret, specificReturn := fake.hasSpaceReturnsOnCall[len(fake.hasSpaceArgsForCall)] fake.hasSpaceArgsForCall = append(fake.hasSpaceArgsForCall, struct { }{}) + stub := fake.HasSpaceStub + fakeReturns := fake.hasSpaceReturns fake.recordInvocation("HasSpace", []interface{}{}) fake.hasSpaceMutex.Unlock() - if fake.HasSpaceStub != nil { - return fake.HasSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.hasSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1573,15 +1594,16 @@ func (fake *FakeCliConnection) IsLoggedIn() (bool, error) { ret, specificReturn := fake.isLoggedInReturnsOnCall[len(fake.isLoggedInArgsForCall)] fake.isLoggedInArgsForCall = append(fake.isLoggedInArgsForCall, struct { }{}) + stub := fake.IsLoggedInStub + fakeReturns := fake.isLoggedInReturns fake.recordInvocation("IsLoggedIn", []interface{}{}) fake.isLoggedInMutex.Unlock() - if fake.IsLoggedInStub != nil { - return fake.IsLoggedInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.isLoggedInReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1628,15 +1650,16 @@ func (fake *FakeCliConnection) IsSSLDisabled() (bool, error) { ret, specificReturn := fake.isSSLDisabledReturnsOnCall[len(fake.isSSLDisabledArgsForCall)] fake.isSSLDisabledArgsForCall = append(fake.isSSLDisabledArgsForCall, struct { }{}) + stub := fake.IsSSLDisabledStub + fakeReturns := fake.isSSLDisabledReturns fake.recordInvocation("IsSSLDisabled", []interface{}{}) fake.isSSLDisabledMutex.Unlock() - if fake.IsSSLDisabledStub != nil { - return fake.IsSSLDisabledStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.isSSLDisabledReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1683,15 +1706,16 @@ func (fake *FakeCliConnection) LoggregatorEndpoint() (string, error) { ret, specificReturn := fake.loggregatorEndpointReturnsOnCall[len(fake.loggregatorEndpointArgsForCall)] fake.loggregatorEndpointArgsForCall = append(fake.loggregatorEndpointArgsForCall, struct { }{}) + stub := fake.LoggregatorEndpointStub + fakeReturns := fake.loggregatorEndpointReturns fake.recordInvocation("LoggregatorEndpoint", []interface{}{}) fake.loggregatorEndpointMutex.Unlock() - if fake.LoggregatorEndpointStub != nil { - return fake.LoggregatorEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.loggregatorEndpointReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1738,15 +1762,16 @@ func (fake *FakeCliConnection) UserEmail() (string, error) { ret, specificReturn := fake.userEmailReturnsOnCall[len(fake.userEmailArgsForCall)] fake.userEmailArgsForCall = append(fake.userEmailArgsForCall, struct { }{}) + stub := fake.UserEmailStub + fakeReturns := fake.userEmailReturns fake.recordInvocation("UserEmail", []interface{}{}) fake.userEmailMutex.Unlock() - if fake.UserEmailStub != nil { - return fake.UserEmailStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.userEmailReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1793,15 +1818,16 @@ func (fake *FakeCliConnection) UserGuid() (string, error) { ret, specificReturn := fake.userGuidReturnsOnCall[len(fake.userGuidArgsForCall)] fake.userGuidArgsForCall = append(fake.userGuidArgsForCall, struct { }{}) + stub := fake.UserGuidStub + fakeReturns := fake.userGuidReturns fake.recordInvocation("UserGuid", []interface{}{}) fake.userGuidMutex.Unlock() - if fake.UserGuidStub != nil { - return fake.UserGuidStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.userGuidReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1848,15 +1874,16 @@ func (fake *FakeCliConnection) Username() (string, error) { ret, specificReturn := fake.usernameReturnsOnCall[len(fake.usernameArgsForCall)] fake.usernameArgsForCall = append(fake.usernameArgsForCall, struct { }{}) + stub := fake.UsernameStub + fakeReturns := fake.usernameReturns fake.recordInvocation("Username", []interface{}{}) fake.usernameMutex.Unlock() - if fake.UsernameStub != nil { - return fake.UsernameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.usernameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/plugin/rpc/call_command_registry.go b/plugin/rpc/call_command_registry.go index bfe3d89357..f2201cce6d 100644 --- a/plugin/rpc/call_command_registry.go +++ b/plugin/rpc/call_command_registry.go @@ -3,9 +3,9 @@ package rpc import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CommandRunner diff --git a/plugin/rpc/call_command_registry_test.go b/plugin/rpc/call_command_registry_test.go index 36554dfa25..886ed54f3f 100644 --- a/plugin/rpc/call_command_registry_test.go +++ b/plugin/rpc/call_command_registry_test.go @@ -3,11 +3,11 @@ package rpc_test import ( "os" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/terminal/terminalfakes" - "code.cloudfoundry.org/cli/v8/cf/trace/tracefakes" - . "code.cloudfoundry.org/cli/v8/plugin/rpc" - . "code.cloudfoundry.org/cli/v8/plugin/rpc/fakecommand" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v9/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v9/plugin/rpc" + . "code.cloudfoundry.org/cli/v9/plugin/rpc/fakecommand" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugin/rpc/cli_rpc_server.go b/plugin/rpc/cli_rpc_server.go index 1c44f551e5..36cd5c2685 100644 --- a/plugin/rpc/cli_rpc_server.go +++ b/plugin/rpc/cli_rpc_server.go @@ -11,16 +11,16 @@ import ( "strings" "sync" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/terminal" - "code.cloudfoundry.org/cli/v8/plugin" - plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/terminal" + "code.cloudfoundry.org/cli/v9/plugin" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" + "code.cloudfoundry.org/cli/v9/version" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/v8/cf/trace" + "code.cloudfoundry.org/cli/v9/cf/trace" ) var dialTimeout = os.Getenv("CF_DIAL_TIMEOUT") diff --git a/plugin/rpc/cli_rpc_server_test.go b/plugin/rpc/cli_rpc_server_test.go index 2759ab49e1..36ff3f2226 100644 --- a/plugin/rpc/cli_rpc_server_test.go +++ b/plugin/rpc/cli_rpc_server_test.go @@ -7,18 +7,18 @@ import ( "os" "time" - "code.cloudfoundry.org/cli/v8/cf/api" - "code.cloudfoundry.org/cli/v8/cf/api/authentication/authenticationfakes" - "code.cloudfoundry.org/cli/v8/cf/configuration/coreconfig" - "code.cloudfoundry.org/cli/v8/cf/models" - "code.cloudfoundry.org/cli/v8/cf/terminal" - testconfig "code.cloudfoundry.org/cli/v8/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/v8/plugin" - plugin_models "code.cloudfoundry.org/cli/v8/plugin/models" - . "code.cloudfoundry.org/cli/v8/plugin/rpc" - cmdRunner "code.cloudfoundry.org/cli/v8/plugin/rpc" - . "code.cloudfoundry.org/cli/v8/plugin/rpc/fakecommand" - "code.cloudfoundry.org/cli/v8/plugin/rpc/rpcfakes" + "code.cloudfoundry.org/cli/v9/cf/api" + "code.cloudfoundry.org/cli/v9/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v9/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v9/cf/models" + "code.cloudfoundry.org/cli/v9/cf/terminal" + testconfig "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v9/plugin" + plugin_models "code.cloudfoundry.org/cli/v9/plugin/models" + . "code.cloudfoundry.org/cli/v9/plugin/rpc" + cmdRunner "code.cloudfoundry.org/cli/v9/plugin/rpc" + . "code.cloudfoundry.org/cli/v9/plugin/rpc/fakecommand" + "code.cloudfoundry.org/cli/v9/plugin/rpc/rpcfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugin/rpc/fakecommand/fake_command1.go b/plugin/rpc/fakecommand/fake_command1.go index ecf87aed98..016225ae41 100644 --- a/plugin/rpc/fakecommand/fake_command1.go +++ b/plugin/rpc/fakecommand/fake_command1.go @@ -3,10 +3,10 @@ package fakecommand import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type FakeCommand1 struct { diff --git a/plugin/rpc/fakecommand/fake_command2.go b/plugin/rpc/fakecommand/fake_command2.go index eccba4e185..cc69fdb7c3 100644 --- a/plugin/rpc/fakecommand/fake_command2.go +++ b/plugin/rpc/fakecommand/fake_command2.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" - "code.cloudfoundry.org/cli/v8/cf/terminal" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/terminal" ) type FakeCommand2 struct { diff --git a/plugin/rpc/fakecommand/fake_command3.go b/plugin/rpc/fakecommand/fake_command3.go index 0ea7c6541d..79b4d552e4 100644 --- a/plugin/rpc/fakecommand/fake_command3.go +++ b/plugin/rpc/fakecommand/fake_command3.go @@ -1,9 +1,9 @@ package fakecommand import ( - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) type FakeCommand3 struct { diff --git a/plugin/rpc/fakecommand/fake_command4.go b/plugin/rpc/fakecommand/fake_command4.go index bb79e8690d..e3dbe6c4b1 100644 --- a/plugin/rpc/fakecommand/fake_command4.go +++ b/plugin/rpc/fakecommand/fake_command4.go @@ -3,9 +3,9 @@ package fakecommand import ( "errors" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/cf/flags" - "code.cloudfoundry.org/cli/v8/cf/requirements" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/cf/flags" + "code.cloudfoundry.org/cli/v9/cf/requirements" ) var ErrFakeCommand4 = errors.New("ZOMG command errored") diff --git a/plugin/rpc/rpc_suite_test.go b/plugin/rpc/rpc_suite_test.go index 1feaec7ecc..5eb21a8ba0 100644 --- a/plugin/rpc/rpc_suite_test.go +++ b/plugin/rpc/rpc_suite_test.go @@ -1,7 +1,7 @@ package rpc_test import ( - "code.cloudfoundry.org/cli/v8/plugin/rpc" + "code.cloudfoundry.org/cli/v9/plugin/rpc" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/plugin/rpc/rpcfakes/fake_command_runner.go b/plugin/rpc/rpcfakes/fake_command_runner.go index 6aed4ec154..5994dc6bb7 100644 --- a/plugin/rpc/rpcfakes/fake_command_runner.go +++ b/plugin/rpc/rpcfakes/fake_command_runner.go @@ -4,8 +4,8 @@ package rpcfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/cf/commandregistry" - "code.cloudfoundry.org/cli/v8/plugin/rpc" + "code.cloudfoundry.org/cli/v9/cf/commandregistry" + "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type FakeCommandRunner struct { @@ -39,15 +39,16 @@ func (fake *FakeCommandRunner) Command(arg1 []string, arg2 commandregistry.Depen arg2 commandregistry.Dependency arg3 bool }{arg1Copy, arg2, arg3}) + stub := fake.CommandStub + fakeReturns := fake.commandReturns fake.recordInvocation("Command", []interface{}{arg1Copy, arg2, arg3}) fake.commandMutex.Unlock() - if fake.CommandStub != nil { - return fake.CommandStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.commandReturns return fakeReturns.result1 } diff --git a/plugin/rpc/rpcfakes/fake_output_capture.go b/plugin/rpc/rpcfakes/fake_output_capture.go index 5a59115fce..47054488f1 100644 --- a/plugin/rpc/rpcfakes/fake_output_capture.go +++ b/plugin/rpc/rpcfakes/fake_output_capture.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/plugin/rpc" + "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type FakeOutputCapture struct { @@ -23,9 +23,10 @@ func (fake *FakeOutputCapture) SetOutputBucket(arg1 io.Writer) { fake.setOutputBucketArgsForCall = append(fake.setOutputBucketArgsForCall, struct { arg1 io.Writer }{arg1}) + stub := fake.SetOutputBucketStub fake.recordInvocation("SetOutputBucket", []interface{}{arg1}) fake.setOutputBucketMutex.Unlock() - if fake.SetOutputBucketStub != nil { + if stub != nil { fake.SetOutputBucketStub(arg1) } } diff --git a/plugin/rpc/rpcfakes/fake_terminal_output_switch.go b/plugin/rpc/rpcfakes/fake_terminal_output_switch.go index 5c9afeed7a..6eebe57cc6 100644 --- a/plugin/rpc/rpcfakes/fake_terminal_output_switch.go +++ b/plugin/rpc/rpcfakes/fake_terminal_output_switch.go @@ -4,7 +4,7 @@ package rpcfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/plugin/rpc" + "code.cloudfoundry.org/cli/v9/plugin/rpc" ) type FakeTerminalOutputSwitch struct { @@ -22,9 +22,10 @@ func (fake *FakeTerminalOutputSwitch) DisableTerminalOutput(arg1 bool) { fake.disableTerminalOutputArgsForCall = append(fake.disableTerminalOutputArgsForCall, struct { arg1 bool }{arg1}) + stub := fake.DisableTerminalOutputStub fake.recordInvocation("DisableTerminalOutput", []interface{}{arg1}) fake.disableTerminalOutputMutex.Unlock() - if fake.DisableTerminalOutputStub != nil { + if stub != nil { fake.DisableTerminalOutputStub(arg1) } } diff --git a/plugin/rpc/run_plugin.go b/plugin/rpc/run_plugin.go index f57d194668..9cfd395a33 100644 --- a/plugin/rpc/run_plugin.go +++ b/plugin/rpc/run_plugin.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - "code.cloudfoundry.org/cli/v8/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v9/cf/configuration/pluginconfig" ) func RunMethodIfExists(rpcService *CliRpcService, args []string, pluginList map[string]pluginconfig.PluginMetadata) bool { diff --git a/plugin/transition/run_plugin_legacy.go b/plugin/transition/run_plugin_legacy.go index 3493276e37..4fc629f795 100644 --- a/plugin/transition/run_plugin_legacy.go +++ b/plugin/transition/run_plugin_legacy.go @@ -3,9 +3,9 @@ package plugin_transition import ( "os" - "code.cloudfoundry.org/cli/v8/cf/cmd" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/cf/cmd" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/util/configv3" ) func RunPlugin(plugin configv3.Plugin, _ command.UI) error { diff --git a/resources/application_resource.go b/resources/application_resource.go index 4c4c8f283c..a9d898fa78 100644 --- a/resources/application_resource.go +++ b/resources/application_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Application represents a Cloud Controller V3 Application. diff --git a/resources/build_resource.go b/resources/build_resource.go index 47c4c72762..241ae1b34c 100644 --- a/resources/build_resource.go +++ b/resources/build_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Build represent the process of staging an application package. diff --git a/resources/buildpack_resource.go b/resources/buildpack_resource.go index ef87b4994a..7cf78e8525 100644 --- a/resources/buildpack_resource.go +++ b/resources/buildpack_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/types" ) // Buildpack represents a Cloud Controller V3 buildpack. diff --git a/resources/deployment_resource.go b/resources/deployment_resource.go index 7a3a5d8ada..f3b98c0497 100644 --- a/resources/deployment_resource.go +++ b/resources/deployment_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type Deployment struct { diff --git a/resources/domain_resource.go b/resources/domain_resource.go index 591127ba0b..1a032a78b0 100644 --- a/resources/domain_resource.go +++ b/resources/domain_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/droplet_resource.go b/resources/droplet_resource.go index 1e92b32c1f..1c9ce9bbf9 100644 --- a/resources/droplet_resource.go +++ b/resources/droplet_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Droplet represents a Cloud Controller droplet's metadata. A droplet is a set of diff --git a/resources/environment_variables_resource.go b/resources/environment_variables_resource.go index 0c293fcbfc..c03555f66c 100644 --- a/resources/environment_variables_resource.go +++ b/resources/environment_variables_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/types" ) type EnvironmentVariables map[string]types.FilteredString diff --git a/resources/last_operation_resource_test.go b/resources/last_operation_resource_test.go index b3cfd45d1b..91e85ee1b1 100644 --- a/resources/last_operation_resource_test.go +++ b/resources/last_operation_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/resources/metadata_resource.go b/resources/metadata_resource.go index 1a1f9571b8..2db780aa1d 100644 --- a/resources/metadata_resource.go +++ b/resources/metadata_resource.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/types" +import "code.cloudfoundry.org/cli/v9/types" type Metadata struct { Labels map[string]types.NullString `json:"labels,omitempty"` diff --git a/resources/package_resource.go b/resources/package_resource.go index eeda9caa1d..1bb09d8f03 100644 --- a/resources/package_resource.go +++ b/resources/package_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Package represents a Cloud Controller V3 Package. diff --git a/resources/process_resource.go b/resources/process_resource.go index 26ec270c69..0cca65580c 100644 --- a/resources/process_resource.go +++ b/resources/process_resource.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/types" ) type Process struct { diff --git a/resources/process_resource_test.go b/resources/process_resource_test.go index f95beefcb5..810a1da4a8 100644 --- a/resources/process_resource_test.go +++ b/resources/process_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/resources/quota_resource.go b/resources/quota_resource.go index 35ddc6e3f9..15409edd58 100644 --- a/resources/quota_resource.go +++ b/resources/quota_resource.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" ) type Quota struct { diff --git a/resources/quota_resource_test.go b/resources/quota_resource_test.go index f7576d1186..7277013ad6 100644 --- a/resources/quota_resource_test.go +++ b/resources/quota_resource_test.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/relationship_resource.go b/resources/relationship_resource.go index 6bb5704271..f532442e79 100644 --- a/resources/relationship_resource.go +++ b/resources/relationship_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Relationships represent associations between resources. Relationships is a diff --git a/resources/role_resource.go b/resources/role_resource.go index 70bd6899fb..4beb836c56 100644 --- a/resources/role_resource.go +++ b/resources/role_resource.go @@ -3,8 +3,8 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // IncludedUsers represent a set of users included on an API response. diff --git a/resources/route_binding.go b/resources/route_binding.go index 5f73948db0..64361b3b4c 100644 --- a/resources/route_binding.go +++ b/resources/route_binding.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/route_binding_test.go b/resources/route_binding_test.go index 52178510f6..db746f4407 100644 --- a/resources/route_binding_test.go +++ b/resources/route_binding_test.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/resources/route_resource.go b/resources/route_resource.go index e998b6bf35..30dcf39ab5 100644 --- a/resources/route_resource.go +++ b/resources/route_resource.go @@ -3,7 +3,7 @@ package resources import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller" ) type RouteDestinationApp struct { diff --git a/resources/security_group_resource_test.go b/resources/security_group_resource_test.go index 2008a05247..92bad37ad8 100644 --- a/resources/security_group_resource_test.go +++ b/resources/security_group_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "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 6079a8d096..429e45aba8 100644 --- a/resources/service_broker_resource_test.go +++ b/resources/service_broker_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_credential_binding_resource.go b/resources/service_credential_binding_resource.go index 013cf66f06..da0d7b4126 100644 --- a/resources/service_credential_binding_resource.go +++ b/resources/service_credential_binding_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_credential_binding_resource_test.go b/resources/service_credential_binding_resource_test.go index 607569142b..d4beb474aa 100644 --- a/resources/service_credential_binding_resource_test.go +++ b/resources/service_credential_binding_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_instance_resource.go b/resources/service_instance_resource.go index b57a31ffca..35bf656ec3 100644 --- a/resources/service_instance_resource.go +++ b/resources/service_instance_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_instance_resource_test.go b/resources/service_instance_resource_test.go index 52f1cbbc45..2f54d64bc1 100644 --- a/resources/service_instance_resource_test.go +++ b/resources/service_instance_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" - . "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_instance_usage_summary_resource_test.go b/resources/service_instance_usage_summary_resource_test.go index e441471eb0..ad6c039027 100644 --- a/resources/service_instance_usage_summary_resource_test.go +++ b/resources/service_instance_usage_summary_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_offering_resource.go b/resources/service_offering_resource.go index 8a26192f9d..44b5cfd0b8 100644 --- a/resources/service_offering_resource.go +++ b/resources/service_offering_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/service_offering_resource_test.go b/resources/service_offering_resource_test.go index 088f3b8bd6..a98e580a87 100644 --- a/resources/service_offering_resource_test.go +++ b/resources/service_offering_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "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 6306b93209..ec779a06bc 100644 --- a/resources/service_plan_resource_test.go +++ b/resources/service_plan_resource_test.go @@ -3,8 +3,8 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/resources" - "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/types" . "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 882c360911..f9bc44802e 100644 --- a/resources/service_plan_visibility_resource_test.go +++ b/resources/service_plan_visibility_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/shared_to_spaces_resource_test.go b/resources/shared_to_spaces_resource_test.go index ce7cec617b..dd6e715cd7 100644 --- a/resources/shared_to_spaces_resource_test.go +++ b/resources/shared_to_spaces_resource_test.go @@ -3,9 +3,9 @@ package resources_test import ( "encoding/json" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/v8/resources" + . "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/sidecar_resource.go b/resources/sidecar_resource.go index 415207e8d0..c54e981fb5 100644 --- a/resources/sidecar_resource.go +++ b/resources/sidecar_resource.go @@ -1,6 +1,6 @@ package resources -import "code.cloudfoundry.org/cli/v8/types" +import "code.cloudfoundry.org/cli/v9/types" type Sidecar struct { GUID string `json:"guid"` diff --git a/resources/task_resource.go b/resources/task_resource.go index 7ba7f42b80..3c99a73778 100644 --- a/resources/task_resource.go +++ b/resources/task_resource.go @@ -1,7 +1,7 @@ package resources import ( - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) // Task represents a Cloud Controller V3 Task. diff --git a/types/filtered_interface_test.go b/types/filtered_interface_test.go index 77367b4240..4b0460f7f6 100644 --- a/types/filtered_interface_test.go +++ b/types/filtered_interface_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/filtered_string_test.go b/types/filtered_string_test.go index 07ca30a2b6..17599a930c 100644 --- a/types/filtered_string_test.go +++ b/types/filtered_string_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/json_object_test.go b/types/json_object_test.go index 5d2a507ad4..bf56fca47d 100644 --- a/types/json_object_test.go +++ b/types/json_object_test.go @@ -3,7 +3,7 @@ package types_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_bool_test.go b/types/null_bool_test.go index adb4218f52..e6928ae791 100644 --- a/types/null_bool_test.go +++ b/types/null_bool_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/types" . "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 0554471da5..fc93e9ca37 100644 --- a/types/null_bytesize_in_mb_test.go +++ b/types/null_bytesize_in_mb_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_int_test.go b/types/null_int_test.go index 76097bae1f..de3a787693 100644 --- a/types/null_int_test.go +++ b/types/null_int_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/types" "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/types/null_string_test.go b/types/null_string_test.go index f1aa312e4e..7bf36e2994 100644 --- a/types/null_string_test.go +++ b/types/null_string_test.go @@ -3,7 +3,7 @@ package types_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_uint64_test.go b/types/null_uint64_test.go index 54dfa37a7f..78e8cfbdda 100644 --- a/types/null_uint64_test.go +++ b/types/null_uint64_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "code.cloudfoundry.org/cli/v8/types" + . "code.cloudfoundry.org/cli/v9/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/optional_boolean_test.go b/types/optional_boolean_test.go index 4eaec5080a..d13eb49f27 100644 --- a/types/optional_boolean_test.go +++ b/types/optional_boolean_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_object_test.go b/types/optional_object_test.go index 9338430d74..6e9ee70950 100644 --- a/types/optional_object_test.go +++ b/types/optional_object_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_string_slice_test.go b/types/optional_string_slice_test.go index 932d966fdf..ea38c195db 100644 --- a/types/optional_string_slice_test.go +++ b/types/optional_string_slice_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/types/optional_string_test.go b/types/optional_string_test.go index a0408ef83d..25d74ad48a 100644 --- a/types/optional_string_test.go +++ b/types/optional_string_test.go @@ -1,7 +1,7 @@ package types_test import ( - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "code.cloudfoundry.org/jsonry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/batcher/batcher.go b/util/batcher/batcher.go index 561e2c6539..794d61adf4 100644 --- a/util/batcher/batcher.go +++ b/util/batcher/batcher.go @@ -1,6 +1,6 @@ package batcher -import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" const BatchSize = 200 diff --git a/util/batcher/batcher_test.go b/util/batcher/batcher_test.go index 8fe4432bb6..838688bf1c 100644 --- a/util/batcher/batcher_test.go +++ b/util/batcher/batcher_test.go @@ -3,10 +3,10 @@ package batcher_test import ( "fmt" - "code.cloudfoundry.org/cli/v8/cf/errors" + "code.cloudfoundry.org/cli/v9/cf/errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/util/batcher" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/checksum_test.go b/util/checksum_test.go index 68ff3bb62f..2aaa86c347 100644 --- a/util/checksum_test.go +++ b/util/checksum_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/v8/util" + . "code.cloudfoundry.org/cli/v9/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/clissh/clisshfakes/fake_listener_factory.go b/util/clissh/clisshfakes/fake_listener_factory.go index f9414a3cc7..c61db5cdee 100644 --- a/util/clissh/clisshfakes/fake_listener_factory.go +++ b/util/clissh/clisshfakes/fake_listener_factory.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "code.cloudfoundry.org/cli/v8/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" ) type FakeListenerFactory struct { @@ -34,15 +34,16 @@ func (fake *FakeListenerFactory) Listen(arg1 string, arg2 string) (net.Listener, arg1 string arg2 string }{arg1, arg2}) + stub := fake.ListenStub + fakeReturns := fake.listenReturns fake.recordInvocation("Listen", []interface{}{arg1, arg2}) fake.listenMutex.Unlock() - if fake.ListenStub != nil { - return fake.ListenStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.listenReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/util/clissh/clisshfakes/fake_secure_client.go b/util/clissh/clisshfakes/fake_secure_client.go index 5dca1b7b4a..63e2d5ba55 100644 --- a/util/clissh/clisshfakes/fake_secure_client.go +++ b/util/clissh/clisshfakes/fake_secure_client.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "code.cloudfoundry.org/cli/v8/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" "golang.org/x/crypto/ssh" ) @@ -75,15 +75,16 @@ func (fake *FakeSecureClient) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -127,15 +128,16 @@ func (fake *FakeSecureClient) Conn() ssh.Conn { ret, specificReturn := fake.connReturnsOnCall[len(fake.connArgsForCall)] fake.connArgsForCall = append(fake.connArgsForCall, struct { }{}) + stub := fake.ConnStub + fakeReturns := fake.connReturns fake.recordInvocation("Conn", []interface{}{}) fake.connMutex.Unlock() - if fake.ConnStub != nil { - return fake.ConnStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.connReturns return fakeReturns.result1 } @@ -181,15 +183,16 @@ func (fake *FakeSecureClient) Dial(arg1 string, arg2 string) (net.Conn, error) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.DialStub + fakeReturns := fake.dialReturns fake.recordInvocation("Dial", []interface{}{arg1, arg2}) fake.dialMutex.Unlock() - if fake.DialStub != nil { - return fake.DialStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dialReturns return fakeReturns.result1, fakeReturns.result2 } @@ -243,15 +246,16 @@ func (fake *FakeSecureClient) NewSession() (clissh.SecureSession, error) { ret, specificReturn := fake.newSessionReturnsOnCall[len(fake.newSessionArgsForCall)] fake.newSessionArgsForCall = append(fake.newSessionArgsForCall, struct { }{}) + stub := fake.NewSessionStub + fakeReturns := fake.newSessionReturns fake.recordInvocation("NewSession", []interface{}{}) fake.newSessionMutex.Unlock() - if fake.NewSessionStub != nil { - return fake.NewSessionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.newSessionReturns return fakeReturns.result1, fakeReturns.result2 } @@ -298,15 +302,16 @@ func (fake *FakeSecureClient) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/util/clissh/clisshfakes/fake_secure_dialer.go b/util/clissh/clisshfakes/fake_secure_dialer.go index 6c799b145d..91db8d9132 100644 --- a/util/clissh/clisshfakes/fake_secure_dialer.go +++ b/util/clissh/clisshfakes/fake_secure_dialer.go @@ -4,7 +4,7 @@ package clisshfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" "golang.org/x/crypto/ssh" ) @@ -36,15 +36,16 @@ func (fake *FakeSecureDialer) Dial(arg1 string, arg2 string, arg3 *ssh.ClientCon arg2 string arg3 *ssh.ClientConfig }{arg1, arg2, arg3}) + stub := fake.DialStub + fakeReturns := fake.dialReturns fake.recordInvocation("Dial", []interface{}{arg1, arg2, arg3}) fake.dialMutex.Unlock() - if fake.DialStub != nil { - return fake.DialStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.dialReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/util/clissh/clisshfakes/fake_secure_session.go b/util/clissh/clisshfakes/fake_secure_session.go index 745fd6ae7a..5b0145a829 100644 --- a/util/clissh/clisshfakes/fake_secure_session.go +++ b/util/clissh/clisshfakes/fake_secure_session.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" "golang.org/x/crypto/ssh" ) @@ -125,15 +125,16 @@ func (fake *FakeSecureSession) Close() error { ret, specificReturn := fake.closeReturnsOnCall[len(fake.closeArgsForCall)] fake.closeArgsForCall = append(fake.closeArgsForCall, struct { }{}) + stub := fake.CloseStub + fakeReturns := fake.closeReturns fake.recordInvocation("Close", []interface{}{}) fake.closeMutex.Unlock() - if fake.CloseStub != nil { - return fake.CloseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.closeReturns return fakeReturns.result1 } @@ -181,15 +182,16 @@ func (fake *FakeSecureSession) RequestPty(arg1 string, arg2 int, arg3 int, arg4 arg3 int arg4 ssh.TerminalModes }{arg1, arg2, arg3, arg4}) + stub := fake.RequestPtyStub + fakeReturns := fake.requestPtyReturns fake.recordInvocation("RequestPty", []interface{}{arg1, arg2, arg3, arg4}) fake.requestPtyMutex.Unlock() - if fake.RequestPtyStub != nil { - return fake.RequestPtyStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1 } - fakeReturns := fake.requestPtyReturns return fakeReturns.result1 } @@ -248,15 +250,16 @@ func (fake *FakeSecureSession) SendRequest(arg1 string, arg2 bool, arg3 []byte) arg2 bool arg3 []byte }{arg1, arg2, arg3Copy}) + stub := fake.SendRequestStub + fakeReturns := fake.sendRequestReturns fake.recordInvocation("SendRequest", []interface{}{arg1, arg2, arg3Copy}) fake.sendRequestMutex.Unlock() - if fake.SendRequestStub != nil { - return fake.SendRequestStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.sendRequestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -310,15 +313,16 @@ func (fake *FakeSecureSession) Shell() error { ret, specificReturn := fake.shellReturnsOnCall[len(fake.shellArgsForCall)] fake.shellArgsForCall = append(fake.shellArgsForCall, struct { }{}) + stub := fake.ShellStub + fakeReturns := fake.shellReturns fake.recordInvocation("Shell", []interface{}{}) fake.shellMutex.Unlock() - if fake.ShellStub != nil { - return fake.ShellStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.shellReturns return fakeReturns.result1 } @@ -363,15 +367,16 @@ func (fake *FakeSecureSession) Start(arg1 string) error { fake.startArgsForCall = append(fake.startArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{arg1}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } @@ -422,15 +427,16 @@ func (fake *FakeSecureSession) StderrPipe() (io.Reader, error) { ret, specificReturn := fake.stderrPipeReturnsOnCall[len(fake.stderrPipeArgsForCall)] fake.stderrPipeArgsForCall = append(fake.stderrPipeArgsForCall, struct { }{}) + stub := fake.StderrPipeStub + fakeReturns := fake.stderrPipeReturns fake.recordInvocation("StderrPipe", []interface{}{}) fake.stderrPipeMutex.Unlock() - if fake.StderrPipeStub != nil { - return fake.StderrPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stderrPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -477,15 +483,16 @@ func (fake *FakeSecureSession) StdinPipe() (io.WriteCloser, error) { ret, specificReturn := fake.stdinPipeReturnsOnCall[len(fake.stdinPipeArgsForCall)] fake.stdinPipeArgsForCall = append(fake.stdinPipeArgsForCall, struct { }{}) + stub := fake.StdinPipeStub + fakeReturns := fake.stdinPipeReturns fake.recordInvocation("StdinPipe", []interface{}{}) fake.stdinPipeMutex.Unlock() - if fake.StdinPipeStub != nil { - return fake.StdinPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stdinPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -532,15 +539,16 @@ func (fake *FakeSecureSession) StdoutPipe() (io.Reader, error) { ret, specificReturn := fake.stdoutPipeReturnsOnCall[len(fake.stdoutPipeArgsForCall)] fake.stdoutPipeArgsForCall = append(fake.stdoutPipeArgsForCall, struct { }{}) + stub := fake.StdoutPipeStub + fakeReturns := fake.stdoutPipeReturns fake.recordInvocation("StdoutPipe", []interface{}{}) fake.stdoutPipeMutex.Unlock() - if fake.StdoutPipeStub != nil { - return fake.StdoutPipeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stdoutPipeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -587,15 +595,16 @@ func (fake *FakeSecureSession) Wait() error { ret, specificReturn := fake.waitReturnsOnCall[len(fake.waitArgsForCall)] fake.waitArgsForCall = append(fake.waitArgsForCall, struct { }{}) + stub := fake.WaitStub + fakeReturns := fake.waitReturns fake.recordInvocation("Wait", []interface{}{}) fake.waitMutex.Unlock() - if fake.WaitStub != nil { - return fake.WaitStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.waitReturns return fakeReturns.result1 } diff --git a/util/clissh/clisshfakes/fake_terminal_helper.go b/util/clissh/clisshfakes/fake_terminal_helper.go index 7e0e26ed5e..42e8955f01 100644 --- a/util/clissh/clisshfakes/fake_terminal_helper.go +++ b/util/clissh/clisshfakes/fake_terminal_helper.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh" "github.com/moby/term" ) @@ -85,15 +85,16 @@ func (fake *FakeTerminalHelper) GetFdInfo(arg1 interface{}) (uintptr, bool) { fake.getFdInfoArgsForCall = append(fake.getFdInfoArgsForCall, struct { arg1 interface{} }{arg1}) + stub := fake.GetFdInfoStub + fakeReturns := fake.getFdInfoReturns fake.recordInvocation("GetFdInfo", []interface{}{arg1}) fake.getFdInfoMutex.Unlock() - if fake.GetFdInfoStub != nil { - return fake.GetFdInfoStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getFdInfoReturns return fakeReturns.result1, fakeReturns.result2 } @@ -148,15 +149,16 @@ func (fake *FakeTerminalHelper) GetWinsize(arg1 uintptr) (*term.Winsize, error) fake.getWinsizeArgsForCall = append(fake.getWinsizeArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.GetWinsizeStub + fakeReturns := fake.getWinsizeReturns fake.recordInvocation("GetWinsize", []interface{}{arg1}) fake.getWinsizeMutex.Unlock() - if fake.GetWinsizeStub != nil { - return fake.GetWinsizeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getWinsizeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -212,15 +214,16 @@ func (fake *FakeTerminalHelper) RestoreTerminal(arg1 uintptr, arg2 *term.State) arg1 uintptr arg2 *term.State }{arg1, arg2}) + stub := fake.RestoreTerminalStub + fakeReturns := fake.restoreTerminalReturns fake.recordInvocation("RestoreTerminal", []interface{}{arg1, arg2}) fake.restoreTerminalMutex.Unlock() - if fake.RestoreTerminalStub != nil { - return fake.RestoreTerminalStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.restoreTerminalReturns return fakeReturns.result1 } @@ -272,15 +275,16 @@ func (fake *FakeTerminalHelper) SetRawTerminal(arg1 uintptr) (*term.State, error fake.setRawTerminalArgsForCall = append(fake.setRawTerminalArgsForCall, struct { arg1 uintptr }{arg1}) + stub := fake.SetRawTerminalStub + fakeReturns := fake.setRawTerminalReturns fake.recordInvocation("SetRawTerminal", []interface{}{arg1}) fake.setRawTerminalMutex.Unlock() - if fake.SetRawTerminalStub != nil { - return fake.SetRawTerminalStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setRawTerminalReturns return fakeReturns.result1, fakeReturns.result2 } @@ -334,15 +338,16 @@ func (fake *FakeTerminalHelper) StdStreams() (io.ReadCloser, io.Writer, io.Write ret, specificReturn := fake.stdStreamsReturnsOnCall[len(fake.stdStreamsArgsForCall)] fake.stdStreamsArgsForCall = append(fake.stdStreamsArgsForCall, struct { }{}) + stub := fake.StdStreamsStub + fakeReturns := fake.stdStreamsReturns fake.recordInvocation("StdStreams", []interface{}{}) fake.stdStreamsMutex.Unlock() - if fake.StdStreamsStub != nil { - return fake.StdStreamsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.stdStreamsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/util/clissh/ssh.go b/util/clissh/ssh.go index 851d3b479e..c20b50cd79 100644 --- a/util/clissh/ssh.go +++ b/util/clissh/ssh.go @@ -17,8 +17,8 @@ import ( "syscall" "time" - "code.cloudfoundry.org/cli/v8/cf/ssh/sigwinch" - "code.cloudfoundry.org/cli/v8/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v9/cf/ssh/sigwinch" + "code.cloudfoundry.org/cli/v9/util/clissh/ssherror" "github.com/moby/term" 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 e98b12bfc3..f0dd74ef40 100644 --- a/util/clissh/ssh_test.go +++ b/util/clissh/ssh_test.go @@ -17,9 +17,9 @@ import ( "syscall" "time" - . "code.cloudfoundry.org/cli/v8/util/clissh" - "code.cloudfoundry.org/cli/v8/util/clissh/clisshfakes" - "code.cloudfoundry.org/cli/v8/util/clissh/ssherror" + . "code.cloudfoundry.org/cli/v9/util/clissh" + "code.cloudfoundry.org/cli/v9/util/clissh/clisshfakes" + "code.cloudfoundry.org/cli/v9/util/clissh/ssherror" "code.cloudfoundry.org/diego-ssh/server" fake_server "code.cloudfoundry.org/diego-ssh/server/fakes" "code.cloudfoundry.org/diego-ssh/test_helpers" diff --git a/util/command_parser/command_parser.go b/util/command_parser/command_parser.go index 75ab630e73..5124e62565 100644 --- a/util/command_parser/command_parser.go +++ b/util/command_parser/command_parser.go @@ -7,13 +7,13 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/v8/cf/cmd" - "code.cloudfoundry.org/cli/v8/command" - "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/command/flag" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/cf/cmd" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/jessevdk/go-flags" log "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" diff --git a/util/command_parser/command_parser_test.go b/util/command_parser/command_parser_test.go index ea30a0cf65..8ed667a273 100644 --- a/util/command_parser/command_parser_test.go +++ b/util/command_parser/command_parser_test.go @@ -3,10 +3,10 @@ package command_parser_test import ( "io" - "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/util/command_parser" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/util/command_parser" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/command_parser/prevent_extra_args_v7.go b/util/command_parser/prevent_extra_args_v7.go index b1ca94816b..3b4e2e5008 100644 --- a/util/command_parser/prevent_extra_args_v7.go +++ b/util/command_parser/prevent_extra_args_v7.go @@ -3,7 +3,7 @@ package command_parser import ( "strings" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) func preventExtraArgs(args []string) error { diff --git a/util/command_parser/unknown_command_error.go b/util/command_parser/unknown_command_error.go index 26e2881224..9bbf7f0f1b 100644 --- a/util/command_parser/unknown_command_error.go +++ b/util/command_parser/unknown_command_error.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "code.cloudfoundry.org/cli/v8/cf/util/spellcheck" - "code.cloudfoundry.org/cli/v8/command/common" + "code.cloudfoundry.org/cli/v9/cf/util/spellcheck" + "code.cloudfoundry.org/cli/v9/command/common" ) type UnknownCommandError struct { diff --git a/util/configv3/color_test.go b/util/configv3/color_test.go index 3c80305d8e..a74bac43dd 100644 --- a/util/configv3/color_test.go +++ b/util/configv3/color_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config.go b/util/configv3/config.go index b25df4a14e..4b896d6c6a 100644 --- a/util/configv3/config.go +++ b/util/configv3/config.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strconv" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/version" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UserConfig diff --git a/util/configv3/config_suite_test.go b/util/configv3/config_suite_test.go index ed141f6c4f..0f1563d70a 100644 --- a/util/configv3/config_suite_test.go +++ b/util/configv3/config_suite_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "code.cloudfoundry.org/cli/v8/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config_test.go b/util/configv3/config_test.go index 2112ec5263..5eeb949e8b 100644 --- a/util/configv3/config_test.go +++ b/util/configv3/config_test.go @@ -3,7 +3,7 @@ package configv3_test import ( "os" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" . "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 3bdea01088..4cacfd940f 100644 --- a/util/configv3/config_unix_test.go +++ b/util/configv3/config_unix_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "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 75b3874b4a..09b2742e20 100644 --- a/util/configv3/config_windows_test.go +++ b/util/configv3/config_windows_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/configv3fakes/fake_user_config.go b/util/configv3/configv3fakes/fake_user_config.go index 7436d9b5bb..a67343add6 100644 --- a/util/configv3/configv3fakes/fake_user_config.go +++ b/util/configv3/configv3fakes/fake_user_config.go @@ -4,7 +4,7 @@ package configv3fakes import ( "sync" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) type FakeUserConfig struct { @@ -41,15 +41,16 @@ func (fake *FakeUserConfig) CurrentUser() (configv3.User, error) { ret, specificReturn := fake.currentUserReturnsOnCall[len(fake.currentUserArgsForCall)] fake.currentUserArgsForCall = append(fake.currentUserArgsForCall, struct { }{}) + stub := fake.CurrentUserStub + fakeReturns := fake.currentUserReturns fake.recordInvocation("CurrentUser", []interface{}{}) fake.currentUserMutex.Unlock() - if fake.CurrentUserStub != nil { - return fake.CurrentUserStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.currentUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -96,15 +97,16 @@ func (fake *FakeUserConfig) CurrentUserName() (string, error) { ret, specificReturn := fake.currentUserNameReturnsOnCall[len(fake.currentUserNameArgsForCall)] fake.currentUserNameArgsForCall = append(fake.currentUserNameArgsForCall, struct { }{}) + stub := fake.CurrentUserNameStub + fakeReturns := fake.currentUserNameReturns fake.recordInvocation("CurrentUserName", []interface{}{}) fake.currentUserNameMutex.Unlock() - if fake.CurrentUserNameStub != nil { - return fake.CurrentUserNameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.currentUserNameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/util/configv3/default_user_config_test.go b/util/configv3/default_user_config_test.go index b7d13ca6fe..f57dc81264 100644 --- a/util/configv3/default_user_config_test.go +++ b/util/configv3/default_user_config_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/dynamic_user_config_test.go b/util/configv3/dynamic_user_config_test.go index e094a51b52..55072183a2 100644 --- a/util/configv3/dynamic_user_config_test.go +++ b/util/configv3/dynamic_user_config_test.go @@ -3,8 +3,8 @@ package configv3_test import ( "errors" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/configv3/configv3fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3/configv3fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/env_test.go b/util/configv3/env_test.go index d20dced7e8..cee083a84b 100644 --- a/util/configv3/env_test.go +++ b/util/configv3/env_test.go @@ -3,7 +3,7 @@ package configv3_test import ( "time" - . "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "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 ef2a1a7b93..22bcf1c7f8 100644 --- a/util/configv3/json_config_test.go +++ b/util/configv3/json_config_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/k8s_test.go b/util/configv3/k8s_test.go index 342dbdfc51..b25b6c9c4a 100644 --- a/util/configv3/k8s_test.go +++ b/util/configv3/k8s_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" ) var _ = Describe("K8s", func() { diff --git a/util/configv3/kubernetes_user_config_test.go b/util/configv3/kubernetes_user_config_test.go index 518315e63c..9b74356605 100644 --- a/util/configv3/kubernetes_user_config_test.go +++ b/util/configv3/kubernetes_user_config_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/load_config.go b/util/configv3/load_config.go index 5eddefd8cd..acba199db2 100644 --- a/util/configv3/load_config.go +++ b/util/configv3/load_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/translatableerror" "golang.org/x/term" ) diff --git a/util/configv3/load_config_test.go b/util/configv3/load_config_test.go index 4971a65d13..19fd1d7927 100644 --- a/util/configv3/load_config_test.go +++ b/util/configv3/load_config_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/integration/helpers" - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/integration/helpers" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/locale_test.go b/util/configv3/locale_test.go index 69ed4b99c8..e4546b7776 100644 --- a/util/configv3/locale_test.go +++ b/util/configv3/locale_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "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 952e86d40a..4ee25a4182 100644 --- a/util/configv3/plugin_repository_test.go +++ b/util/configv3/plugin_repository_test.go @@ -1,7 +1,7 @@ package configv3_test import ( - . "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/plugins_config.go b/util/configv3/plugins_config.go index 7f47e477b4..ef61a4b983 100644 --- a/util/configv3/plugins_config.go +++ b/util/configv3/plugins_config.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/util" ) const notApplicable = "N/A" diff --git a/util/configv3/plugins_config_test.go b/util/configv3/plugins_config_test.go index f320db663f..f50b7d494d 100644 --- a/util/configv3/plugins_config_test.go +++ b/util/configv3/plugins_config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "syscall" - . "code.cloudfoundry.org/cli/v8/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/configv3" . "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 89536ded55..e7f7ad4aed 100644 --- a/util/configv3/write_config_test.go +++ b/util/configv3/write_config_test.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/util/configv3" "gopkg.in/yaml.v2" . "github.com/onsi/ginkgo/v2" diff --git a/util/download/downloader.go b/util/download/downloader.go index 9d5679696f..cb0f64982c 100644 --- a/util/download/downloader.go +++ b/util/download/downloader.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/util" ) type Downloader struct { diff --git a/util/download/downloader_test.go b/util/download/downloader_test.go index 439c2c09bf..c4dd7f5bc3 100644 --- a/util/download/downloader_test.go +++ b/util/download/downloader_test.go @@ -10,8 +10,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/v8/util/download" - "code.cloudfoundry.org/cli/v8/util/download/downloadfakes" + . "code.cloudfoundry.org/cli/v9/util/download" + "code.cloudfoundry.org/cli/v9/util/download/downloadfakes" ) var _ = Describe("Downloader", func() { diff --git a/util/download/downloadfakes/fake_httpclient.go b/util/download/downloadfakes/fake_httpclient.go index bc01e2da01..6fa4f6c07f 100644 --- a/util/download/downloadfakes/fake_httpclient.go +++ b/util/download/downloadfakes/fake_httpclient.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "code.cloudfoundry.org/cli/v8/util/download" + "code.cloudfoundry.org/cli/v9/util/download" ) type FakeHTTPClient struct { @@ -32,15 +32,16 @@ func (fake *FakeHTTPClient) Get(arg1 string) (*http.Response, error) { fake.getArgsForCall = append(fake.getArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetStub + fakeReturns := fake.getReturns fake.recordInvocation("Get", []interface{}{arg1}) fake.getMutex.Unlock() - if fake.GetStub != nil { - return fake.GetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/util/download/downloadfakes/fake_progress_bar.go b/util/download/downloadfakes/fake_progress_bar.go index a37e0047be..85b7913565 100644 --- a/util/download/downloadfakes/fake_progress_bar.go +++ b/util/download/downloadfakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/util/download" + "code.cloudfoundry.org/cli/v9/util/download" pb "gopkg.in/cheggaaa/pb.v1" ) @@ -54,9 +54,10 @@ func (fake *FakeProgressBar) Finish() { fake.finishMutex.Lock() fake.finishArgsForCall = append(fake.finishArgsForCall, struct { }{}) + stub := fake.FinishStub fake.recordInvocation("Finish", []interface{}{}) fake.finishMutex.Unlock() - if fake.FinishStub != nil { + if stub != nil { fake.FinishStub() } } @@ -79,15 +80,16 @@ func (fake *FakeProgressBar) NewProxyReader(arg1 io.Reader) *pb.Reader { fake.newProxyReaderArgsForCall = append(fake.newProxyReaderArgsForCall, struct { arg1 io.Reader }{arg1}) + stub := fake.NewProxyReaderStub + fakeReturns := fake.newProxyReaderReturns fake.recordInvocation("NewProxyReader", []interface{}{arg1}) fake.newProxyReaderMutex.Unlock() - if fake.NewProxyReaderStub != nil { - return fake.NewProxyReaderStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.newProxyReaderReturns return fakeReturns.result1 } @@ -139,15 +141,16 @@ func (fake *FakeProgressBar) SetTotal(arg1 int) *pb.ProgressBar { fake.setTotalArgsForCall = append(fake.setTotalArgsForCall, struct { arg1 int }{arg1}) + stub := fake.SetTotalStub + fakeReturns := fake.setTotalReturns fake.recordInvocation("SetTotal", []interface{}{arg1}) fake.setTotalMutex.Unlock() - if fake.SetTotalStub != nil { - return fake.SetTotalStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.setTotalReturns return fakeReturns.result1 } @@ -198,15 +201,16 @@ func (fake *FakeProgressBar) Start() *pb.ProgressBar { ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] fake.startArgsForCall = append(fake.startArgsForCall, struct { }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.startReturns return fakeReturns.result1 } diff --git a/util/extract/extract.go b/util/extract/extract.go index 25ff0435ad..75a67d52c5 100644 --- a/util/extract/extract.go +++ b/util/extract/extract.go @@ -4,7 +4,7 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/v8/util/unique" + "code.cloudfoundry.org/cli/v9/util/unique" ) type appender func(string) diff --git a/util/extract/extract_test.go b/util/extract/extract_test.go index b7fc5955c3..e3856ea758 100644 --- a/util/extract/extract_test.go +++ b/util/extract/extract_test.go @@ -1,7 +1,7 @@ package extract_test import ( - "code.cloudfoundry.org/cli/v8/util/extract" + "code.cloudfoundry.org/cli/v9/util/extract" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/architecture_test.go b/util/generic/architecture_test.go index 1ae5bb0843..c4e7088034 100644 --- a/util/generic/architecture_test.go +++ b/util/generic/architecture_test.go @@ -1,7 +1,7 @@ package generic_test import ( - . "code.cloudfoundry.org/cli/v8/util/generic" + . "code.cloudfoundry.org/cli/v9/util/generic" . "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 620340c5d4..f45b8b2f97 100644 --- a/util/generic/executable_filename_unix_test.go +++ b/util/generic/executable_filename_unix_test.go @@ -6,7 +6,7 @@ package generic_test import ( "path/filepath" - . "code.cloudfoundry.org/cli/v8/util/generic" + . "code.cloudfoundry.org/cli/v9/util/generic" . "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 82fc055e56..8358e65e7e 100644 --- a/util/generic/executable_filename_windows_test.go +++ b/util/generic/executable_filename_windows_test.go @@ -7,7 +7,7 @@ import ( "fmt" "path/filepath" - . "code.cloudfoundry.org/cli/v8/util/generic" + . "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/map_test.go b/util/generic/map_test.go index 3be5bdc51c..686109c037 100644 --- a/util/generic/map_test.go +++ b/util/generic/map_test.go @@ -1,7 +1,7 @@ package generic_test import ( - . "code.cloudfoundry.org/cli/v8/util/generic" + . "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/slice_test.go b/util/generic/slice_test.go index f4dfcec92a..64d706debd 100644 --- a/util/generic/slice_test.go +++ b/util/generic/slice_test.go @@ -1,7 +1,7 @@ package generic_test import ( - "code.cloudfoundry.org/cli/v8/util/generic" + "code.cloudfoundry.org/cli/v9/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/lookuptable/name_from_guid_test.go b/util/lookuptable/name_from_guid_test.go index d44a4f88a7..ebc21b69bf 100644 --- a/util/lookuptable/name_from_guid_test.go +++ b/util/lookuptable/name_from_guid_test.go @@ -1,7 +1,7 @@ package lookuptable_test import ( - "code.cloudfoundry.org/cli/v8/util/lookuptable" + "code.cloudfoundry.org/cli/v9/util/lookuptable" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/lookuptable/resource_from_guid.go b/util/lookuptable/resource_from_guid.go index e8a42d7648..791b7b6caa 100644 --- a/util/lookuptable/resource_from_guid.go +++ b/util/lookuptable/resource_from_guid.go @@ -1,6 +1,6 @@ package lookuptable -import "code.cloudfoundry.org/cli/v8/resources" +import "code.cloudfoundry.org/cli/v9/resources" func OrgFromGUID(orgs []resources.Organization) map[string]resources.Organization { result := make(map[string]resources.Organization) diff --git a/util/manifest/application.go b/util/manifest/application.go index 708f2d1622..963831c75b 100644 --- a/util/manifest/application.go +++ b/util/manifest/application.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" ) type Application struct { diff --git a/util/manifest/manifest_test.go b/util/manifest/manifest_test.go index e43cf7bf1a..f6a85f7dc6 100644 --- a/util/manifest/manifest_test.go +++ b/util/manifest/manifest_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/v8/types" - . "code.cloudfoundry.org/cli/v8/util/manifest" + "code.cloudfoundry.org/cli/v9/types" + . "code.cloudfoundry.org/cli/v9/util/manifest" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" diff --git a/util/manifest/manifest_unix_test.go b/util/manifest/manifest_unix_test.go index 26476a80a6..e598a02776 100644 --- a/util/manifest/manifest_unix_test.go +++ b/util/manifest/manifest_unix_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/util/manifest" + . "code.cloudfoundry.org/cli/v9/util/manifest" . "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 9c81592795..ec5dfecc4e 100644 --- a/util/manifest/manifest_windows_test.go +++ b/util/manifest/manifest_windows_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/util/manifest" + . "code.cloudfoundry.org/cli/v9/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/application.go b/util/manifestparser/application.go index 6c0f5c8dc3..0e19ba1018 100644 --- a/util/manifestparser/application.go +++ b/util/manifestparser/application.go @@ -4,7 +4,7 @@ import ( "errors" "reflect" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type Docker struct { diff --git a/util/manifestparser/application_test.go b/util/manifestparser/application_test.go index 9f52d3a16c..80f1ad4c17 100644 --- a/util/manifestparser/application_test.go +++ b/util/manifestparser/application_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" "gopkg.in/yaml.v2" . "github.com/onsi/ginkgo/v2" diff --git a/util/manifestparser/locator_test.go b/util/manifestparser/locator_test.go index 74099d2531..0413f18de7 100644 --- a/util/manifestparser/locator_test.go +++ b/util/manifestparser/locator_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/manifest_test.go b/util/manifestparser/manifest_test.go index 855cc81488..76b0311908 100644 --- a/util/manifestparser/manifest_test.go +++ b/util/manifestparser/manifest_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" diff --git a/util/manifestparser/parser_test.go b/util/manifestparser/parser_test.go index 16e1071e52..6141827f81 100644 --- a/util/manifestparser/parser_test.go +++ b/util/manifestparser/parser_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/process.go b/util/manifestparser/process.go index 39b9113e63..a4146d9f39 100644 --- a/util/manifestparser/process.go +++ b/util/manifestparser/process.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type Process struct { diff --git a/util/manifestparser/process_test.go b/util/manifestparser/process_test.go index 29ca131311..2f2a9680bb 100644 --- a/util/manifestparser/process_test.go +++ b/util/manifestparser/process_test.go @@ -1,7 +1,7 @@ package manifestparser_test import ( - . "code.cloudfoundry.org/cli/v8/util/manifestparser" + . "code.cloudfoundry.org/cli/v9/util/manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" diff --git a/util/panichandler/handler.go b/util/panichandler/handler.go index c8e1a1c317..9451b1e20c 100644 --- a/util/panichandler/handler.go +++ b/util/panichandler/handler.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/version" ) const maxStackSizeLimit = 1024 * 1024 diff --git a/util/plugin/plugin.go b/util/plugin/plugin.go index 7ee637ae42..9dbb4982c1 100644 --- a/util/plugin/plugin.go +++ b/util/plugin/plugin.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - plugin_transition "code.cloudfoundry.org/cli/v8/plugin/transition" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + plugin_transition "code.cloudfoundry.org/cli/v9/plugin/transition" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" - "code.cloudfoundry.org/cli/v8/command/common" - "code.cloudfoundry.org/cli/v8/command/translatableerror" + "code.cloudfoundry.org/cli/v9/command/common" + "code.cloudfoundry.org/cli/v9/command/translatableerror" ) var ErrFailed = errors.New("command failed") diff --git a/util/railway/railway.go b/util/railway/railway.go index 04b8cc529d..0ca22c4a2f 100644 --- a/util/railway/railway.go +++ b/util/railway/railway.go @@ -1,6 +1,6 @@ package railway -import "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" +import "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" type funcWithWarningsAndError = func() (ccv3.Warnings, error) diff --git a/util/railway/railway_test.go b/util/railway/railway_test.go index 9e8c0e80ac..3c82445ef4 100644 --- a/util/railway/railway_test.go +++ b/util/railway/railway_test.go @@ -3,8 +3,8 @@ package railway_test import ( "errors" - "code.cloudfoundry.org/cli/v8/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/v8/util/railway" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/util/railway" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/randomword/generator_test.go b/util/randomword/generator_test.go index 606f0455fd..236ab24d43 100644 --- a/util/randomword/generator_test.go +++ b/util/randomword/generator_test.go @@ -1,7 +1,7 @@ package randomword_test import ( - . "code.cloudfoundry.org/cli/v8/util/randomword" + . "code.cloudfoundry.org/cli/v9/util/randomword" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/sorting/alphabetic_test.go b/util/sorting/alphabetic_test.go index 53a57b8417..37c84e0983 100644 --- a/util/sorting/alphabetic_test.go +++ b/util/sorting/alphabetic_test.go @@ -3,7 +3,7 @@ package sorting_test import ( "sort" - . "code.cloudfoundry.org/cli/v8/util/sorting" + . "code.cloudfoundry.org/cli/v9/util/sorting" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/tls_test.go b/util/tls_test.go index b3df44184c..695a8c98e8 100644 --- a/util/tls_test.go +++ b/util/tls_test.go @@ -5,7 +5,7 @@ import ( "crypto/x509" "encoding/pem" - . "code.cloudfoundry.org/cli/v8/util" + . "code.cloudfoundry.org/cli/v9/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/ui/config.go b/util/ui/config.go index 33145ced07..a37d1f840d 100644 --- a/util/ui/config.go +++ b/util/ui/config.go @@ -1,6 +1,6 @@ package ui -import "code.cloudfoundry.org/cli/v8/util/configv3" +import "code.cloudfoundry.org/cli/v9/util/configv3" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/util/ui/i18n.go b/util/ui/i18n.go index 3aa2eb03b6..763db6ed8d 100644 --- a/util/ui/i18n.go +++ b/util/ui/i18n.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "code.cloudfoundry.org/cli/v8/i18n/resources" + "code.cloudfoundry.org/cli/v9/i18n/resources" log "github.com/sirupsen/logrus" "golang.org/x/text/language" ) diff --git a/util/ui/i18n_test.go b/util/ui/i18n_test.go index c7697ecf75..c8acc67729 100644 --- a/util/ui/i18n_test.go +++ b/util/ui/i18n_test.go @@ -1,8 +1,8 @@ package ui_test import ( - . "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/util/ui/uifakes" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "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 da9796d320..e5d2a8fdd4 100644 --- a/util/ui/log_message_test.go +++ b/util/ui/log_message_test.go @@ -3,9 +3,9 @@ package ui_test import ( "time" - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "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 387423c162..93823f3fbf 100644 --- a/util/ui/prompt_test.go +++ b/util/ui/prompt_test.go @@ -3,9 +3,9 @@ package ui_test import ( "regexp" - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/request_logger_file_writer_test.go b/util/ui/request_logger_file_writer_test.go index a7a3e190ef..1f934e0c4e 100644 --- a/util/ui/request_logger_file_writer_test.go +++ b/util/ui/request_logger_file_writer_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/v8/util/ui" + . "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/request_logger_terminal_display_test.go b/util/ui/request_logger_terminal_display_test.go index 5159b2ef1c..88be5802e2 100644 --- a/util/ui/request_logger_terminal_display_test.go +++ b/util/ui/request_logger_terminal_display_test.go @@ -5,7 +5,7 @@ import ( "regexp" "time" - . "code.cloudfoundry.org/cli/v8/util/ui" + . "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/sanitize_json_test.go b/util/ui/sanitize_json_test.go index 5511ae3b0c..8e4373d7d6 100644 --- a/util/ui/sanitize_json_test.go +++ b/util/ui/sanitize_json_test.go @@ -3,7 +3,7 @@ package ui_test import ( "strings" - . "code.cloudfoundry.org/cli/v8/util/ui" + . "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/ui/table_test.go b/util/ui/table_test.go index abfb7721cf..172d5f7113 100644 --- a/util/ui/table_test.go +++ b/util/ui/table_test.go @@ -3,9 +3,9 @@ package ui_test import ( "strings" - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui.go b/util/ui/ui.go index 53f9ffa8a5..d3fce4d85f 100644 --- a/util/ui/ui.go +++ b/util/ui/ui.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/command/translatableerror" - "code.cloudfoundry.org/cli/v8/util/configv3" + "code.cloudfoundry.org/cli/v9/command/translatableerror" + "code.cloudfoundry.org/cli/v9/util/configv3" "github.com/fatih/color" runewidth "github.com/mattn/go-runewidth" "github.com/vito/go-interact/interact" diff --git a/util/ui/ui_for_app_test.go b/util/ui/ui_for_app_test.go index 54779afba2..cd53674f11 100644 --- a/util/ui/ui_for_app_test.go +++ b/util/ui/ui_for_app_test.go @@ -1,9 +1,9 @@ package ui_test import ( - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui_for_push.go b/util/ui/ui_for_push.go index 2d84d075f1..c657d90b16 100644 --- a/util/ui/ui_for_push.go +++ b/util/ui/ui_for_push.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/v8/types" + "code.cloudfoundry.org/cli/v9/types" "github.com/fatih/color" ) diff --git a/util/ui/ui_for_push_test.go b/util/ui/ui_for_push_test.go index d686cdeb5a..fc0c61d4e7 100644 --- a/util/ui/ui_for_push_test.go +++ b/util/ui/ui_for_push_test.go @@ -3,10 +3,10 @@ package ui_test import ( "regexp" - "code.cloudfoundry.org/cli/v8/types" - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/types" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/ui_test.go b/util/ui/ui_test.go index 801ea9cc92..4e26bd7199 100644 --- a/util/ui/ui_test.go +++ b/util/ui/ui_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/v8/command/translatableerror/translatableerrorfakes" - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/command/translatableerror/translatableerrorfakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "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 8570f9f836..212fa962a9 100644 --- a/util/ui/ui_v7_test.go +++ b/util/ui/ui_v7_test.go @@ -1,9 +1,9 @@ package ui_test import ( - "code.cloudfoundry.org/cli/v8/util/configv3" - . "code.cloudfoundry.org/cli/v8/util/ui" - "code.cloudfoundry.org/cli/v8/util/ui/uifakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + . "code.cloudfoundry.org/cli/v9/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui/uifakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/util/ui/uifakes/fake_config.go b/util/ui/uifakes/fake_config.go index b4844f0d96..5a5b5e0142 100644 --- a/util/ui/uifakes/fake_config.go +++ b/util/ui/uifakes/fake_config.go @@ -4,8 +4,8 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/util/configv3" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeConfig struct { diff --git a/util/ui/uifakes/fake_exiter.go b/util/ui/uifakes/fake_exiter.go index ce558bdbef..3627006745 100644 --- a/util/ui/uifakes/fake_exiter.go +++ b/util/ui/uifakes/fake_exiter.go @@ -4,7 +4,7 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeExiter struct { diff --git a/util/ui/uifakes/fake_interactor.go b/util/ui/uifakes/fake_interactor.go index 2c86eaa9e2..79aa352091 100644 --- a/util/ui/uifakes/fake_interactor.go +++ b/util/ui/uifakes/fake_interactor.go @@ -4,7 +4,7 @@ package uifakes import ( "sync" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" "github.com/vito/go-interact/interact" ) diff --git a/util/ui/uifakes/fake_log_message.go b/util/ui/uifakes/fake_log_message.go index 3e05a8b6b5..b502a31864 100644 --- a/util/ui/uifakes/fake_log_message.go +++ b/util/ui/uifakes/fake_log_message.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeLogMessage struct { diff --git a/util/ui/uifakes/fake_resolver.go b/util/ui/uifakes/fake_resolver.go index e92be1e891..02c2c43c58 100644 --- a/util/ui/uifakes/fake_resolver.go +++ b/util/ui/uifakes/fake_resolver.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/v8/util/ui" + "code.cloudfoundry.org/cli/v9/util/ui" ) type FakeResolver struct { diff --git a/util/unique/string_slice_test.go b/util/unique/string_slice_test.go index 34d6ec71de..5e61fab9bc 100644 --- a/util/unique/string_slice_test.go +++ b/util/unique/string_slice_test.go @@ -1,7 +1,7 @@ package unique_test import ( - "code.cloudfoundry.org/cli/v8/util/unique" + "code.cloudfoundry.org/cli/v9/util/unique" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/url_test.go b/util/url_test.go index 811a06ef61..03a224266a 100644 --- a/util/url_test.go +++ b/util/url_test.go @@ -1,7 +1,7 @@ package util_test import ( - . "code.cloudfoundry.org/cli/v8/util" + . "code.cloudfoundry.org/cli/v9/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/utilfakes/fake_sha1checksum.go b/util/utilfakes/fake_sha1checksum.go index 436c48ef65..fe54d1289e 100644 --- a/util/utilfakes/fake_sha1checksum.go +++ b/util/utilfakes/fake_sha1checksum.go @@ -4,7 +4,7 @@ package utilfakes import ( "sync" - "code.cloudfoundry.org/cli/v8/util" + "code.cloudfoundry.org/cli/v9/util" ) type FakeSha1Checksum struct { @@ -46,15 +46,16 @@ func (fake *FakeSha1Checksum) CheckSha1(arg1 string) bool { fake.checkSha1ArgsForCall = append(fake.checkSha1ArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CheckSha1Stub + fakeReturns := fake.checkSha1Returns fake.recordInvocation("CheckSha1", []interface{}{arg1}) fake.checkSha1Mutex.Unlock() - if fake.CheckSha1Stub != nil { - return fake.CheckSha1Stub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.checkSha1Returns return fakeReturns.result1 } @@ -105,15 +106,16 @@ func (fake *FakeSha1Checksum) ComputeFileSha1() ([]byte, error) { ret, specificReturn := fake.computeFileSha1ReturnsOnCall[len(fake.computeFileSha1ArgsForCall)] fake.computeFileSha1ArgsForCall = append(fake.computeFileSha1ArgsForCall, struct { }{}) + stub := fake.ComputeFileSha1Stub + fakeReturns := fake.computeFileSha1Returns fake.recordInvocation("ComputeFileSha1", []interface{}{}) fake.computeFileSha1Mutex.Unlock() - if fake.ComputeFileSha1Stub != nil { - return fake.ComputeFileSha1Stub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.computeFileSha1Returns return fakeReturns.result1, fakeReturns.result2 } @@ -160,9 +162,10 @@ func (fake *FakeSha1Checksum) SetFilePath(arg1 string) { fake.setFilePathArgsForCall = append(fake.setFilePathArgsForCall, struct { arg1 string }{arg1}) + stub := fake.SetFilePathStub fake.recordInvocation("SetFilePath", []interface{}{arg1}) fake.setFilePathMutex.Unlock() - if fake.SetFilePathStub != nil { + if stub != nil { fake.SetFilePathStub(arg1) } } diff --git a/version/version_test.go b/version/version_test.go index f1a65d9c04..654e1d894d 100644 --- a/version/version_test.go +++ b/version/version_test.go @@ -1,7 +1,7 @@ package version_test import ( - "code.cloudfoundry.org/cli/v8/version" + "code.cloudfoundry.org/cli/v9/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) From 87c5248c61e140670be139e9a2aa4790f1ab9ab0 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:25:45 +0200 Subject: [PATCH 06/19] update make to properly update the v9 module version variables --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dabbe1d5c7..b6f31d305e 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,10 @@ CF_BUILD_VERSION ?= $$(cat BUILD_VERSION) # TODO: version specific CF_BUILD_SHA ?= $$(git rev-parse --short HEAD) CF_BUILD_DATE ?= $$(date -u +"%Y-%m-%d") LD_FLAGS_COMMON=-w -s \ - -X code.cloudfoundry.org/cli/version.binarySHA=$(CF_BUILD_SHA) \ - -X code.cloudfoundry.org/cli/version.binaryBuildDate=$(CF_BUILD_DATE) + -X code.cloudfoundry.org/cli/v9/version.binarySHA=$(CF_BUILD_SHA) \ + -X code.cloudfoundry.org/cli/v9/version.binaryBuildDate=$(CF_BUILD_DATE) LD_FLAGS =$(LD_FLAGS_COMMON) \ - -X code.cloudfoundry.org/cli/version.binaryVersion=$(CF_BUILD_VERSION) + -X code.cloudfoundry.org/cli/v9/version.binaryVersion=$(CF_BUILD_VERSION) LD_FLAGS_LINUX = -extldflags \"-static\" $(LD_FLAGS) REQUIRED_FOR_STATIC_BINARY =-a -tags "netgo" -installsuffix netgo GOSRC = $(shell find . -name "*.go" ! -name "*test.go" ! -name "*fake*" ! -path "./integration/*") From 3a9883c2a1ee4ce6e78ab55b1cc65a3a83b26e75 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:37:54 +0100 Subject: [PATCH 07/19] merge upstream and add cfnetworking as api --- .../fake_networking_client.go | 2 +- actor/cfnetworkingaction/networking_client.go | 2 +- actor/cfnetworkingaction/policy.go | 2 +- actor/cfnetworkingaction/policy_test.go | 2 +- .../cfnetv1/cfnetv1_suite_test.go | 55 ++ .../cfnetv1fakes/fake_connection_wrapper.go | 162 +++++ api/cfnetworking/cfnetv1/client.go | 136 ++++ .../cfnetv1/connection_wrapper.go | 17 + api/cfnetworking/cfnetv1/internal/routes.go | 21 + api/cfnetworking/cfnetv1/policy.go | 104 +++ api/cfnetworking/cfnetv1/policy_test.go | 339 ++++++++++ api/cfnetworking/cfnetv1/ports.go | 6 + api/cfnetworking/cfnetv1/request.go | 70 ++ api/cfnetworking/cfnetworking_suite_test.go | 35 + .../cfnetworkingfakes/fake_connection.go | 100 +++ .../cfnetworkingfakes/fake_read_seeker.go | 176 +++++ api/cfnetworking/connection.go | 8 + api/cfnetworking/errors.go | 64 ++ api/cfnetworking/errors_test.go | 37 ++ .../networkerror/bad_request_error.go | 9 + .../networkerror/conflict_error.go | 9 + .../networkerror/error_response.go | 9 + .../networkerror/forbidden_error.go | 9 + .../networkerror/invalid_auth_token_error.go | 11 + .../networkerror/not_acceptable_error.go | 9 + .../networkerror/not_found_error.go | 10 + .../networkerror/raw_http_status_error.go | 14 + .../networkerror/request_error.go | 11 + .../ssl_validation_hostname_error.go | 13 + .../networkerror/unauthorized_error.go | 9 + .../networkerror/unexpected_response_error.go | 20 + .../networkerror/unverified_server_error.go | 11 + api/cfnetworking/networking_connection.go | 126 ++++ .../networking_connection_test.go | 251 +++++++ api/cfnetworking/request.go | 35 + api/cfnetworking/response.go | 29 + api/cfnetworking/wrapper/request_logger.go | 156 +++++ .../wrapper/request_logger_test.go | 328 ++++++++++ api/cfnetworking/wrapper/retry_request.go | 54 ++ .../wrapper/retry_request_test.go | 111 ++++ .../wrapper/uaa_authentication.go | 81 +++ .../wrapper/uaa_authentication_test.go | 174 +++++ .../wrapper/util/in_memory_cache.go | 26 + .../wrapper/wrapper_suite_test.go | 36 + .../fake_request_logger_output.go | 613 ++++++++++++++++++ .../wrapper/wrapperfakes/fake_token_cache.go | 201 ++++++ .../wrapper/wrapperfakes/fake_uaaclient.go | 104 +++ api/uaa/client.go | 9 - command/v7/shared/new_clients_test.go | 4 +- command/v7/shared/new_networking_client.go | 6 +- command/v7/task_command.go | 4 +- command/v7/task_command_test.go | 20 +- go.mod | 1 - 53 files changed, 3820 insertions(+), 31 deletions(-) create mode 100644 api/cfnetworking/cfnetv1/cfnetv1_suite_test.go create mode 100644 api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go create mode 100644 api/cfnetworking/cfnetv1/client.go create mode 100644 api/cfnetworking/cfnetv1/connection_wrapper.go create mode 100644 api/cfnetworking/cfnetv1/internal/routes.go create mode 100644 api/cfnetworking/cfnetv1/policy.go create mode 100644 api/cfnetworking/cfnetv1/policy_test.go create mode 100644 api/cfnetworking/cfnetv1/ports.go create mode 100644 api/cfnetworking/cfnetv1/request.go create mode 100644 api/cfnetworking/cfnetworking_suite_test.go create mode 100644 api/cfnetworking/cfnetworkingfakes/fake_connection.go create mode 100644 api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go create mode 100644 api/cfnetworking/connection.go create mode 100644 api/cfnetworking/errors.go create mode 100644 api/cfnetworking/errors_test.go create mode 100644 api/cfnetworking/networkerror/bad_request_error.go create mode 100644 api/cfnetworking/networkerror/conflict_error.go create mode 100644 api/cfnetworking/networkerror/error_response.go create mode 100644 api/cfnetworking/networkerror/forbidden_error.go create mode 100644 api/cfnetworking/networkerror/invalid_auth_token_error.go create mode 100644 api/cfnetworking/networkerror/not_acceptable_error.go create mode 100644 api/cfnetworking/networkerror/not_found_error.go create mode 100644 api/cfnetworking/networkerror/raw_http_status_error.go create mode 100644 api/cfnetworking/networkerror/request_error.go create mode 100644 api/cfnetworking/networkerror/ssl_validation_hostname_error.go create mode 100644 api/cfnetworking/networkerror/unauthorized_error.go create mode 100644 api/cfnetworking/networkerror/unexpected_response_error.go create mode 100644 api/cfnetworking/networkerror/unverified_server_error.go create mode 100644 api/cfnetworking/networking_connection.go create mode 100644 api/cfnetworking/networking_connection_test.go create mode 100644 api/cfnetworking/request.go create mode 100644 api/cfnetworking/response.go create mode 100644 api/cfnetworking/wrapper/request_logger.go create mode 100644 api/cfnetworking/wrapper/request_logger_test.go create mode 100644 api/cfnetworking/wrapper/retry_request.go create mode 100644 api/cfnetworking/wrapper/retry_request_test.go create mode 100644 api/cfnetworking/wrapper/uaa_authentication.go create mode 100644 api/cfnetworking/wrapper/uaa_authentication_test.go create mode 100644 api/cfnetworking/wrapper/util/in_memory_cache.go create mode 100644 api/cfnetworking/wrapper/wrapper_suite_test.go create mode 100644 api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go create mode 100644 api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go create mode 100644 api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go index 48d4815b4c..748af078b4 100644 --- a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go +++ b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go @@ -4,8 +4,8 @@ package cfnetworkingactionfakes import ( "sync" - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" ) type FakeNetworkingClient struct { diff --git a/actor/cfnetworkingaction/networking_client.go b/actor/cfnetworkingaction/networking_client.go index 46fe668573..a647fd92c9 100644 --- a/actor/cfnetworkingaction/networking_client.go +++ b/actor/cfnetworkingaction/networking_client.go @@ -1,6 +1,6 @@ package cfnetworkingaction -import "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" +import "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . NetworkingClient diff --git a/actor/cfnetworkingaction/policy.go b/actor/cfnetworkingaction/policy.go index fcab2d17bf..97e25eaafc 100644 --- a/actor/cfnetworkingaction/policy.go +++ b/actor/cfnetworkingaction/policy.go @@ -1,8 +1,8 @@ package cfnetworkingaction import ( - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/v9/resources" diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go index f092014052..4dfc333325 100644 --- a/actor/cfnetworkingaction/policy_test.go +++ b/actor/cfnetworkingaction/policy_test.go @@ -9,10 +9,10 @@ import ( "code.cloudfoundry.org/cli/v9/resources" "code.cloudfoundry.org/cli/v9/util/batcher" - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" "code.cloudfoundry.org/cli/v9/actor/actionerror" . "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction" "code.cloudfoundry.org/cli/v9/actor/cfnetworkingaction/cfnetworkingactionfakes" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go b/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go new file mode 100644 index 0000000000..6c9c74a9ec --- /dev/null +++ b/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go @@ -0,0 +1,55 @@ +package cfnetv1_test + +import ( + "bytes" + "log" + "testing" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +func TestCFNetV1(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "CF Networking V1 Client Suite") +} + +var server *Server + +var _ = SynchronizedBeforeSuite(func() []byte { + return []byte{} +}, func(data []byte) { + server = NewTLSServer() + + // Suppresses ginkgo server logs + server.HTTPTestServer.Config.ErrorLog = log.New(&bytes.Buffer{}, "", 0) +}) + +var _ = SynchronizedAfterSuite(func() { + server.Close() +}, func() {}) + +var _ = BeforeEach(func() { + server.Reset() +}) + +func NewTestClient(passed ...Config) *Client { + var config Config + if len(passed) > 0 { + config = passed[0] + } else { + config = Config{} + } + config.AppName = "CF Networking V1 Test" + config.AppVersion = "Unknown" + config.SkipSSLValidation = true + + if config.URL == "" { + config.URL = server.URL() + } + + return NewClient(config) +} diff --git a/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go b/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go new file mode 100644 index 0000000000..f1fb21e68c --- /dev/null +++ b/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go @@ -0,0 +1,162 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetv1fakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" +) + +type FakeConnectionWrapper struct { + MakeStub func(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error + makeMutex sync.RWMutex + makeArgsForCall []struct { + request *cfnetworking.Request + passedResponse *cfnetworking.Response + } + makeReturns struct { + result1 error + } + makeReturnsOnCall map[int]struct { + result1 error + } + WrapStub func(innerconnection cfnetworking.Connection) cfnetworking.Connection + wrapMutex sync.RWMutex + wrapArgsForCall []struct { + innerconnection cfnetworking.Connection + } + wrapReturns struct { + result1 cfnetworking.Connection + } + wrapReturnsOnCall map[int]struct { + result1 cfnetworking.Connection + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeConnectionWrapper) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + fake.makeMutex.Lock() + ret, specificReturn := fake.makeReturnsOnCall[len(fake.makeArgsForCall)] + fake.makeArgsForCall = append(fake.makeArgsForCall, struct { + request *cfnetworking.Request + passedResponse *cfnetworking.Response + }{request, passedResponse}) + fake.recordInvocation("Make", []interface{}{request, passedResponse}) + fake.makeMutex.Unlock() + if fake.MakeStub != nil { + return fake.MakeStub(request, passedResponse) + } + if specificReturn { + return ret.result1 + } + return fake.makeReturns.result1 +} + +func (fake *FakeConnectionWrapper) MakeCallCount() int { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + return len(fake.makeArgsForCall) +} + +func (fake *FakeConnectionWrapper) MakeArgsForCall(i int) (*cfnetworking.Request, *cfnetworking.Response) { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + return fake.makeArgsForCall[i].request, fake.makeArgsForCall[i].passedResponse +} + +func (fake *FakeConnectionWrapper) MakeReturns(result1 error) { + fake.MakeStub = nil + fake.makeReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeConnectionWrapper) MakeReturnsOnCall(i int, result1 error) { + fake.MakeStub = nil + if fake.makeReturnsOnCall == nil { + fake.makeReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.makeReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeConnectionWrapper) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { + fake.wrapMutex.Lock() + ret, specificReturn := fake.wrapReturnsOnCall[len(fake.wrapArgsForCall)] + fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { + innerconnection cfnetworking.Connection + }{innerconnection}) + fake.recordInvocation("Wrap", []interface{}{innerconnection}) + fake.wrapMutex.Unlock() + if fake.WrapStub != nil { + return fake.WrapStub(innerconnection) + } + if specificReturn { + return ret.result1 + } + return fake.wrapReturns.result1 +} + +func (fake *FakeConnectionWrapper) WrapCallCount() int { + fake.wrapMutex.RLock() + defer fake.wrapMutex.RUnlock() + return len(fake.wrapArgsForCall) +} + +func (fake *FakeConnectionWrapper) WrapArgsForCall(i int) cfnetworking.Connection { + fake.wrapMutex.RLock() + defer fake.wrapMutex.RUnlock() + return fake.wrapArgsForCall[i].innerconnection +} + +func (fake *FakeConnectionWrapper) WrapReturns(result1 cfnetworking.Connection) { + fake.WrapStub = nil + fake.wrapReturns = struct { + result1 cfnetworking.Connection + }{result1} +} + +func (fake *FakeConnectionWrapper) WrapReturnsOnCall(i int, result1 cfnetworking.Connection) { + fake.WrapStub = nil + if fake.wrapReturnsOnCall == nil { + fake.wrapReturnsOnCall = make(map[int]struct { + result1 cfnetworking.Connection + }) + } + fake.wrapReturnsOnCall[i] = struct { + result1 cfnetworking.Connection + }{result1} +} + +func (fake *FakeConnectionWrapper) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + fake.wrapMutex.RLock() + defer fake.wrapMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeConnectionWrapper) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ cfnetv1.ConnectionWrapper = new(FakeConnectionWrapper) diff --git a/api/cfnetworking/cfnetv1/client.go b/api/cfnetworking/cfnetv1/client.go new file mode 100644 index 0000000000..1c30171618 --- /dev/null +++ b/api/cfnetworking/cfnetv1/client.go @@ -0,0 +1,136 @@ +// Package cfnetv1 represents a CF Networking V1 client. +// +// These sets of packages are still under development/pre-pre-pre...alpha. Use +// at your own risk! Functionality and design may change without warning. +// +// For more information on the CF Networking API see +// https://github.com/cloudfoundry-incubator/cf-networking-release/blob/develop/docs/API.md +// +// Method Naming Conventions +// +// The client takes a '' +// approach to method names. If the and +// are similar, they do not need to be repeated. If a GUID is required for the +// , the pluralization is removed from said endpoint in the +// method name. +// +// For Example: +// Method Name: GetApplication +// Endpoint: /v2/applications/:guid +// Action Name: Get +// Top Level Endpoint: applications +// Return Value: Application +// +// Method Name: GetServiceInstances +// Endpoint: /v2/service_instances +// Action Name: Get +// Top Level Endpoint: service_instances +// Return Value: []ServiceInstance +// +// Method Name: GetSpaceServiceInstances +// Endpoint: /v2/spaces/:guid/service_instances +// Action Name: Get +// Top Level Endpoint: spaces +// Return Value: []ServiceInstance +// +// Use the following table to determine which HTTP Command equates to which +// Action Name: +// HTTP Command -> Action Name +// POST -> Create +// GET -> Get +// PUT -> Update +// DELETE -> Delete +// +// Method Locations +// +// Methods exist in the same file as their return type, regardless of which +// endpoint they use. +// +// Error Handling +// +// All error handling that requires parsing the error_code/code returned back +// from the Cloud Controller should be placed in the errorWrapper. Everything +// else can be handled in the individual operations. All parsed cloud +// controller errors should exist in errors.go, all generic HTTP errors should +// exist in the cloudcontroller's errors.go. Errors related to the individaul +// operation should exist at the top of that operation's file. +// +// No inline-relations-depth And summary Endpoints +// +// This package will not use ever use 'inline-relations-depth' or the +// '/summary' endpoints for any operations. These requests can be extremely +// taxing on the Cloud Controller and are avoided at all costs. Additionally, +// the objects returned back from these requests can become extremely +// inconsistant across versions and are problematic to deal with in general. +package cfnetv1 + +import ( + "fmt" + "runtime" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1/internal" + + "github.com/tedsuo/rata" +) + +// Client is a client that can be used to talk to a CF Networking API. +type Client struct { + connection cfnetworking.Connection + router *rata.RequestGenerator + url string + userAgent string +} + +// Config allows the Client to be configured +type Config struct { + // AppName is the name of the application/process using the client. + AppName string + + // AppVersion is the version of the application/process using the client. + AppVersion string + + // DialTimeout is the DNS timeout used to make all requests to the Cloud + // Controller. + DialTimeout time.Duration + + // SkipSSLValidation controls whether a client verifies the server's + // certificate chain and host name. If SkipSSLValidation is true, TLS accepts + // any certificate presented by the server and any host name in that + // certificate for *all* client requests going forward. + // + // In this mode, TLS is susceptible to man-in-the-middle attacks. This should + // be used only for testing. + SkipSSLValidation bool + + // URL is a fully qualified URL to the CF Networking API. + URL string + + // Wrappers that apply to the client connection. + Wrappers []ConnectionWrapper +} + +// NewClient returns a new CF Networking client. +func NewClient(config Config) *Client { + userAgent := fmt.Sprintf("%s/%s (%s; %s %s)", config.AppName, config.AppVersion, runtime.Version(), runtime.GOARCH, runtime.GOOS) + + connection := cfnetworking.NewConnection(cfnetworking.Config{ + DialTimeout: config.DialTimeout, + SkipSSLValidation: config.SkipSSLValidation, + }) + + wrappedConnection := cfnetworking.NewErrorWrapper().Wrap(connection) + for _, wrapper := range config.Wrappers { + wrappedConnection = wrapper.Wrap(wrappedConnection) + } + + client := &Client{ + connection: wrappedConnection, + router: rata.NewRequestGenerator(config.URL, internal.Routes), + url: config.URL, + userAgent: userAgent, + } + + return client +} diff --git a/api/cfnetworking/cfnetv1/connection_wrapper.go b/api/cfnetworking/cfnetv1/connection_wrapper.go new file mode 100644 index 0000000000..4518f8fe0f --- /dev/null +++ b/api/cfnetworking/cfnetv1/connection_wrapper.go @@ -0,0 +1,17 @@ +package cfnetv1 + +import "code.cloudfoundry.org/cli/v9/api/cfnetworking" + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ConnectionWrapper + +// ConnectionWrapper can wrap a given connection allowing the wrapper to modify +// all requests going in and out of the given connection. +type ConnectionWrapper interface { + cfnetworking.Connection + Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection +} + +// WrapConnection wraps the current Client connection in the wrapper. +func (client *Client) WrapConnection(wrapper ConnectionWrapper) { + client.connection = wrapper.Wrap(client.connection) +} diff --git a/api/cfnetworking/cfnetv1/internal/routes.go b/api/cfnetworking/cfnetv1/internal/routes.go new file mode 100644 index 0000000000..69cf937ca4 --- /dev/null +++ b/api/cfnetworking/cfnetv1/internal/routes.go @@ -0,0 +1,21 @@ +package internal + +import ( + "net/http" + + "github.com/tedsuo/rata" +) + +const ( + CreatePolicies = "PostPolicies" + DeletePolicies = "DeletePolicies" + ListPolicies = "ListPolicies" +) + +// Routes is a list of routes used by the rata library to construct request +// URLs. +var Routes = rata.Routes{ + {Path: "/policies", Method: http.MethodPost, Name: CreatePolicies}, + {Path: "/policies/delete", Method: http.MethodPost, Name: DeletePolicies}, + {Path: "/policies", Method: http.MethodGet, Name: ListPolicies}, +} diff --git a/api/cfnetworking/cfnetv1/policy.go b/api/cfnetworking/cfnetv1/policy.go new file mode 100644 index 0000000000..dd06800396 --- /dev/null +++ b/api/cfnetworking/cfnetv1/policy.go @@ -0,0 +1,104 @@ +package cfnetv1 + +import ( + "bytes" + "encoding/json" + "strings" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1/internal" +) + +type PolicyProtocol string + +const ( + PolicyProtocolTCP PolicyProtocol = "tcp" + PolicyProtocolUDP PolicyProtocol = "udp" +) + +type PolicyList struct { + TotalPolicies int `json:"total_policies,omitempty"` + Policies []Policy `json:"policies"` +} + +type Policy struct { + Source PolicySource `json:"source"` + Destination PolicyDestination `json:"destination"` +} + +type PolicySource struct { + ID string `json:"id"` +} + +type PolicyDestination struct { + ID string `json:"id"` + Protocol PolicyProtocol `json:"protocol"` + Ports Ports `json:"ports"` +} + +// CreatePolicies will create the network policy with the given parameters. +func (client Client) CreatePolicies(policies []Policy) error { + rawJSON, err := json.Marshal(PolicyList{Policies: policies}) + if err != nil { + return err + } + + request, err := client.newHTTPRequest(requestOptions{ + RequestName: internal.CreatePolicies, + Body: bytes.NewReader(rawJSON), + }) + if err != nil { + return err + } + + return client.connection.Make(request, &cfnetworking.Response{}) +} + +// ListPolicies will list the policies with the app guids in either the source or destination. +func (client Client) ListPolicies(appGUIDs ...string) ([]Policy, error) { + var request *cfnetworking.Request + var err error + if len(appGUIDs) == 0 { + request, err = client.newHTTPRequest(requestOptions{ + RequestName: internal.ListPolicies, + }) + } else { + request, err = client.newHTTPRequest(requestOptions{ + RequestName: internal.ListPolicies, + Query: map[string][]string{ + "id": {strings.Join(appGUIDs, ",")}, + }, + }) + } + if err != nil { + return []Policy{}, err + } + + policies := PolicyList{} + response := &cfnetworking.Response{} + + err = client.connection.Make(request, response) + if err != nil { + return []Policy{}, err + } + + err = json.Unmarshal(response.RawResponse, &policies) + if err != nil { + return []Policy{}, err + } + + return policies.Policies, nil +} + +// RemovePolicies will remove the network policy with the given parameters. +func (client Client) RemovePolicies(policies []Policy) error { + rawJSON, err := json.Marshal(PolicyList{Policies: policies}) + if err != nil { + return err + } + request, err := client.newHTTPRequest(requestOptions{ + RequestName: internal.DeletePolicies, + Body: bytes.NewReader(rawJSON), + }) + return client.connection.Make(request, &cfnetworking.Response{}) +} diff --git a/api/cfnetworking/cfnetv1/policy_test.go b/api/cfnetworking/cfnetv1/policy_test.go new file mode 100644 index 0000000000..0936645360 --- /dev/null +++ b/api/cfnetworking/cfnetv1/policy_test.go @@ -0,0 +1,339 @@ +package cfnetv1_test + +import ( + "net/http" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +var _ = Describe("Policy", func() { + var client *Client + BeforeEach(func() { + client = NewTestClient() + }) + + Describe("CreatePolicies", func() { + Context("when the stack is found", func() { + BeforeEach(func() { + expectedBody := `{ + "policies": [ + { + "source": { + "id": "source-id-1" + }, + "destination": { + "id": "destination-id-1", + "protocol": "tcp", + "ports": { + "start": 1234, + "end": 1235 + } + } + }, + { + "source": { + "id": "source-id-2" + }, + "destination": { + "id": "destination-id-2", + "protocol": "udp", + "ports": { + "start": 1234, + "end": 1235 + } + } + } + ] + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies"), + VerifyJSON(expectedBody), + RespondWith(http.StatusOK, ""), + ), + ) + }) + + It("passes the body correctly", func() { + err := client.CreatePolicies([]Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: PolicyProtocolTCP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: PolicyProtocolUDP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + }) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) + + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ + "error": "Oh Noes" + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) + + It("returns the error and warnings", func() { + err := client.CreatePolicies(nil) + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) + + Describe("ListPolicies", func() { + var expectedPolicies []Policy + Context("when the policies are found", func() { + BeforeEach(func() { + response := `{ + "policies": [ + { + "source": { + "id": "source-id-1" + }, + "destination": { + "id": "destination-id-1", + "protocol": "tcp", + "ports": { + "start": 1234, + "end": 1235 + } + } + }, + { + "source": { + "id": "source-id-2" + }, + "destination": { + "id": "destination-id-2", + "protocol": "tcp", + "ports": { + "start": 4321, + "end": 5321 + } + } + } + ] + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/policies"), + RespondWith(http.StatusOK, response), + ), + ) + expectedPolicies = []Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: "tcp", + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: "tcp", + Ports: Ports{ + Start: 4321, + End: 5321, + }, + }, + }, + } + }) + + It("returns the policies correctly", func() { + policies, err := client.ListPolicies() + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + + Context("when an app guid is passed", func() { + It("makes the query correctly", func() { + policies, err := client.ListPolicies("source-id-1") + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) + + requests := server.ReceivedRequests() + Expect(requests).To(HaveLen(1)) + Expect(requests[0].RequestURI).To(Equal("/policies?id=source-id-1")) + }) + }) + + Context("when multiple app guid are passed", func() { + It("makes the query correctly", func() { + policies, err := client.ListPolicies("source-id-1", "source-id-2") + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) + + requests := server.ReceivedRequests() + Expect(requests).To(HaveLen(1)) + Expect(requests[0].RequestURI).To(Equal("/policies?id=source-id-1%2Csource-id-2")) + }) + }) + + }) + + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ + "error": "Oh Noes" + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/policies"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) + + It("returns the error", func() { + _, err := client.ListPolicies() + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) + + Describe("RemovePolicies", func() { + Context("when the policy is found", func() { + BeforeEach(func() { + expectedBody := `{ + "policies": [ + { + "source": { + "id": "source-id-1" + }, + "destination": { + "id": "destination-id-1", + "protocol": "tcp", + "ports": { + "start": 1234, + "end": 1235 + } + } + }, + { + "source": { + "id": "source-id-2" + }, + "destination": { + "id": "destination-id-2", + "protocol": "udp", + "ports": { + "start": 1234, + "end": 1235 + } + } + } + ] + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies/delete"), + VerifyJSON(expectedBody), + RespondWith(http.StatusOK, ""), + ), + ) + }) + + It("passes the body correctly", func() { + err := client.RemovePolicies([]Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: PolicyProtocolTCP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: PolicyProtocolUDP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + }) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) + + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ + "error": "Oh Noes" + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies/delete"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) + + It("returns the error", func() { + err := client.RemovePolicies(nil) + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) +}) diff --git a/api/cfnetworking/cfnetv1/ports.go b/api/cfnetworking/cfnetv1/ports.go new file mode 100644 index 0000000000..d684f64418 --- /dev/null +++ b/api/cfnetworking/cfnetv1/ports.go @@ -0,0 +1,6 @@ +package cfnetv1 + +type Ports struct { + Start int `json:"start"` + End int `json:"end"` +} diff --git a/api/cfnetworking/cfnetv1/request.go b/api/cfnetworking/cfnetv1/request.go new file mode 100644 index 0000000000..f564996880 --- /dev/null +++ b/api/cfnetworking/cfnetv1/request.go @@ -0,0 +1,70 @@ +package cfnetv1 + +import ( + "fmt" + "io" + "net/http" + "net/url" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +// Params represents URI parameters for a request. +type Params map[string]string + +// requestOptions contains all the options to create an HTTP request. +type requestOptions struct { + // URIParams are the list URI route parameters + URIParams Params + + // Query is a list of HTTP query parameters + Query url.Values + + // RequestName is the name of the request (see routes) + RequestName string + + // URI is the URI of the request. + URI string + // Method is the HTTP method of the request. + Method string + + // Body is the request body + Body io.ReadSeeker +} + +// newHTTPRequest returns a constructed HTTP.Request with some defaults. +// Defaults are applied when Request fields are not filled in. +func (client Client) newHTTPRequest(passedRequest requestOptions) (*cfnetworking.Request, error) { + var request *http.Request + var err error + if passedRequest.URI != "" { + request, err = http.NewRequest( + passedRequest.Method, + fmt.Sprintf("%s%s", client.url, passedRequest.URI), + passedRequest.Body, + ) + } else { + request, err = client.router.CreateRequest( + passedRequest.RequestName, + map[string]string(passedRequest.URIParams), + passedRequest.Body, + ) + if err == nil { + request.URL.RawQuery = passedRequest.Query.Encode() + } + } + if err != nil { + return nil, err + } + + request.Header = http.Header{} + request.Header.Set("Accept", "application/json") + request.Header.Set("User-Agent", client.userAgent) + + if passedRequest.Body != nil { + request.Header.Set("Content-Type", "application/json") + } + + // Make sure the body is the same as the one in the request + return cfnetworking.NewRequest(request, passedRequest.Body), nil +} diff --git a/api/cfnetworking/cfnetworking_suite_test.go b/api/cfnetworking/cfnetworking_suite_test.go new file mode 100644 index 0000000000..5ed7ecab05 --- /dev/null +++ b/api/cfnetworking/cfnetworking_suite_test.go @@ -0,0 +1,35 @@ +package cfnetworking_test + +import ( + "bytes" + "log" + "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +func TestUaa(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "CF Networking Suite") +} + +var server *Server + +var _ = SynchronizedBeforeSuite(func() []byte { + return []byte{} +}, func(data []byte) { + server = NewTLSServer() + + // Suppresses ginkgo server logs + server.HTTPTestServer.Config.ErrorLog = log.New(&bytes.Buffer{}, "", 0) +}) + +var _ = SynchronizedAfterSuite(func() { + server.Close() +}, func() {}) + +var _ = BeforeEach(func() { + server.Reset() +}) diff --git a/api/cfnetworking/cfnetworkingfakes/fake_connection.go b/api/cfnetworking/cfnetworkingfakes/fake_connection.go new file mode 100644 index 0000000000..9853dbdbe8 --- /dev/null +++ b/api/cfnetworking/cfnetworkingfakes/fake_connection.go @@ -0,0 +1,100 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetworkingfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +type FakeConnection struct { + MakeStub func(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error + makeMutex sync.RWMutex + makeArgsForCall []struct { + request *cfnetworking.Request + passedResponse *cfnetworking.Response + } + makeReturns struct { + result1 error + } + makeReturnsOnCall map[int]struct { + result1 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeConnection) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + fake.makeMutex.Lock() + ret, specificReturn := fake.makeReturnsOnCall[len(fake.makeArgsForCall)] + fake.makeArgsForCall = append(fake.makeArgsForCall, struct { + request *cfnetworking.Request + passedResponse *cfnetworking.Response + }{request, passedResponse}) + fake.recordInvocation("Make", []interface{}{request, passedResponse}) + fake.makeMutex.Unlock() + if fake.MakeStub != nil { + return fake.MakeStub(request, passedResponse) + } + if specificReturn { + return ret.result1 + } + return fake.makeReturns.result1 +} + +func (fake *FakeConnection) MakeCallCount() int { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + return len(fake.makeArgsForCall) +} + +func (fake *FakeConnection) MakeArgsForCall(i int) (*cfnetworking.Request, *cfnetworking.Response) { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + return fake.makeArgsForCall[i].request, fake.makeArgsForCall[i].passedResponse +} + +func (fake *FakeConnection) MakeReturns(result1 error) { + fake.MakeStub = nil + fake.makeReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeConnection) MakeReturnsOnCall(i int, result1 error) { + fake.MakeStub = nil + if fake.makeReturnsOnCall == nil { + fake.makeReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.makeReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeConnection) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeConnection) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ cfnetworking.Connection = new(FakeConnection) diff --git a/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go b/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go new file mode 100644 index 0000000000..6b0c6d6d90 --- /dev/null +++ b/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go @@ -0,0 +1,176 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetworkingfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +type FakeReadSeeker struct { + ReadStub func(p []byte) (n int, err error) + readMutex sync.RWMutex + readArgsForCall []struct { + p []byte + } + readReturns struct { + result1 int + result2 error + } + readReturnsOnCall map[int]struct { + result1 int + result2 error + } + SeekStub func(offset int64, whence int) (int64, error) + seekMutex sync.RWMutex + seekArgsForCall []struct { + offset int64 + whence int + } + seekReturns struct { + result1 int64 + result2 error + } + seekReturnsOnCall map[int]struct { + result1 int64 + result2 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeReadSeeker) Read(p []byte) (n int, err error) { + var pCopy []byte + if p != nil { + pCopy = make([]byte, len(p)) + copy(pCopy, p) + } + fake.readMutex.Lock() + ret, specificReturn := fake.readReturnsOnCall[len(fake.readArgsForCall)] + fake.readArgsForCall = append(fake.readArgsForCall, struct { + p []byte + }{pCopy}) + fake.recordInvocation("Read", []interface{}{pCopy}) + fake.readMutex.Unlock() + if fake.ReadStub != nil { + return fake.ReadStub(p) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fake.readReturns.result1, fake.readReturns.result2 +} + +func (fake *FakeReadSeeker) ReadCallCount() int { + fake.readMutex.RLock() + defer fake.readMutex.RUnlock() + return len(fake.readArgsForCall) +} + +func (fake *FakeReadSeeker) ReadArgsForCall(i int) []byte { + fake.readMutex.RLock() + defer fake.readMutex.RUnlock() + return fake.readArgsForCall[i].p +} + +func (fake *FakeReadSeeker) ReadReturns(result1 int, result2 error) { + fake.ReadStub = nil + fake.readReturns = struct { + result1 int + result2 error + }{result1, result2} +} + +func (fake *FakeReadSeeker) ReadReturnsOnCall(i int, result1 int, result2 error) { + fake.ReadStub = nil + if fake.readReturnsOnCall == nil { + fake.readReturnsOnCall = make(map[int]struct { + result1 int + result2 error + }) + } + fake.readReturnsOnCall[i] = struct { + result1 int + result2 error + }{result1, result2} +} + +func (fake *FakeReadSeeker) Seek(offset int64, whence int) (int64, error) { + fake.seekMutex.Lock() + ret, specificReturn := fake.seekReturnsOnCall[len(fake.seekArgsForCall)] + fake.seekArgsForCall = append(fake.seekArgsForCall, struct { + offset int64 + whence int + }{offset, whence}) + fake.recordInvocation("Seek", []interface{}{offset, whence}) + fake.seekMutex.Unlock() + if fake.SeekStub != nil { + return fake.SeekStub(offset, whence) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fake.seekReturns.result1, fake.seekReturns.result2 +} + +func (fake *FakeReadSeeker) SeekCallCount() int { + fake.seekMutex.RLock() + defer fake.seekMutex.RUnlock() + return len(fake.seekArgsForCall) +} + +func (fake *FakeReadSeeker) SeekArgsForCall(i int) (int64, int) { + fake.seekMutex.RLock() + defer fake.seekMutex.RUnlock() + return fake.seekArgsForCall[i].offset, fake.seekArgsForCall[i].whence +} + +func (fake *FakeReadSeeker) SeekReturns(result1 int64, result2 error) { + fake.SeekStub = nil + fake.seekReturns = struct { + result1 int64 + result2 error + }{result1, result2} +} + +func (fake *FakeReadSeeker) SeekReturnsOnCall(i int, result1 int64, result2 error) { + fake.SeekStub = nil + if fake.seekReturnsOnCall == nil { + fake.seekReturnsOnCall = make(map[int]struct { + result1 int64 + result2 error + }) + } + fake.seekReturnsOnCall[i] = struct { + result1 int64 + result2 error + }{result1, result2} +} + +func (fake *FakeReadSeeker) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.readMutex.RLock() + defer fake.readMutex.RUnlock() + fake.seekMutex.RLock() + defer fake.seekMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeReadSeeker) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ cfnetworking.ReadSeeker = new(FakeReadSeeker) diff --git a/api/cfnetworking/connection.go b/api/cfnetworking/connection.go new file mode 100644 index 0000000000..57797a6f9a --- /dev/null +++ b/api/cfnetworking/connection.go @@ -0,0 +1,8 @@ +package cfnetworking + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Connection + +// Connection creates and executes http requests +type Connection interface { + Make(request *Request, passedResponse *Response) error +} diff --git a/api/cfnetworking/errors.go b/api/cfnetworking/errors.go new file mode 100644 index 0000000000..7abd7877c6 --- /dev/null +++ b/api/cfnetworking/errors.go @@ -0,0 +1,64 @@ +package cfnetworking + +import ( + "encoding/json" + "net/http" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" +) + +// errorWrapper is the wrapper that converts responses with 4xx and 5xx status +// codes to an error. +type errorWrapper struct { + connection Connection +} + +func NewErrorWrapper() *errorWrapper { + return new(errorWrapper) +} + +// Wrap wraps a Cloud Controller connection in this error handling wrapper. +func (e *errorWrapper) Wrap(innerconnection Connection) Connection { + e.connection = innerconnection + return e +} + +// Make converts RawHTTPStatusError, which represents responses with 4xx and +// 5xx status codes, to specific errors. +func (e *errorWrapper) Make(request *Request, passedResponse *Response) error { + err := e.connection.Make(request, passedResponse) + + if rawHTTPStatusErr, ok := err.(networkerror.RawHTTPStatusError); ok { + return convert(rawHTTPStatusErr) + } + return err +} + +func convert(rawHTTPStatusErr networkerror.RawHTTPStatusError) error { + // Try to unmarshal the raw error into a CC error. If unmarshaling fails, + // return the raw error. + var errorResponse networkerror.ErrorResponse + err := json.Unmarshal(rawHTTPStatusErr.RawResponse, &errorResponse) + if err != nil { + return rawHTTPStatusErr + } + + switch rawHTTPStatusErr.StatusCode { + case http.StatusBadRequest: // 400 + return networkerror.BadRequestError(errorResponse) + case http.StatusUnauthorized: // 401 + return networkerror.UnauthorizedError(errorResponse) + case http.StatusForbidden: // 403 + return networkerror.ForbiddenError(errorResponse) + case http.StatusNotAcceptable: // 406 + return networkerror.NotAcceptableError(errorResponse) + case http.StatusConflict: // 409 + return networkerror.ConflictError(errorResponse) + default: + return networkerror.UnexpectedResponseError{ + ErrorResponse: errorResponse, + RequestIDs: rawHTTPStatusErr.RequestIDs, + ResponseCode: rawHTTPStatusErr.StatusCode, + } + } +} diff --git a/api/cfnetworking/errors_test.go b/api/cfnetworking/errors_test.go new file mode 100644 index 0000000000..f428f9b72d --- /dev/null +++ b/api/cfnetworking/errors_test.go @@ -0,0 +1,37 @@ +package cfnetworking_test + +import ( + "fmt" + "net/http" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/gomega" +) + +var _ = Describe("Error Wrapper", func() { + const errorMessage = "I am an error" + + DescribeTable("Make", + func(statusCode int, expectedError error) { + fakeConnection := new(cfnetworkingfakes.FakeConnection) + fakeConnection.MakeReturns(networkerror.RawHTTPStatusError{ + StatusCode: statusCode, + RawResponse: []byte(fmt.Sprintf(`{"error":"%s"}`, errorMessage)), + }) + + errorWrapper := NewErrorWrapper().Wrap(fakeConnection) + err := errorWrapper.Make(nil, nil) + Expect(err).To(MatchError(expectedError)) + }, + Entry("400 -> BadRequestError", http.StatusBadRequest, networkerror.BadRequestError{Message: errorMessage}), + Entry("401 -> UnauthorizedError", http.StatusUnauthorized, networkerror.UnauthorizedError{Message: errorMessage}), + Entry("403 -> ForbiddenError", http.StatusForbidden, networkerror.ForbiddenError{Message: errorMessage}), + Entry("406 -> NotAcceptable", http.StatusNotAcceptable, networkerror.NotAcceptableError{Message: errorMessage}), + Entry("409 -> ConflictError", http.StatusConflict, networkerror.ConflictError{Message: errorMessage}), + ) +}) diff --git a/api/cfnetworking/networkerror/bad_request_error.go b/api/cfnetworking/networkerror/bad_request_error.go new file mode 100644 index 0000000000..16db7bd925 --- /dev/null +++ b/api/cfnetworking/networkerror/bad_request_error.go @@ -0,0 +1,9 @@ +package networkerror + +type BadRequestError struct { + Message string `json:"error"` +} + +func (e BadRequestError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/conflict_error.go b/api/cfnetworking/networkerror/conflict_error.go new file mode 100644 index 0000000000..807ac31364 --- /dev/null +++ b/api/cfnetworking/networkerror/conflict_error.go @@ -0,0 +1,9 @@ +package networkerror + +type ConflictError struct { + Message string `json:"error"` +} + +func (e ConflictError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/error_response.go b/api/cfnetworking/networkerror/error_response.go new file mode 100644 index 0000000000..a3ff4659f9 --- /dev/null +++ b/api/cfnetworking/networkerror/error_response.go @@ -0,0 +1,9 @@ +package networkerror + +type ErrorResponse struct { + Message string `json:"error"` +} + +func (e ErrorResponse) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/forbidden_error.go b/api/cfnetworking/networkerror/forbidden_error.go new file mode 100644 index 0000000000..d780a34cb8 --- /dev/null +++ b/api/cfnetworking/networkerror/forbidden_error.go @@ -0,0 +1,9 @@ +package networkerror + +type ForbiddenError struct { + Message string `json:"error"` +} + +func (e ForbiddenError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/invalid_auth_token_error.go b/api/cfnetworking/networkerror/invalid_auth_token_error.go new file mode 100644 index 0000000000..3e3178c39a --- /dev/null +++ b/api/cfnetworking/networkerror/invalid_auth_token_error.go @@ -0,0 +1,11 @@ +package networkerror + +// InvalidAuthTokenError is returned when the client has an invalid +// authorization header. +type InvalidAuthTokenError struct { + Message string +} + +func (e InvalidAuthTokenError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/not_acceptable_error.go b/api/cfnetworking/networkerror/not_acceptable_error.go new file mode 100644 index 0000000000..002a73df30 --- /dev/null +++ b/api/cfnetworking/networkerror/not_acceptable_error.go @@ -0,0 +1,9 @@ +package networkerror + +type NotAcceptableError struct { + Message string `json:"error"` +} + +func (e NotAcceptableError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/not_found_error.go b/api/cfnetworking/networkerror/not_found_error.go new file mode 100644 index 0000000000..a69d303085 --- /dev/null +++ b/api/cfnetworking/networkerror/not_found_error.go @@ -0,0 +1,10 @@ +package networkerror + +// NotFoundError wraps a generic 404 error. +type NotFoundError struct { + Message string +} + +func (e NotFoundError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/raw_http_status_error.go b/api/cfnetworking/networkerror/raw_http_status_error.go new file mode 100644 index 0000000000..fea62dcd7f --- /dev/null +++ b/api/cfnetworking/networkerror/raw_http_status_error.go @@ -0,0 +1,14 @@ +package networkerror + +import "fmt" + +// RawHTTPStatusError represents any response with a 4xx or 5xx status code. +type RawHTTPStatusError struct { + StatusCode int + RawResponse []byte + RequestIDs []string +} + +func (r RawHTTPStatusError) Error() string { + return fmt.Sprintf("Error Code: %d\nRaw Response: %s", r.StatusCode, r.RawResponse) +} diff --git a/api/cfnetworking/networkerror/request_error.go b/api/cfnetworking/networkerror/request_error.go new file mode 100644 index 0000000000..7b0ff48937 --- /dev/null +++ b/api/cfnetworking/networkerror/request_error.go @@ -0,0 +1,11 @@ +package networkerror + +// RequestError represents a generic error encountered while performing the +// HTTP request. This generic error occurs before a HTTP response is obtained. +type RequestError struct { + Err error +} + +func (e RequestError) Error() string { + return e.Err.Error() +} diff --git a/api/cfnetworking/networkerror/ssl_validation_hostname_error.go b/api/cfnetworking/networkerror/ssl_validation_hostname_error.go new file mode 100644 index 0000000000..a583abcff0 --- /dev/null +++ b/api/cfnetworking/networkerror/ssl_validation_hostname_error.go @@ -0,0 +1,13 @@ +package networkerror + +import "fmt" + +// SSLValidationHostnameError replaces x509.HostnameError when the server has +// SSL certificate that does not match the hostname. +type SSLValidationHostnameError struct { + Message string +} + +func (e SSLValidationHostnameError) Error() string { + return fmt.Sprintf("Hostname does not match SSL Certificate (%s)", e.Message) +} diff --git a/api/cfnetworking/networkerror/unauthorized_error.go b/api/cfnetworking/networkerror/unauthorized_error.go new file mode 100644 index 0000000000..513c6de40c --- /dev/null +++ b/api/cfnetworking/networkerror/unauthorized_error.go @@ -0,0 +1,9 @@ +package networkerror + +type UnauthorizedError struct { + Message string `json:"error"` +} + +func (e UnauthorizedError) Error() string { + return e.Message +} diff --git a/api/cfnetworking/networkerror/unexpected_response_error.go b/api/cfnetworking/networkerror/unexpected_response_error.go new file mode 100644 index 0000000000..e337d7a795 --- /dev/null +++ b/api/cfnetworking/networkerror/unexpected_response_error.go @@ -0,0 +1,20 @@ +package networkerror + +import "fmt" + +// UnexpectedResponseError is returned when the client gets an error that has +// not been accounted for. +type UnexpectedResponseError struct { + ErrorResponse + + RequestIDs []string + ResponseCode int +} + +func (e UnexpectedResponseError) Error() string { + message := fmt.Sprintf("Unexpected Response\nResponse code: %d", e.ResponseCode) + for _, id := range e.RequestIDs { + message = fmt.Sprintf("%s\nRequest ID: %s", message, id) + } + return fmt.Sprintf("%s\nDescription: %s", message, e.Message) +} diff --git a/api/cfnetworking/networkerror/unverified_server_error.go b/api/cfnetworking/networkerror/unverified_server_error.go new file mode 100644 index 0000000000..59a877302a --- /dev/null +++ b/api/cfnetworking/networkerror/unverified_server_error.go @@ -0,0 +1,11 @@ +package networkerror + +// UnverifiedServerError replaces x509.UnknownAuthorityError when the server +// has SSL but the client is unable to verify it's certificate +type UnverifiedServerError struct { + URL string +} + +func (UnverifiedServerError) Error() string { + return "x509: certificate signed by unknown authority" +} diff --git a/api/cfnetworking/networking_connection.go b/api/cfnetworking/networking_connection.go new file mode 100644 index 0000000000..6e9add07e4 --- /dev/null +++ b/api/cfnetworking/networking_connection.go @@ -0,0 +1,126 @@ +package cfnetworking + +import ( + "bytes" + "crypto/tls" + "crypto/x509" + "encoding/json" + "io/ioutil" + "net" + "net/http" + "net/url" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" +) + +// NetworkingConnection represents a connection to the Cloud Controller +// server. +type NetworkingConnection struct { + HTTPClient *http.Client + UserAgent string +} + +// Config is for configuring a NetworkingConnection. +type Config struct { + DialTimeout time.Duration + SkipSSLValidation bool +} + +// NewConnection returns a new NetworkingConnection with provided +// configuration. +func NewConnection(config Config) *NetworkingConnection { + tr := &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: config.SkipSSLValidation, + }, + Proxy: http.ProxyFromEnvironment, + DialContext: (&net.Dialer{ + KeepAlive: 30 * time.Second, + Timeout: config.DialTimeout, + }).DialContext, + } + + return &NetworkingConnection{ + HTTPClient: &http.Client{Transport: tr}, + } +} + +// Make performs the request and parses the response. +func (connection *NetworkingConnection) Make(request *Request, passedResponse *Response) error { + // In case this function is called from a retry, passedResponse may already + // be populated with a previous response. We reset in case there's an HTTP + // error and we don't repopulate it in populateResponse. + passedResponse.reset() + + response, err := connection.HTTPClient.Do(request.Request) + if err != nil { + return connection.processRequestErrors(request.Request, err) + } + + return connection.populateResponse(response, passedResponse) +} + +func (*NetworkingConnection) processRequestErrors(request *http.Request, err error) error { + switch e := err.(type) { + case *url.Error: + switch urlErr := e.Err.(type) { + case x509.UnknownAuthorityError: + return networkerror.UnverifiedServerError{ + URL: request.URL.String(), + } + case x509.HostnameError: + return networkerror.SSLValidationHostnameError{ + Message: urlErr.Error(), + } + default: + return networkerror.RequestError{Err: e} + } + default: + return err + } +} + +func (connection *NetworkingConnection) populateResponse(response *http.Response, passedResponse *Response) error { + passedResponse.HTTPResponse = response + + if resourceLocationURL := response.Header.Get("Location"); resourceLocationURL != "" { + passedResponse.ResourceLocationURL = resourceLocationURL + } + + rawBytes, err := ioutil.ReadAll(response.Body) + defer response.Body.Close() + if err != nil { + return err + } + + passedResponse.RawResponse = rawBytes + + err = connection.handleStatusCodes(response, passedResponse) + if err != nil { + return err + } + + if passedResponse.Result != nil { + decoder := json.NewDecoder(bytes.NewBuffer(passedResponse.RawResponse)) + decoder.UseNumber() + err = decoder.Decode(passedResponse.Result) + if err != nil { + return err + } + } + + return nil +} + +func (*NetworkingConnection) handleStatusCodes(response *http.Response, passedResponse *Response) error { + if response.StatusCode >= 400 { + return networkerror.RawHTTPStatusError{ + StatusCode: response.StatusCode, + RawResponse: passedResponse.RawResponse, + RequestIDs: response.Header["X-Vcap-Request-Id"], + } + } + + return nil +} diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go new file mode 100644 index 0000000000..4a9376be36 --- /dev/null +++ b/api/cfnetworking/networking_connection_test.go @@ -0,0 +1,251 @@ +package cfnetworking_test + +import ( + "fmt" + "net/http" + "runtime" + "strings" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +type DummyResponse struct { + Val1 string `json:"val1"` + Val2 int `json:"val2"` + Val3 interface{} `json:"val3,omitempty"` +} + +var _ = Describe("CF Networking Connection", func() { + var connection *NetworkingConnection + + BeforeEach(func() { + connection = NewConnection(Config{SkipSSLValidation: true}) + }) + + Describe("Make", func() { + Describe("Data Unmarshalling", func() { + var request *Request + + BeforeEach(func() { + response := `{ + "val1":"2.59.0", + "val2":2, + "val3":1111111111111111111 + }` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo", ""), + RespondWith(http.StatusOK, response), + ), + ) + + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request = &Request{Request: req} + }) + + Context("when passed a response with a result set", func() { + It("unmarshals the data into a struct", func() { + var body DummyResponse + response := Response{ + Result: &body, + } + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(body.Val1).To(Equal("2.59.0")) + Expect(body.Val2).To(Equal(2)) + }) + + It("keeps numbers unmarshalled to interfaces as interfaces", func() { + var body DummyResponse + response := Response{ + Result: &body, + } + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + Expect(fmt.Sprint(body.Val3)).To(Equal("1111111111111111111")) + }) + }) + + Context("when passed an empty response", func() { + It("skips the unmarshalling step", func() { + var response Response + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + Expect(response.Result).To(BeNil()) + }) + }) + }) + + Describe("HTTP Response", func() { + var request *Request + + BeforeEach(func() { + response := `{}` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo", ""), + RespondWith(http.StatusOK, response), + ), + ) + + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request = &Request{Request: req} + }) + + It("returns the status", func() { + response := Response{} + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(response.HTTPResponse.Status).To(Equal("200 OK")) + }) + }) + + Describe("Response Headers", func() { + Describe("Location", func() { + BeforeEach(func() { + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + RespondWith(http.StatusAccepted, "{}", http.Header{"Location": {"/v2/some-location"}}), + ), + ) + }) + + It("returns the location in the ResourceLocationURL", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(server.ReceivedRequests()).To(HaveLen(1)) + Expect(response.ResourceLocationURL).To(Equal("/v2/some-location")) + }) + }) + }) + + Describe("Errors", func() { + Context("when the server does not exist", func() { + BeforeEach(func() { + connection = NewConnection(Config{}) + }) + + It("returns a RequestError", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", "http://garbledyguk.com"), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(HaveOccurred()) + + requestErr, ok := err.(networkerror.RequestError) + Expect(ok).To(BeTrue()) + Expect(requestErr.Error()).To(MatchRegexp(".*http://garbledyguk.com/v2/foo.*[nN]o such host")) + }) + }) + + Context("when the server does not have a verified certificate", func() { + Context("skipSSLValidation is false", func() { + BeforeEach(func() { + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + ), + ) + + connection = NewConnection(Config{}) + }) + + It("returns a UnverifiedServerError", func() { + req, err := http.NewRequest(http.MethodGet, server.URL(), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.UnverifiedServerError{URL: server.URL()})) + }) + }) + }) + + Context("when the server's certificate does not match the hostname", func() { + Context("skipSSLValidation is false", func() { + BeforeEach(func() { + if runtime.GOOS == "windows" { + Skip("ssl validation has a different order on windows, will not be returned properly") + } + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/"), + ), + ) + + connection = NewConnection(Config{}) + }) + + // loopback.cli.ci.cf-app.com is a custom DNS record setup to point to 127.0.0.1 + It("returns a SSLValidationHostnameError", func() { + altHostURL := strings.Replace(server.URL(), "127.0.0.1", "loopback.cli.ci.cf-app.com", -1) + req, err := http.NewRequest(http.MethodGet, altHostURL, nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.SSLValidationHostnameError{ + Message: "x509: certificate is valid for example.com, not loopback.cli.ci.cf-app.com", + })) + }) + }) + }) + + Describe("RawHTTPStatusError", func() { + var networkResponse string + BeforeEach(func() { + networkResponse = `{ + "code": 90004, + "description": "The service binding could not be found: some-guid", + "error_code": "CF-ServiceBindingNotFound" + }` + + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + RespondWith(http.StatusNotFound, networkResponse, http.Header{"X-Vcap-Request-Id": {"6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95", "6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95::7445d9db-c31e-410d-8dc5-9f79ec3fc26f"}}), + ), + ) + }) + + It("returns a CCRawResponse", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.RawHTTPStatusError{ + StatusCode: http.StatusNotFound, + RawResponse: []byte(networkResponse), + RequestIDs: []string{"6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95", "6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95::7445d9db-c31e-410d-8dc5-9f79ec3fc26f"}, + })) + + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) + }) + }) +}) diff --git a/api/cfnetworking/request.go b/api/cfnetworking/request.go new file mode 100644 index 0000000000..02db6c5f89 --- /dev/null +++ b/api/cfnetworking/request.go @@ -0,0 +1,35 @@ +package cfnetworking + +import ( + "io" + "net/http" +) + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ReadSeeker + +type ReadSeeker interface { + io.ReadSeeker +} + +// Request represents the request of the cloud controller. +type Request struct { + *http.Request + + body io.ReadSeeker +} + +func (r *Request) ResetBody() error { + if r.body == nil { + return nil + } + + _, err := r.body.Seek(0, 0) + return err +} + +func NewRequest(request *http.Request, body io.ReadSeeker) *Request { + return &Request{ + Request: request, + body: body, + } +} diff --git a/api/cfnetworking/response.go b/api/cfnetworking/response.go new file mode 100644 index 0000000000..8d4de87cca --- /dev/null +++ b/api/cfnetworking/response.go @@ -0,0 +1,29 @@ +package cfnetworking + +import "net/http" + +// Response represents a Cloud Controller response object. +type Response struct { + // Result represents the resource entity type that is expected in the + // response JSON. + Result interface{} + + // RawResponse represents the response body. + RawResponse []byte + + // Warnings represents warnings parsed from the custom warnings headers of a + // Cloud Controller response. + Warnings []string + + // HTTPResponse represents the HTTP response object. + HTTPResponse *http.Response + + // ResourceLocationURL represents the Location header value + ResourceLocationURL string +} + +func (r *Response) reset() { + r.RawResponse = []byte{} + r.Warnings = []string{} + r.HTTPResponse = nil +} diff --git a/api/cfnetworking/wrapper/request_logger.go b/api/cfnetworking/wrapper/request_logger.go new file mode 100644 index 0000000000..60db04d46e --- /dev/null +++ b/api/cfnetworking/wrapper/request_logger.go @@ -0,0 +1,156 @@ +package wrapper + +import ( + "fmt" + "io/ioutil" + "net/http" + "sort" + "strings" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput + +// RequestLoggerOutput is the interface for displaying logs +type RequestLoggerOutput interface { + DisplayHeader(name string, value string) error + DisplayHost(name string) error + DisplayJSONBody(body []byte) error + DisplayMessage(msg string) error + DisplayRequestHeader(method string, uri string, httpProtocol string) error + DisplayResponseHeader(httpProtocol string, status string) error + DisplayType(name string, requestDate time.Time) error + HandleInternalError(err error) + Start() error + Stop() error +} + +// RequestLogger is the wrapper that logs requests to and responses from the +// Cloud Controller server +type RequestLogger struct { + connection cfnetworking.Connection + output RequestLoggerOutput +} + +// NewRequestLogger returns a pointer to a RequestLogger wrapper +func NewRequestLogger(output RequestLoggerOutput) *RequestLogger { + return &RequestLogger{ + output: output, + } +} + +// Wrap sets the connection on the RequestLogger and returns itself +func (logger *RequestLogger) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { + logger.connection = innerconnection + return logger +} + +// Make records the request and the response to UI +func (logger *RequestLogger) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + err := logger.displayRequest(request) + if err != nil { + logger.output.HandleInternalError(err) + } + + err = logger.connection.Make(request, passedResponse) + + if passedResponse.HTTPResponse != nil { + displayErr := logger.displayResponse(passedResponse) + if displayErr != nil { + logger.output.HandleInternalError(displayErr) + } + } + + return err +} + +func (logger *RequestLogger) displayRequest(request *cfnetworking.Request) error { + err := logger.output.Start() + if err != nil { + return err + } + defer logger.output.Stop() + + err = logger.output.DisplayType("REQUEST", time.Now()) + if err != nil { + return err + } + err = logger.output.DisplayRequestHeader(request.Method, request.URL.RequestURI(), request.Proto) + if err != nil { + return err + } + err = logger.output.DisplayHost(request.URL.Host) + if err != nil { + return err + } + err = logger.displaySortedHeaders(request.Header) + if err != nil { + return err + } + + contentType := request.Header.Get("Content-Type") + if request.Body != nil { + if strings.Contains(contentType, "json") { + rawRequestBody, err := ioutil.ReadAll(request.Body) + if err != nil { + return err + } + + defer request.ResetBody() + + return logger.output.DisplayJSONBody(rawRequestBody) + } else if contentType != "" { + return logger.output.DisplayMessage(fmt.Sprintf("[%s Content Hidden]", strings.Split(contentType, ";")[0])) + } + } + return nil +} + +func (logger *RequestLogger) displayResponse(passedResponse *cfnetworking.Response) error { + err := logger.output.Start() + if err != nil { + return err + } + defer logger.output.Stop() + + err = logger.output.DisplayType("RESPONSE", time.Now()) + if err != nil { + return err + } + err = logger.output.DisplayResponseHeader(passedResponse.HTTPResponse.Proto, passedResponse.HTTPResponse.Status) + if err != nil { + return err + } + err = logger.displaySortedHeaders(passedResponse.HTTPResponse.Header) + if err != nil { + return err + } + return logger.output.DisplayJSONBody(passedResponse.RawResponse) +} + +func (logger *RequestLogger) displaySortedHeaders(headers http.Header) error { + keys := []string{} + for key, _ := range headers { + keys = append(keys, key) + } + sort.Strings(keys) + + for _, key := range keys { + for _, value := range headers[key] { + err := logger.output.DisplayHeader(key, redactHeaders(key, value)) + if err != nil { + return err + } + } + } + return nil +} + +func redactHeaders(key string, value string) string { + if key == "Authorization" { + return "[PRIVATE DATA HIDDEN]" + } + return value +} diff --git a/api/cfnetworking/wrapper/request_logger_test.go b/api/cfnetworking/wrapper/request_logger_test.go new file mode 100644 index 0000000000..5f48ca23c5 --- /dev/null +++ b/api/cfnetworking/wrapper/request_logger_test.go @@ -0,0 +1,328 @@ +package wrapper_test + +import ( + "bytes" + "errors" + "io/ioutil" + "net/http" + "net/url" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/wrapperfakes" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" +) + +var _ = Describe("Request Logger", func() { + var ( + fakeConnection *cfnetworkingfakes.FakeConnection + fakeOutput *wrapperfakes.FakeRequestLoggerOutput + + wrapper cfnetworking.Connection + + request *cfnetworking.Request + response *cfnetworking.Response + executeErr error + ) + + BeforeEach(func() { + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeOutput = new(wrapperfakes.FakeRequestLoggerOutput) + + wrapper = NewRequestLogger(fakeOutput).Wrap(fakeConnection) + + body := bytes.NewReader([]byte("foo")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", body) + Expect(err).NotTo(HaveOccurred()) + + req.URL.RawQuery = url.Values{ + "query1": {"a"}, + "query2": {"b"}, + }.Encode() + + headers := http.Header{} + headers.Add("Aghi", "bar") + headers.Add("Abc", "json") + headers.Add("Adef", "application/json") + req.Header = headers + + response = &cfnetworking.Response{ + RawResponse: []byte("some-response-body"), + HTTPResponse: &http.Response{}, + } + request = cfnetworking.NewRequest(req, body) + }) + + JustBeforeEach(func() { + executeErr = wrapper.Make(request, response) + }) + + Describe("Make", func() { + It("outputs the request", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayTypeCallCount()).To(BeNumerically(">=", 1)) + name, date := fakeOutput.DisplayTypeArgsForCall(0) + Expect(name).To(Equal("REQUEST")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayRequestHeaderCallCount()).To(Equal(1)) + method, uri, protocol := fakeOutput.DisplayRequestHeaderArgsForCall(0) + Expect(method).To(Equal(http.MethodGet)) + Expect(uri).To(MatchRegexp("/banana\\?(?:query1=a&query2=b|query2=b&query1=a)")) + Expect(protocol).To(Equal("HTTP/1.1")) + + Expect(fakeOutput.DisplayHostCallCount()).To(Equal(1)) + host := fakeOutput.DisplayHostArgsForCall(0) + Expect(host).To(Equal("foo.bar.com")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 3)) + name, value := fakeOutput.DisplayHeaderArgsForCall(0) + Expect(name).To(Equal("Abc")) + Expect(value).To(Equal("json")) + name, value = fakeOutput.DisplayHeaderArgsForCall(1) + Expect(name).To(Equal("Adef")) + Expect(value).To(Equal("application/json")) + name, value = fakeOutput.DisplayHeaderArgsForCall(2) + Expect(name).To(Equal("Aghi")) + Expect(value).To(Equal("bar")) + + Expect(fakeOutput.DisplayMessageCallCount()).To(Equal(0)) + }) + + Context("when an authorization header is in the request", func() { + BeforeEach(func() { + request.Header = http.Header{"Authorization": []string{"should not be shown"}} + }) + + It("redacts the contents of the authorization header", func() { + Expect(executeErr).NotTo(HaveOccurred()) + Expect(fakeOutput.DisplayHeaderCallCount()).To(Equal(1)) + key, value := fakeOutput.DisplayHeaderArgsForCall(0) + Expect(key).To(Equal("Authorization")) + Expect(value).To(Equal("[PRIVATE DATA HIDDEN]")) + }) + }) + + Context("when passed a body", func() { + Context("when the request's Content-Type is application/json", func() { + BeforeEach(func() { + request.Header.Set("Content-Type", "application/json") + }) + + It("outputs the body", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("foo"))) + + bytes, err := ioutil.ReadAll(request.Body) + Expect(err).NotTo(HaveOccurred()) + Expect(bytes).To(Equal([]byte("foo"))) + }) + }) + + Context("when request's Content-Type is anything else", func() { + BeforeEach(func() { + request.Header.Set("Content-Type", "banana;rama") + }) + + It("does not display the body", func() { + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(Equal(1)) // Once for response body only + Expect(fakeOutput.DisplayMessageCallCount()).To(Equal(1)) + Expect(fakeOutput.DisplayMessageArgsForCall(0)).To(Equal("[banana Content Hidden]")) + }) + }) + }) + + Context("when an error occures while trying to log the request", func() { + var expectedErr error + + BeforeEach(func() { + expectedErr = errors.New("this should never block the request") + + calledOnce := false + fakeOutput.StartStub = func() error { + if !calledOnce { + calledOnce = true + return expectedErr + } + return nil + } + }) + + It("should display the error and continue on", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(1)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + }) + }) + + Context("when the request is successful", func() { + BeforeEach(func() { + response = &cfnetworking.Response{ + RawResponse: []byte("some-response-body"), + HTTPResponse: &http.Response{ + Proto: "HTTP/1.1", + Status: "200 OK", + Header: http.Header{ + "BBBBB": {"second"}, + "AAAAA": {"first"}, + "CCCCC": {"third"}, + }, + }, + } + }) + + It("outputs the response", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayTypeCallCount()).To(Equal(2)) + name, date := fakeOutput.DisplayTypeArgsForCall(1) + Expect(name).To(Equal("RESPONSE")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(1)) + protocol, status := fakeOutput.DisplayResponseHeaderArgsForCall(0) + Expect(protocol).To(Equal("HTTP/1.1")) + Expect(status).To(Equal("200 OK")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 6)) + name, value := fakeOutput.DisplayHeaderArgsForCall(3) + Expect(name).To(Equal("AAAAA")) + Expect(value).To(Equal("first")) + name, value = fakeOutput.DisplayHeaderArgsForCall(4) + Expect(name).To(Equal("BBBBB")) + Expect(value).To(Equal("second")) + name, value = fakeOutput.DisplayHeaderArgsForCall(5) + Expect(name).To(Equal("CCCCC")) + Expect(value).To(Equal("third")) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("some-response-body"))) + }) + }) + + Context("when the request is unsuccessful", func() { + var expectedErr error + + BeforeEach(func() { + expectedErr = errors.New("banana") + fakeConnection.MakeReturns(expectedErr) + }) + + Context("when the http response is not set", func() { + BeforeEach(func() { + response = &cfnetworking.Response{} + }) + + It("outputs nothing", func() { + Expect(executeErr).To(MatchError(expectedErr)) + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(0)) + }) + }) + + Context("when the http response is set", func() { + BeforeEach(func() { + response = &cfnetworking.Response{ + RawResponse: []byte("some-error-body"), + HTTPResponse: &http.Response{ + Proto: "HTTP/1.1", + Status: "200 OK", + Header: http.Header{ + "BBBBB": {"second"}, + "AAAAA": {"first"}, + "CCCCC": {"third"}, + }, + }, + } + }) + + It("outputs the response", func() { + Expect(executeErr).To(MatchError(expectedErr)) + + Expect(fakeOutput.DisplayTypeCallCount()).To(Equal(2)) + name, date := fakeOutput.DisplayTypeArgsForCall(1) + Expect(name).To(Equal("RESPONSE")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(1)) + protocol, status := fakeOutput.DisplayResponseHeaderArgsForCall(0) + Expect(protocol).To(Equal("HTTP/1.1")) + Expect(status).To(Equal("200 OK")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 6)) + name, value := fakeOutput.DisplayHeaderArgsForCall(3) + Expect(name).To(Equal("AAAAA")) + Expect(value).To(Equal("first")) + name, value = fakeOutput.DisplayHeaderArgsForCall(4) + Expect(name).To(Equal("BBBBB")) + Expect(value).To(Equal("second")) + name, value = fakeOutput.DisplayHeaderArgsForCall(5) + Expect(name).To(Equal("CCCCC")) + Expect(value).To(Equal("third")) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("some-error-body"))) + }) + }) + }) + + Context("when an error occures while trying to log the response", func() { + var ( + originalErr error + expectedErr error + ) + + BeforeEach(func() { + originalErr = errors.New("this error should not be overwritten") + fakeConnection.MakeReturns(originalErr) + + expectedErr = errors.New("this should never block the request") + + calledOnce := false + fakeOutput.StartStub = func() error { + if !calledOnce { + calledOnce = true + return nil + } + return expectedErr + } + }) + + It("should display the error and continue on", func() { + Expect(executeErr).To(MatchError(originalErr)) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(1)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + }) + }) + + It("starts and stops the output", func() { + Expect(fakeOutput.StartCallCount()).To(Equal(2)) + Expect(fakeOutput.StopCallCount()).To(Equal(2)) + }) + + Context("when displaying the logs have an error", func() { + var expectedErr error + BeforeEach(func() { + expectedErr = errors.New("Display error on request") + fakeOutput.StartReturns(expectedErr) + }) + + It("calls handle internal error", func() { + Expect(executeErr).ToNot(HaveOccurred()) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(2)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(1)).To(MatchError(expectedErr)) + }) + }) + }) +}) diff --git a/api/cfnetworking/wrapper/retry_request.go b/api/cfnetworking/wrapper/retry_request.go new file mode 100644 index 0000000000..600a79825d --- /dev/null +++ b/api/cfnetworking/wrapper/retry_request.go @@ -0,0 +1,54 @@ +package wrapper + +import ( + "net/http" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" +) + +// RetryRequest is a wrapper that retries failed requests if they contain a 5XX +// status code. +type RetryRequest struct { + maxRetries int + connection cfnetworking.Connection +} + +// NewRetryRequest returns a pointer to a RetryRequest wrapper. +func NewRetryRequest(maxRetries int) *RetryRequest { + return &RetryRequest{ + maxRetries: maxRetries, + } +} + +// Wrap sets the connection in the RetryRequest and returns itself. +func (retry *RetryRequest) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { + retry.connection = innerconnection + return retry +} + +// Make retries the request if it comes back with certain status codes. +func (retry *RetryRequest) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + var err error + + for i := 0; i < retry.maxRetries+1; i += 1 { + err = retry.connection.Make(request, passedResponse) + if err == nil { + return nil + } + + if passedResponse.HTTPResponse != nil && + (passedResponse.HTTPResponse.StatusCode == http.StatusBadGateway || + passedResponse.HTTPResponse.StatusCode == http.StatusServiceUnavailable || + passedResponse.HTTPResponse.StatusCode == http.StatusGatewayTimeout || + (passedResponse.HTTPResponse.StatusCode >= 400 && passedResponse.HTTPResponse.StatusCode < 500)) { + break + } + + // Reset the request body prior to the next retry + resetErr := request.ResetBody() + if resetErr != nil { + return resetErr + } + } + return err +} diff --git a/api/cfnetworking/wrapper/retry_request_test.go b/api/cfnetworking/wrapper/retry_request_test.go new file mode 100644 index 0000000000..014b3d08c6 --- /dev/null +++ b/api/cfnetworking/wrapper/retry_request_test.go @@ -0,0 +1,111 @@ +package wrapper_test + +import ( + "errors" + "io/ioutil" + "net/http" + "strings" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/gomega" +) + +var _ = Describe("Retry Request", func() { + DescribeTable("number of retries", + func(requestMethod string, responseStatusCode int, expectedNumberOfRetries int) { + rawRequestBody := "banana pants" + body := strings.NewReader(rawRequestBody) + + req, err := http.NewRequest(requestMethod, "https://foo.bar.com/banana", body) + Expect(err).NotTo(HaveOccurred()) + request := cfnetworking.NewRequest(req, body) + + response := &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: responseStatusCode, + }, + } + + fakeConnection := new(cfnetworkingfakes.FakeConnection) + expectedErr := networkerror.RawHTTPStatusError{ + StatusCode: responseStatusCode, + } + fakeConnection.MakeStub = func(req *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + defer req.Body.Close() + body, readBodyErr := ioutil.ReadAll(request.Body) + Expect(readBodyErr).ToNot(HaveOccurred()) + Expect(string(body)).To(Equal(rawRequestBody)) + return expectedErr + } + + wrapper := NewRetryRequest(2).Wrap(fakeConnection) + err = wrapper.Make(request, response) + Expect(err).To(MatchError(expectedErr)) + Expect(fakeConnection.MakeCallCount()).To(Equal(expectedNumberOfRetries)) + }, + + Entry("maxRetries for Non-Post (500) Internal Server Error", http.MethodGet, http.StatusInternalServerError, 3), + Entry("1 for Post (502) Bad Gateway", http.MethodGet, http.StatusBadGateway, 1), + Entry("1 for Post (503) Service Unavailable", http.MethodGet, http.StatusServiceUnavailable, 1), + Entry("1 for Post (504) Gateway Timeout", http.MethodGet, http.StatusGatewayTimeout, 1), + + Entry("1 for 4XX Errors", http.MethodGet, http.StatusNotFound, 1), + ) + + It("does not retry on success", func() { + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", nil) + Expect(err).NotTo(HaveOccurred()) + request := cfnetworking.NewRequest(req, nil) + response := &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: http.StatusOK, + }, + } + + fakeConnection := new(cfnetworkingfakes.FakeConnection) + wrapper := NewRetryRequest(2).Wrap(fakeConnection) + + err = wrapper.Make(request, response) + Expect(err).ToNot(HaveOccurred()) + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + }) + + Context("when seeking errors", func() { + var ( + request *cfnetworking.Request + response *cfnetworking.Response + + fakeConnection *cfnetworkingfakes.FakeConnection + wrapper cfnetworking.Connection + ) + + BeforeEach(func() { + fakeReadSeeker := new(cfnetworkingfakes.FakeReadSeeker) + fakeReadSeeker.SeekReturns(0, errors.New("oh noes")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", fakeReadSeeker) + Expect(err).NotTo(HaveOccurred()) + request = cfnetworking.NewRequest(req, fakeReadSeeker) + + response = &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: http.StatusInternalServerError, + }, + } + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeConnection.MakeReturns(errors.New("some error")) + wrapper = NewRetryRequest(3).Wrap(fakeConnection) + }) + + It("sets the err on SeekError", func() { + err := wrapper.Make(request, response) + Expect(err).To(MatchError("oh noes")) + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + }) + }) +}) diff --git a/api/cfnetworking/wrapper/uaa_authentication.go b/api/cfnetworking/wrapper/uaa_authentication.go new file mode 100644 index 0000000000..9976cac13c --- /dev/null +++ b/api/cfnetworking/wrapper/uaa_authentication.go @@ -0,0 +1,81 @@ +package wrapper + +import ( + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + "code.cloudfoundry.org/cli/v9/api/uaa" +) + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient + +// UAAClient is the interface for getting a valid access token +type UAAClient interface { + RefreshAccessToken(refreshToken string) (uaa.RefreshedTokens, error) +} + +//go:generate counterfeiter . TokenCache + +// TokenCache is where the UAA token information is stored. +type TokenCache interface { + AccessToken() string + RefreshToken() string + SetAccessToken(token string) + SetRefreshToken(token string) +} + +// UAAAuthentication wraps connections and adds authentication headers to all +// requests +type UAAAuthentication struct { + connection cfnetworking.Connection + client UAAClient + cache TokenCache +} + +// NewUAAAuthentication returns a pointer to a UAAAuthentication wrapper with +// the client and a token cache. +func NewUAAAuthentication(client UAAClient, cache TokenCache) *UAAAuthentication { + return &UAAAuthentication{ + client: client, + cache: cache, + } +} + +// Wrap sets the connection on the UAAAuthentication and returns itself +func (t *UAAAuthentication) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { + t.connection = innerconnection + return t +} + +// SetClient sets the UAA client that the wrapper will use. +func (t *UAAAuthentication) SetClient(client UAAClient) { + t.client = client +} + +// Make adds authentication headers to the passed in request and then calls the +// wrapped connection's Make. If the client is not set on the wrapper, it will +// not add any header or handle any authentication errors. +func (t *UAAAuthentication) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + request.Header.Set("Authorization", t.cache.AccessToken()) + + requestErr := t.connection.Make(request, passedResponse) + if _, ok := requestErr.(networkerror.InvalidAuthTokenError); ok { + tokens, err := t.client.RefreshAccessToken(t.cache.RefreshToken()) + if err != nil { + return err + } + + t.cache.SetAccessToken(tokens.AuthorizationToken()) + t.cache.SetRefreshToken(tokens.RefreshToken) + + if request.Body != nil { + err = request.ResetBody() + if err != nil { + return err + } + } + request.Header.Set("Authorization", t.cache.AccessToken()) + requestErr = t.connection.Make(request, passedResponse) + } + + return requestErr +} diff --git a/api/cfnetworking/wrapper/uaa_authentication_test.go b/api/cfnetworking/wrapper/uaa_authentication_test.go new file mode 100644 index 0000000000..b7713a225e --- /dev/null +++ b/api/cfnetworking/wrapper/uaa_authentication_test.go @@ -0,0 +1,174 @@ +package wrapper_test + +import ( + "errors" + "io/ioutil" + "net/http" + "strings" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" +) + +var _ = Describe("UAA Authentication", func() { + var ( + fakeConnection *cfnetworkingfakes.FakeConnection + fakeClient *wrapperfakes.FakeUAAClient + inMemoryCache *util.InMemoryCache + + wrapper cfnetworking.Connection + request *cfnetworking.Request + inner *UAAAuthentication + ) + + BeforeEach(func() { + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeClient = new(wrapperfakes.FakeUAAClient) + inMemoryCache = util.NewInMemoryTokenCache() + inMemoryCache.SetAccessToken("a-ok") + + inner = NewUAAAuthentication(fakeClient, inMemoryCache) + wrapper = inner.Wrap(fakeConnection) + + request = &cfnetworking.Request{ + Request: &http.Request{ + Header: http.Header{}, + }, + } + }) + + Describe("Make", func() { + It("adds authentication headers", func() { + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + authenticatedRequest, _ := fakeConnection.MakeArgsForCall(0) + headers := authenticatedRequest.Header + Expect(headers["Authorization"]).To(ConsistOf([]string{"a-ok"})) + }) + + Context("when the token is valid", func() { + Context("when the request already has headers", func() { + It("preserves existing headers", func() { + request.Header.Add("Existing", "header") + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + authenticatedRequest, _ := fakeConnection.MakeArgsForCall(0) + headers := authenticatedRequest.Header + Expect(headers["Existing"]).To(ConsistOf([]string{"header"})) + }) + }) + + Context("when the wrapped connection returns nil", func() { + It("returns nil", func() { + fakeConnection.MakeReturns(nil) + + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + }) + }) + + Context("when the wrapped connection returns an error", func() { + It("returns the error", func() { + innerError := errors.New("inner error") + fakeConnection.MakeReturns(innerError) + + err := wrapper.Make(request, nil) + Expect(err).To(Equal(innerError)) + }) + }) + }) + + Context("when the token is invalid", func() { + var ( + expectedBody string + request *cfnetworking.Request + executeErr error + ) + + BeforeEach(func() { + expectedBody = "this body content should be preserved" + body := strings.NewReader(expectedBody) + request = cfnetworking.NewRequest(&http.Request{ + Header: http.Header{}, + Body: ioutil.NopCloser(body), + }, body) + + makeCount := 0 + fakeConnection.MakeStub = func(request *cfnetworking.Request, response *cfnetworking.Response) error { + body, err := ioutil.ReadAll(request.Body) + Expect(err).NotTo(HaveOccurred()) + Expect(string(body)).To(Equal(expectedBody)) + + if makeCount == 0 { + makeCount += 1 + return networkerror.InvalidAuthTokenError{} + } else { + return nil + } + } + + inMemoryCache.SetAccessToken("what") + + fakeClient.RefreshAccessTokenReturns( + uaa.RefreshedTokens{ + AccessToken: "foobar-2", + RefreshToken: "bananananananana", + Type: "bearer", + }, + nil, + ) + }) + + JustBeforeEach(func() { + executeErr = wrapper.Make(request, nil) + }) + + It("should refresh the token", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(fakeClient.RefreshAccessTokenCallCount()).To(Equal(1)) + }) + + It("should resend the request", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(fakeConnection.MakeCallCount()).To(Equal(2)) + + requestArg, _ := fakeConnection.MakeArgsForCall(1) + Expect(requestArg.Header.Get("Authorization")).To(Equal("bearer foobar-2")) + }) + + It("should save the refresh token", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(inMemoryCache.RefreshToken()).To(Equal("bananananananana")) + }) + + Context("when the reseting the request body fails", func() { + BeforeEach(func() { + fakeConnection.MakeReturnsOnCall(0, networkerror.InvalidAuthTokenError{}) + + fakeReadSeeker := new(cfnetworkingfakes.FakeReadSeeker) + fakeReadSeeker.SeekReturns(0, errors.New("oh noes")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", fakeReadSeeker) + Expect(err).NotTo(HaveOccurred()) + request = cfnetworking.NewRequest(req, fakeReadSeeker) + }) + + It("returns error on seek", func() { + Expect(executeErr).To(MatchError("oh noes")) + }) + }) + }) + }) +}) diff --git a/api/cfnetworking/wrapper/util/in_memory_cache.go b/api/cfnetworking/wrapper/util/in_memory_cache.go new file mode 100644 index 0000000000..91ef7af265 --- /dev/null +++ b/api/cfnetworking/wrapper/util/in_memory_cache.go @@ -0,0 +1,26 @@ +package util + +type InMemoryCache struct { + accessToken string + refreshToken string +} + +func (c InMemoryCache) AccessToken() string { + return c.accessToken +} + +func (c InMemoryCache) RefreshToken() string { + return c.refreshToken +} + +func (c *InMemoryCache) SetAccessToken(token string) { + c.accessToken = token +} + +func (c *InMemoryCache) SetRefreshToken(token string) { + c.refreshToken = token +} + +func NewInMemoryTokenCache() *InMemoryCache { + return new(InMemoryCache) +} diff --git a/api/cfnetworking/wrapper/wrapper_suite_test.go b/api/cfnetworking/wrapper/wrapper_suite_test.go new file mode 100644 index 0000000000..a56eec41d0 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapper_suite_test.go @@ -0,0 +1,36 @@ +package wrapper_test + +import ( + "bytes" + "log" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" + + "testing" +) + +func TestWrapper(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Wrapper Suite") +} + +var server *Server + +var _ = SynchronizedBeforeSuite(func() []byte { + return []byte{} +}, func(data []byte) { + server = NewTLSServer() + + // Suppresses ginkgo server logs + server.HTTPTestServer.Config.ErrorLog = log.New(&bytes.Buffer{}, "", 0) +}) + +var _ = SynchronizedAfterSuite(func() { + server.Close() +}, func() {}) + +var _ = BeforeEach(func() { + server.Reset() +}) diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go b/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go new file mode 100644 index 0000000000..539b0d1101 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go @@ -0,0 +1,613 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" +) + +type FakeRequestLoggerOutput struct { + DisplayHeaderStub func(name string, value string) error + displayHeaderMutex sync.RWMutex + displayHeaderArgsForCall []struct { + name string + value string + } + displayHeaderReturns struct { + result1 error + } + displayHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayHostStub func(name string) error + displayHostMutex sync.RWMutex + displayHostArgsForCall []struct { + name string + } + displayHostReturns struct { + result1 error + } + displayHostReturnsOnCall map[int]struct { + result1 error + } + DisplayJSONBodyStub func(body []byte) error + displayJSONBodyMutex sync.RWMutex + displayJSONBodyArgsForCall []struct { + body []byte + } + displayJSONBodyReturns struct { + result1 error + } + displayJSONBodyReturnsOnCall map[int]struct { + result1 error + } + DisplayMessageStub func(msg string) error + displayMessageMutex sync.RWMutex + displayMessageArgsForCall []struct { + msg string + } + displayMessageReturns struct { + result1 error + } + displayMessageReturnsOnCall map[int]struct { + result1 error + } + DisplayRequestHeaderStub func(method string, uri string, httpProtocol string) error + displayRequestHeaderMutex sync.RWMutex + displayRequestHeaderArgsForCall []struct { + method string + uri string + httpProtocol string + } + displayRequestHeaderReturns struct { + result1 error + } + displayRequestHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayResponseHeaderStub func(httpProtocol string, status string) error + displayResponseHeaderMutex sync.RWMutex + displayResponseHeaderArgsForCall []struct { + httpProtocol string + status string + } + displayResponseHeaderReturns struct { + result1 error + } + displayResponseHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayTypeStub func(name string, requestDate time.Time) error + displayTypeMutex sync.RWMutex + displayTypeArgsForCall []struct { + name string + requestDate time.Time + } + displayTypeReturns struct { + result1 error + } + displayTypeReturnsOnCall map[int]struct { + result1 error + } + HandleInternalErrorStub func(err error) + handleInternalErrorMutex sync.RWMutex + handleInternalErrorArgsForCall []struct { + err error + } + StartStub func() error + startMutex sync.RWMutex + startArgsForCall []struct{} + startReturns struct { + result1 error + } + startReturnsOnCall map[int]struct { + result1 error + } + StopStub func() error + stopMutex sync.RWMutex + stopArgsForCall []struct{} + stopReturns struct { + result1 error + } + stopReturnsOnCall map[int]struct { + result1 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeRequestLoggerOutput) DisplayHeader(name string, value string) error { + fake.displayHeaderMutex.Lock() + ret, specificReturn := fake.displayHeaderReturnsOnCall[len(fake.displayHeaderArgsForCall)] + fake.displayHeaderArgsForCall = append(fake.displayHeaderArgsForCall, struct { + name string + value string + }{name, value}) + fake.recordInvocation("DisplayHeader", []interface{}{name, value}) + fake.displayHeaderMutex.Unlock() + if fake.DisplayHeaderStub != nil { + return fake.DisplayHeaderStub(name, value) + } + if specificReturn { + return ret.result1 + } + return fake.displayHeaderReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderCallCount() int { + fake.displayHeaderMutex.RLock() + defer fake.displayHeaderMutex.RUnlock() + return len(fake.displayHeaderArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderArgsForCall(i int) (string, string) { + fake.displayHeaderMutex.RLock() + defer fake.displayHeaderMutex.RUnlock() + return fake.displayHeaderArgsForCall[i].name, fake.displayHeaderArgsForCall[i].value +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderReturns(result1 error) { + fake.DisplayHeaderStub = nil + fake.displayHeaderReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderReturnsOnCall(i int, result1 error) { + fake.DisplayHeaderStub = nil + if fake.displayHeaderReturnsOnCall == nil { + fake.displayHeaderReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayHost(name string) error { + fake.displayHostMutex.Lock() + ret, specificReturn := fake.displayHostReturnsOnCall[len(fake.displayHostArgsForCall)] + fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { + name string + }{name}) + fake.recordInvocation("DisplayHost", []interface{}{name}) + fake.displayHostMutex.Unlock() + if fake.DisplayHostStub != nil { + return fake.DisplayHostStub(name) + } + if specificReturn { + return ret.result1 + } + return fake.displayHostReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayHostCallCount() int { + fake.displayHostMutex.RLock() + defer fake.displayHostMutex.RUnlock() + return len(fake.displayHostArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayHostArgsForCall(i int) string { + fake.displayHostMutex.RLock() + defer fake.displayHostMutex.RUnlock() + return fake.displayHostArgsForCall[i].name +} + +func (fake *FakeRequestLoggerOutput) DisplayHostReturns(result1 error) { + fake.DisplayHostStub = nil + fake.displayHostReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayHostReturnsOnCall(i int, result1 error) { + fake.DisplayHostStub = nil + if fake.displayHostReturnsOnCall == nil { + fake.displayHostReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayHostReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBody(body []byte) error { + var bodyCopy []byte + if body != nil { + bodyCopy = make([]byte, len(body)) + copy(bodyCopy, body) + } + fake.displayJSONBodyMutex.Lock() + ret, specificReturn := fake.displayJSONBodyReturnsOnCall[len(fake.displayJSONBodyArgsForCall)] + fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { + body []byte + }{bodyCopy}) + fake.recordInvocation("DisplayJSONBody", []interface{}{bodyCopy}) + fake.displayJSONBodyMutex.Unlock() + if fake.DisplayJSONBodyStub != nil { + return fake.DisplayJSONBodyStub(body) + } + if specificReturn { + return ret.result1 + } + return fake.displayJSONBodyReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyCallCount() int { + fake.displayJSONBodyMutex.RLock() + defer fake.displayJSONBodyMutex.RUnlock() + return len(fake.displayJSONBodyArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyArgsForCall(i int) []byte { + fake.displayJSONBodyMutex.RLock() + defer fake.displayJSONBodyMutex.RUnlock() + return fake.displayJSONBodyArgsForCall[i].body +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyReturns(result1 error) { + fake.DisplayJSONBodyStub = nil + fake.displayJSONBodyReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyReturnsOnCall(i int, result1 error) { + fake.DisplayJSONBodyStub = nil + if fake.displayJSONBodyReturnsOnCall == nil { + fake.displayJSONBodyReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayJSONBodyReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayMessage(msg string) error { + fake.displayMessageMutex.Lock() + ret, specificReturn := fake.displayMessageReturnsOnCall[len(fake.displayMessageArgsForCall)] + fake.displayMessageArgsForCall = append(fake.displayMessageArgsForCall, struct { + msg string + }{msg}) + fake.recordInvocation("DisplayMessage", []interface{}{msg}) + fake.displayMessageMutex.Unlock() + if fake.DisplayMessageStub != nil { + return fake.DisplayMessageStub(msg) + } + if specificReturn { + return ret.result1 + } + return fake.displayMessageReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageCallCount() int { + fake.displayMessageMutex.RLock() + defer fake.displayMessageMutex.RUnlock() + return len(fake.displayMessageArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageArgsForCall(i int) string { + fake.displayMessageMutex.RLock() + defer fake.displayMessageMutex.RUnlock() + return fake.displayMessageArgsForCall[i].msg +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageReturns(result1 error) { + fake.DisplayMessageStub = nil + fake.displayMessageReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageReturnsOnCall(i int, result1 error) { + fake.DisplayMessageStub = nil + if fake.displayMessageReturnsOnCall == nil { + fake.displayMessageReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayMessageReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(method string, uri string, httpProtocol string) error { + fake.displayRequestHeaderMutex.Lock() + ret, specificReturn := fake.displayRequestHeaderReturnsOnCall[len(fake.displayRequestHeaderArgsForCall)] + fake.displayRequestHeaderArgsForCall = append(fake.displayRequestHeaderArgsForCall, struct { + method string + uri string + httpProtocol string + }{method, uri, httpProtocol}) + fake.recordInvocation("DisplayRequestHeader", []interface{}{method, uri, httpProtocol}) + fake.displayRequestHeaderMutex.Unlock() + if fake.DisplayRequestHeaderStub != nil { + return fake.DisplayRequestHeaderStub(method, uri, httpProtocol) + } + if specificReturn { + return ret.result1 + } + return fake.displayRequestHeaderReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderCallCount() int { + fake.displayRequestHeaderMutex.RLock() + defer fake.displayRequestHeaderMutex.RUnlock() + return len(fake.displayRequestHeaderArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderArgsForCall(i int) (string, string, string) { + fake.displayRequestHeaderMutex.RLock() + defer fake.displayRequestHeaderMutex.RUnlock() + return fake.displayRequestHeaderArgsForCall[i].method, fake.displayRequestHeaderArgsForCall[i].uri, fake.displayRequestHeaderArgsForCall[i].httpProtocol +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderReturns(result1 error) { + fake.DisplayRequestHeaderStub = nil + fake.displayRequestHeaderReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderReturnsOnCall(i int, result1 error) { + fake.DisplayRequestHeaderStub = nil + if fake.displayRequestHeaderReturnsOnCall == nil { + fake.displayRequestHeaderReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayRequestHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(httpProtocol string, status string) error { + fake.displayResponseHeaderMutex.Lock() + ret, specificReturn := fake.displayResponseHeaderReturnsOnCall[len(fake.displayResponseHeaderArgsForCall)] + fake.displayResponseHeaderArgsForCall = append(fake.displayResponseHeaderArgsForCall, struct { + httpProtocol string + status string + }{httpProtocol, status}) + fake.recordInvocation("DisplayResponseHeader", []interface{}{httpProtocol, status}) + fake.displayResponseHeaderMutex.Unlock() + if fake.DisplayResponseHeaderStub != nil { + return fake.DisplayResponseHeaderStub(httpProtocol, status) + } + if specificReturn { + return ret.result1 + } + return fake.displayResponseHeaderReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderCallCount() int { + fake.displayResponseHeaderMutex.RLock() + defer fake.displayResponseHeaderMutex.RUnlock() + return len(fake.displayResponseHeaderArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderArgsForCall(i int) (string, string) { + fake.displayResponseHeaderMutex.RLock() + defer fake.displayResponseHeaderMutex.RUnlock() + return fake.displayResponseHeaderArgsForCall[i].httpProtocol, fake.displayResponseHeaderArgsForCall[i].status +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderReturns(result1 error) { + fake.DisplayResponseHeaderStub = nil + fake.displayResponseHeaderReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderReturnsOnCall(i int, result1 error) { + fake.DisplayResponseHeaderStub = nil + if fake.displayResponseHeaderReturnsOnCall == nil { + fake.displayResponseHeaderReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayResponseHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayType(name string, requestDate time.Time) error { + fake.displayTypeMutex.Lock() + ret, specificReturn := fake.displayTypeReturnsOnCall[len(fake.displayTypeArgsForCall)] + fake.displayTypeArgsForCall = append(fake.displayTypeArgsForCall, struct { + name string + requestDate time.Time + }{name, requestDate}) + fake.recordInvocation("DisplayType", []interface{}{name, requestDate}) + fake.displayTypeMutex.Unlock() + if fake.DisplayTypeStub != nil { + return fake.DisplayTypeStub(name, requestDate) + } + if specificReturn { + return ret.result1 + } + return fake.displayTypeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeCallCount() int { + fake.displayTypeMutex.RLock() + defer fake.displayTypeMutex.RUnlock() + return len(fake.displayTypeArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeArgsForCall(i int) (string, time.Time) { + fake.displayTypeMutex.RLock() + defer fake.displayTypeMutex.RUnlock() + return fake.displayTypeArgsForCall[i].name, fake.displayTypeArgsForCall[i].requestDate +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeReturns(result1 error) { + fake.DisplayTypeStub = nil + fake.displayTypeReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeReturnsOnCall(i int, result1 error) { + fake.DisplayTypeStub = nil + if fake.displayTypeReturnsOnCall == nil { + fake.displayTypeReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.displayTypeReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) HandleInternalError(err error) { + fake.handleInternalErrorMutex.Lock() + fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { + err error + }{err}) + fake.recordInvocation("HandleInternalError", []interface{}{err}) + fake.handleInternalErrorMutex.Unlock() + if fake.HandleInternalErrorStub != nil { + fake.HandleInternalErrorStub(err) + } +} + +func (fake *FakeRequestLoggerOutput) HandleInternalErrorCallCount() int { + fake.handleInternalErrorMutex.RLock() + defer fake.handleInternalErrorMutex.RUnlock() + return len(fake.handleInternalErrorArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) HandleInternalErrorArgsForCall(i int) error { + fake.handleInternalErrorMutex.RLock() + defer fake.handleInternalErrorMutex.RUnlock() + return fake.handleInternalErrorArgsForCall[i].err +} + +func (fake *FakeRequestLoggerOutput) Start() error { + fake.startMutex.Lock() + ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] + fake.startArgsForCall = append(fake.startArgsForCall, struct{}{}) + fake.recordInvocation("Start", []interface{}{}) + fake.startMutex.Unlock() + if fake.StartStub != nil { + return fake.StartStub() + } + if specificReturn { + return ret.result1 + } + return fake.startReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) StartCallCount() int { + fake.startMutex.RLock() + defer fake.startMutex.RUnlock() + return len(fake.startArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) StartReturns(result1 error) { + fake.StartStub = nil + fake.startReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) StartReturnsOnCall(i int, result1 error) { + fake.StartStub = nil + if fake.startReturnsOnCall == nil { + fake.startReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.startReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) Stop() error { + fake.stopMutex.Lock() + ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] + fake.stopArgsForCall = append(fake.stopArgsForCall, struct{}{}) + fake.recordInvocation("Stop", []interface{}{}) + fake.stopMutex.Unlock() + if fake.StopStub != nil { + return fake.StopStub() + } + if specificReturn { + return ret.result1 + } + return fake.stopReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) StopCallCount() int { + fake.stopMutex.RLock() + defer fake.stopMutex.RUnlock() + return len(fake.stopArgsForCall) +} + +func (fake *FakeRequestLoggerOutput) StopReturns(result1 error) { + fake.StopStub = nil + fake.stopReturns = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) StopReturnsOnCall(i int, result1 error) { + fake.StopStub = nil + if fake.stopReturnsOnCall == nil { + fake.stopReturnsOnCall = make(map[int]struct { + result1 error + }) + } + fake.stopReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.displayHeaderMutex.RLock() + defer fake.displayHeaderMutex.RUnlock() + fake.displayHostMutex.RLock() + defer fake.displayHostMutex.RUnlock() + fake.displayJSONBodyMutex.RLock() + defer fake.displayJSONBodyMutex.RUnlock() + fake.displayMessageMutex.RLock() + defer fake.displayMessageMutex.RUnlock() + fake.displayRequestHeaderMutex.RLock() + defer fake.displayRequestHeaderMutex.RUnlock() + fake.displayResponseHeaderMutex.RLock() + defer fake.displayResponseHeaderMutex.RUnlock() + fake.displayTypeMutex.RLock() + defer fake.displayTypeMutex.RUnlock() + fake.handleInternalErrorMutex.RLock() + defer fake.handleInternalErrorMutex.RUnlock() + fake.startMutex.RLock() + defer fake.startMutex.RUnlock() + fake.stopMutex.RLock() + defer fake.stopMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeRequestLoggerOutput) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ wrapper.RequestLoggerOutput = new(FakeRequestLoggerOutput) diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go b/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go new file mode 100644 index 0000000000..3df574837c --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go @@ -0,0 +1,201 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" +) + +type FakeTokenCache struct { + AccessTokenStub func() string + accessTokenMutex sync.RWMutex + accessTokenArgsForCall []struct{} + accessTokenReturns struct { + result1 string + } + accessTokenReturnsOnCall map[int]struct { + result1 string + } + RefreshTokenStub func() string + refreshTokenMutex sync.RWMutex + refreshTokenArgsForCall []struct{} + refreshTokenReturns struct { + result1 string + } + refreshTokenReturnsOnCall map[int]struct { + result1 string + } + SetAccessTokenStub func(token string) + setAccessTokenMutex sync.RWMutex + setAccessTokenArgsForCall []struct { + token string + } + SetRefreshTokenStub func(token string) + setRefreshTokenMutex sync.RWMutex + setRefreshTokenArgsForCall []struct { + token string + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeTokenCache) AccessToken() string { + fake.accessTokenMutex.Lock() + ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] + fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct{}{}) + fake.recordInvocation("AccessToken", []interface{}{}) + fake.accessTokenMutex.Unlock() + if fake.AccessTokenStub != nil { + return fake.AccessTokenStub() + } + if specificReturn { + return ret.result1 + } + return fake.accessTokenReturns.result1 +} + +func (fake *FakeTokenCache) AccessTokenCallCount() int { + fake.accessTokenMutex.RLock() + defer fake.accessTokenMutex.RUnlock() + return len(fake.accessTokenArgsForCall) +} + +func (fake *FakeTokenCache) AccessTokenReturns(result1 string) { + fake.AccessTokenStub = nil + fake.accessTokenReturns = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) AccessTokenReturnsOnCall(i int, result1 string) { + fake.AccessTokenStub = nil + if fake.accessTokenReturnsOnCall == nil { + fake.accessTokenReturnsOnCall = make(map[int]struct { + result1 string + }) + } + fake.accessTokenReturnsOnCall[i] = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) RefreshToken() string { + fake.refreshTokenMutex.Lock() + ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] + fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct{}{}) + fake.recordInvocation("RefreshToken", []interface{}{}) + fake.refreshTokenMutex.Unlock() + if fake.RefreshTokenStub != nil { + return fake.RefreshTokenStub() + } + if specificReturn { + return ret.result1 + } + return fake.refreshTokenReturns.result1 +} + +func (fake *FakeTokenCache) RefreshTokenCallCount() int { + fake.refreshTokenMutex.RLock() + defer fake.refreshTokenMutex.RUnlock() + return len(fake.refreshTokenArgsForCall) +} + +func (fake *FakeTokenCache) RefreshTokenReturns(result1 string) { + fake.RefreshTokenStub = nil + fake.refreshTokenReturns = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) RefreshTokenReturnsOnCall(i int, result1 string) { + fake.RefreshTokenStub = nil + if fake.refreshTokenReturnsOnCall == nil { + fake.refreshTokenReturnsOnCall = make(map[int]struct { + result1 string + }) + } + fake.refreshTokenReturnsOnCall[i] = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) SetAccessToken(token string) { + fake.setAccessTokenMutex.Lock() + fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { + token string + }{token}) + fake.recordInvocation("SetAccessToken", []interface{}{token}) + fake.setAccessTokenMutex.Unlock() + if fake.SetAccessTokenStub != nil { + fake.SetAccessTokenStub(token) + } +} + +func (fake *FakeTokenCache) SetAccessTokenCallCount() int { + fake.setAccessTokenMutex.RLock() + defer fake.setAccessTokenMutex.RUnlock() + return len(fake.setAccessTokenArgsForCall) +} + +func (fake *FakeTokenCache) SetAccessTokenArgsForCall(i int) string { + fake.setAccessTokenMutex.RLock() + defer fake.setAccessTokenMutex.RUnlock() + return fake.setAccessTokenArgsForCall[i].token +} + +func (fake *FakeTokenCache) SetRefreshToken(token string) { + fake.setRefreshTokenMutex.Lock() + fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { + token string + }{token}) + fake.recordInvocation("SetRefreshToken", []interface{}{token}) + fake.setRefreshTokenMutex.Unlock() + if fake.SetRefreshTokenStub != nil { + fake.SetRefreshTokenStub(token) + } +} + +func (fake *FakeTokenCache) SetRefreshTokenCallCount() int { + fake.setRefreshTokenMutex.RLock() + defer fake.setRefreshTokenMutex.RUnlock() + return len(fake.setRefreshTokenArgsForCall) +} + +func (fake *FakeTokenCache) SetRefreshTokenArgsForCall(i int) string { + fake.setRefreshTokenMutex.RLock() + defer fake.setRefreshTokenMutex.RUnlock() + return fake.setRefreshTokenArgsForCall[i].token +} + +func (fake *FakeTokenCache) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.accessTokenMutex.RLock() + defer fake.accessTokenMutex.RUnlock() + fake.refreshTokenMutex.RLock() + defer fake.refreshTokenMutex.RUnlock() + fake.setAccessTokenMutex.RLock() + defer fake.setAccessTokenMutex.RUnlock() + fake.setRefreshTokenMutex.RLock() + defer fake.setRefreshTokenMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeTokenCache) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ wrapper.TokenCache = new(FakeTokenCache) diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go b/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go new file mode 100644 index 0000000000..2c0897d0db --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go @@ -0,0 +1,104 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/uaa" +) + +type FakeUAAClient struct { + RefreshAccessTokenStub func(refreshToken string) (uaa.RefreshedTokens, error) + refreshAccessTokenMutex sync.RWMutex + refreshAccessTokenArgsForCall []struct { + refreshToken string + } + refreshAccessTokenReturns struct { + result1 uaa.RefreshedTokens + result2 error + } + refreshAccessTokenReturnsOnCall map[int]struct { + result1 uaa.RefreshedTokens + result2 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +func (fake *FakeUAAClient) RefreshAccessToken(refreshToken string) (uaa.RefreshedTokens, error) { + fake.refreshAccessTokenMutex.Lock() + ret, specificReturn := fake.refreshAccessTokenReturnsOnCall[len(fake.refreshAccessTokenArgsForCall)] + fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { + refreshToken string + }{refreshToken}) + fake.recordInvocation("RefreshAccessToken", []interface{}{refreshToken}) + fake.refreshAccessTokenMutex.Unlock() + if fake.RefreshAccessTokenStub != nil { + return fake.RefreshAccessTokenStub(refreshToken) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fake.refreshAccessTokenReturns.result1, fake.refreshAccessTokenReturns.result2 +} + +func (fake *FakeUAAClient) RefreshAccessTokenCallCount() int { + fake.refreshAccessTokenMutex.RLock() + defer fake.refreshAccessTokenMutex.RUnlock() + return len(fake.refreshAccessTokenArgsForCall) +} + +func (fake *FakeUAAClient) RefreshAccessTokenArgsForCall(i int) string { + fake.refreshAccessTokenMutex.RLock() + defer fake.refreshAccessTokenMutex.RUnlock() + return fake.refreshAccessTokenArgsForCall[i].refreshToken +} + +func (fake *FakeUAAClient) RefreshAccessTokenReturns(result1 uaa.RefreshedTokens, result2 error) { + fake.RefreshAccessTokenStub = nil + fake.refreshAccessTokenReturns = struct { + result1 uaa.RefreshedTokens + result2 error + }{result1, result2} +} + +func (fake *FakeUAAClient) RefreshAccessTokenReturnsOnCall(i int, result1 uaa.RefreshedTokens, result2 error) { + fake.RefreshAccessTokenStub = nil + if fake.refreshAccessTokenReturnsOnCall == nil { + fake.refreshAccessTokenReturnsOnCall = make(map[int]struct { + result1 uaa.RefreshedTokens + result2 error + }) + } + fake.refreshAccessTokenReturnsOnCall[i] = struct { + result1 uaa.RefreshedTokens + result2 error + }{result1, result2} +} + +func (fake *FakeUAAClient) Invocations() map[string][][]interface{} { + fake.invocationsMutex.RLock() + defer fake.invocationsMutex.RUnlock() + fake.refreshAccessTokenMutex.RLock() + defer fake.refreshAccessTokenMutex.RUnlock() + copiedInvocations := map[string][][]interface{}{} + for key, value := range fake.invocations { + copiedInvocations[key] = value + } + return copiedInvocations +} + +func (fake *FakeUAAClient) recordInvocation(key string, args []interface{}) { + fake.invocationsMutex.Lock() + defer fake.invocationsMutex.Unlock() + if fake.invocations == nil { + fake.invocations = map[string][][]interface{}{} + } + if fake.invocations[key] == nil { + fake.invocations[key] = [][]interface{}{} + } + fake.invocations[key] = append(fake.invocations[key], args) +} + +var _ wrapper.UAAClient = new(FakeUAAClient) diff --git a/api/uaa/client.go b/api/uaa/client.go index 0826f97b9a..5702b968d4 100644 --- a/api/uaa/client.go +++ b/api/uaa/client.go @@ -9,7 +9,6 @@ import ( "fmt" "runtime" - legacy "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/v9/api/uaa/internal" ) @@ -22,8 +21,6 @@ type Client struct { connection Connection router *internal.Router userAgent string - - legacyClient *legacy.Client } // NewClient returns a new UAA Client with the provided configuration @@ -41,14 +38,8 @@ func NewClient(config Config) *Client { connection: NewConnection(config.SkipSSLValidation(), config.UAADisableKeepAlives(), config.DialTimeout()), userAgent: userAgent, - - legacyClient: legacy.NewClient(config), } client.WrapConnection(NewErrorWrapper()) return &client } - -func (c Client) LegacyClient() *legacy.Client { - return c.legacyClient -} diff --git a/command/v7/shared/new_clients_test.go b/command/v7/shared/new_clients_test.go index 7ccfe31403..a3a8b96701 100644 --- a/command/v7/shared/new_clients_test.go +++ b/command/v7/shared/new_clients_test.go @@ -52,8 +52,8 @@ var _ = Describe("New Clients", func() { Expect(err).NotTo(HaveOccurred()) Expect(fakeConfig.TargetCallCount()).To(Equal(2)) - Expect(fakeConfig.DialTimeoutCallCount()).To(Equal(4)) - Expect(fakeConfig.SkipSSLValidationCallCount()).To(Equal(4)) + Expect(fakeConfig.DialTimeoutCallCount()).To(Equal(3)) + Expect(fakeConfig.SkipSSLValidationCallCount()).To(Equal(3)) }) }) diff --git a/command/v7/shared/new_networking_client.go b/command/v7/shared/new_networking_client.go index 80dc67ebaf..b0eaa7c489 100644 --- a/command/v7/shared/new_networking_client.go +++ b/command/v7/shared/new_networking_client.go @@ -1,8 +1,8 @@ package shared import ( - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" "code.cloudfoundry.org/cli/v9/api/uaa" "code.cloudfoundry.org/cli/v9/command" "code.cloudfoundry.org/cli/v9/command/translatableerror" @@ -24,7 +24,7 @@ func NewNetworkingClient(apiURL string, config command.Config, uaaClient *uaa.Cl wrappers = append(wrappers, wrapper.NewRequestLogger(ui.RequestLoggerFileWriter(location))) } - authWrapper := wrapper.NewUAAAuthentication(uaaClient.LegacyClient(), config) + authWrapper := wrapper.NewUAAAuthentication(uaaClient, config) wrappers = append(wrappers, authWrapper) wrappers = append(wrappers, wrapper.NewRetryRequest(config.RequestRetryCount())) diff --git a/command/v7/task_command.go b/command/v7/task_command.go index 44fe05ce3d..f59c2f10ac 100644 --- a/command/v7/task_command.go +++ b/command/v7/task_command.go @@ -3,8 +3,8 @@ package v7 import ( "strconv" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type TaskCommand struct { diff --git a/command/v7/task_command_test.go b/command/v7/task_command_test.go index 9d2ccdc3e6..7812d65c3f 100644 --- a/command/v7/task_command_test.go +++ b/command/v7/task_command_test.go @@ -3,16 +3,16 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/go.mod b/go.mod index 0dac52787f..765bce45ee 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.23.1 require ( code.cloudfoundry.org/bytefmt v0.21.0 - 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.24.0 From e7e5a47510dc966c9c4253399f7abdb04efe6634 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:49:16 +0100 Subject: [PATCH 08/19] fix dependencies and regenerate fakes --- .../cfnetv1fakes/fake_connection_wrapper.go | 70 ++-- .../cfnetworkingfakes/fake_connection.go | 37 +- .../cfnetworkingfakes/fake_read_seeker.go | 78 ++-- .../wrapper/uaa_authentication.go | 76 ++-- .../fake_request_logger_output.go | 337 ++++++++++++------ .../wrapper/wrapperfakes/fake_token_cache.go | 104 ++++-- .../wrapper/wrapperfakes/fake_uaaclient.go | 33 +- go.mod | 3 + go.sum | 4 - integration/v7/isolated/task_command_test.go | 2 +- 10 files changed, 496 insertions(+), 248 deletions(-) diff --git a/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go b/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go index f1fb21e68c..5ada76a17d 100644 --- a/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go +++ b/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go @@ -9,11 +9,11 @@ import ( ) type FakeConnectionWrapper struct { - MakeStub func(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error + MakeStub func(*cfnetworking.Request, *cfnetworking.Response) error makeMutex sync.RWMutex makeArgsForCall []struct { - request *cfnetworking.Request - passedResponse *cfnetworking.Response + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response } makeReturns struct { result1 error @@ -21,10 +21,10 @@ type FakeConnectionWrapper struct { makeReturnsOnCall map[int]struct { result1 error } - WrapStub func(innerconnection cfnetworking.Connection) cfnetworking.Connection + WrapStub func(cfnetworking.Connection) cfnetworking.Connection wrapMutex sync.RWMutex wrapArgsForCall []struct { - innerconnection cfnetworking.Connection + arg1 cfnetworking.Connection } wrapReturns struct { result1 cfnetworking.Connection @@ -36,22 +36,24 @@ type FakeConnectionWrapper struct { invocationsMutex sync.RWMutex } -func (fake *FakeConnectionWrapper) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { +func (fake *FakeConnectionWrapper) Make(arg1 *cfnetworking.Request, arg2 *cfnetworking.Response) error { fake.makeMutex.Lock() ret, specificReturn := fake.makeReturnsOnCall[len(fake.makeArgsForCall)] fake.makeArgsForCall = append(fake.makeArgsForCall, struct { - request *cfnetworking.Request - passedResponse *cfnetworking.Response - }{request, passedResponse}) - fake.recordInvocation("Make", []interface{}{request, passedResponse}) + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns + fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(request, passedResponse) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - return fake.makeReturns.result1 + return fakeReturns.result1 } func (fake *FakeConnectionWrapper) MakeCallCount() int { @@ -60,13 +62,22 @@ func (fake *FakeConnectionWrapper) MakeCallCount() int { return len(fake.makeArgsForCall) } +func (fake *FakeConnectionWrapper) MakeCalls(stub func(*cfnetworking.Request, *cfnetworking.Response) error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() + fake.MakeStub = stub +} + func (fake *FakeConnectionWrapper) MakeArgsForCall(i int) (*cfnetworking.Request, *cfnetworking.Response) { fake.makeMutex.RLock() defer fake.makeMutex.RUnlock() - return fake.makeArgsForCall[i].request, fake.makeArgsForCall[i].passedResponse + argsForCall := fake.makeArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 } func (fake *FakeConnectionWrapper) MakeReturns(result1 error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() fake.MakeStub = nil fake.makeReturns = struct { result1 error @@ -74,6 +85,8 @@ func (fake *FakeConnectionWrapper) MakeReturns(result1 error) { } func (fake *FakeConnectionWrapper) MakeReturnsOnCall(i int, result1 error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() fake.MakeStub = nil if fake.makeReturnsOnCall == nil { fake.makeReturnsOnCall = make(map[int]struct { @@ -85,21 +98,23 @@ func (fake *FakeConnectionWrapper) MakeReturnsOnCall(i int, result1 error) { }{result1} } -func (fake *FakeConnectionWrapper) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { +func (fake *FakeConnectionWrapper) Wrap(arg1 cfnetworking.Connection) cfnetworking.Connection { fake.wrapMutex.Lock() ret, specificReturn := fake.wrapReturnsOnCall[len(fake.wrapArgsForCall)] fake.wrapArgsForCall = append(fake.wrapArgsForCall, struct { - innerconnection cfnetworking.Connection - }{innerconnection}) - fake.recordInvocation("Wrap", []interface{}{innerconnection}) + arg1 cfnetworking.Connection + }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns + fake.recordInvocation("Wrap", []interface{}{arg1}) fake.wrapMutex.Unlock() - if fake.WrapStub != nil { - return fake.WrapStub(innerconnection) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - return fake.wrapReturns.result1 + return fakeReturns.result1 } func (fake *FakeConnectionWrapper) WrapCallCount() int { @@ -108,13 +123,22 @@ func (fake *FakeConnectionWrapper) WrapCallCount() int { return len(fake.wrapArgsForCall) } +func (fake *FakeConnectionWrapper) WrapCalls(stub func(cfnetworking.Connection) cfnetworking.Connection) { + fake.wrapMutex.Lock() + defer fake.wrapMutex.Unlock() + fake.WrapStub = stub +} + func (fake *FakeConnectionWrapper) WrapArgsForCall(i int) cfnetworking.Connection { fake.wrapMutex.RLock() defer fake.wrapMutex.RUnlock() - return fake.wrapArgsForCall[i].innerconnection + argsForCall := fake.wrapArgsForCall[i] + return argsForCall.arg1 } func (fake *FakeConnectionWrapper) WrapReturns(result1 cfnetworking.Connection) { + fake.wrapMutex.Lock() + defer fake.wrapMutex.Unlock() fake.WrapStub = nil fake.wrapReturns = struct { result1 cfnetworking.Connection @@ -122,6 +146,8 @@ func (fake *FakeConnectionWrapper) WrapReturns(result1 cfnetworking.Connection) } func (fake *FakeConnectionWrapper) WrapReturnsOnCall(i int, result1 cfnetworking.Connection) { + fake.wrapMutex.Lock() + defer fake.wrapMutex.Unlock() fake.WrapStub = nil if fake.wrapReturnsOnCall == nil { fake.wrapReturnsOnCall = make(map[int]struct { diff --git a/api/cfnetworking/cfnetworkingfakes/fake_connection.go b/api/cfnetworking/cfnetworkingfakes/fake_connection.go index 9853dbdbe8..157903f772 100644 --- a/api/cfnetworking/cfnetworkingfakes/fake_connection.go +++ b/api/cfnetworking/cfnetworkingfakes/fake_connection.go @@ -8,11 +8,11 @@ import ( ) type FakeConnection struct { - MakeStub func(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error + MakeStub func(*cfnetworking.Request, *cfnetworking.Response) error makeMutex sync.RWMutex makeArgsForCall []struct { - request *cfnetworking.Request - passedResponse *cfnetworking.Response + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response } makeReturns struct { result1 error @@ -24,22 +24,24 @@ type FakeConnection struct { invocationsMutex sync.RWMutex } -func (fake *FakeConnection) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { +func (fake *FakeConnection) Make(arg1 *cfnetworking.Request, arg2 *cfnetworking.Response) error { fake.makeMutex.Lock() ret, specificReturn := fake.makeReturnsOnCall[len(fake.makeArgsForCall)] fake.makeArgsForCall = append(fake.makeArgsForCall, struct { - request *cfnetworking.Request - passedResponse *cfnetworking.Response - }{request, passedResponse}) - fake.recordInvocation("Make", []interface{}{request, passedResponse}) + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns + fake.recordInvocation("Make", []interface{}{arg1, arg2}) fake.makeMutex.Unlock() - if fake.MakeStub != nil { - return fake.MakeStub(request, passedResponse) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - return fake.makeReturns.result1 + return fakeReturns.result1 } func (fake *FakeConnection) MakeCallCount() int { @@ -48,13 +50,22 @@ func (fake *FakeConnection) MakeCallCount() int { return len(fake.makeArgsForCall) } +func (fake *FakeConnection) MakeCalls(stub func(*cfnetworking.Request, *cfnetworking.Response) error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() + fake.MakeStub = stub +} + func (fake *FakeConnection) MakeArgsForCall(i int) (*cfnetworking.Request, *cfnetworking.Response) { fake.makeMutex.RLock() defer fake.makeMutex.RUnlock() - return fake.makeArgsForCall[i].request, fake.makeArgsForCall[i].passedResponse + argsForCall := fake.makeArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 } func (fake *FakeConnection) MakeReturns(result1 error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() fake.MakeStub = nil fake.makeReturns = struct { result1 error @@ -62,6 +73,8 @@ func (fake *FakeConnection) MakeReturns(result1 error) { } func (fake *FakeConnection) MakeReturnsOnCall(i int, result1 error) { + fake.makeMutex.Lock() + defer fake.makeMutex.Unlock() fake.MakeStub = nil if fake.makeReturnsOnCall == nil { fake.makeReturnsOnCall = make(map[int]struct { diff --git a/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go b/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go index 6b0c6d6d90..1e759ee28c 100644 --- a/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go +++ b/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go @@ -8,10 +8,10 @@ import ( ) type FakeReadSeeker struct { - ReadStub func(p []byte) (n int, err error) + ReadStub func([]byte) (int, error) readMutex sync.RWMutex readArgsForCall []struct { - p []byte + arg1 []byte } readReturns struct { result1 int @@ -21,11 +21,11 @@ type FakeReadSeeker struct { result1 int result2 error } - SeekStub func(offset int64, whence int) (int64, error) + SeekStub func(int64, int) (int64, error) seekMutex sync.RWMutex seekArgsForCall []struct { - offset int64 - whence int + arg1 int64 + arg2 int } seekReturns struct { result1 int64 @@ -39,26 +39,28 @@ type FakeReadSeeker struct { invocationsMutex sync.RWMutex } -func (fake *FakeReadSeeker) Read(p []byte) (n int, err error) { - var pCopy []byte - if p != nil { - pCopy = make([]byte, len(p)) - copy(pCopy, p) +func (fake *FakeReadSeeker) Read(arg1 []byte) (int, error) { + var arg1Copy []byte + if arg1 != nil { + arg1Copy = make([]byte, len(arg1)) + copy(arg1Copy, arg1) } fake.readMutex.Lock() ret, specificReturn := fake.readReturnsOnCall[len(fake.readArgsForCall)] fake.readArgsForCall = append(fake.readArgsForCall, struct { - p []byte - }{pCopy}) - fake.recordInvocation("Read", []interface{}{pCopy}) + arg1 []byte + }{arg1Copy}) + stub := fake.ReadStub + fakeReturns := fake.readReturns + fake.recordInvocation("Read", []interface{}{arg1Copy}) fake.readMutex.Unlock() - if fake.ReadStub != nil { - return fake.ReadStub(p) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - return fake.readReturns.result1, fake.readReturns.result2 + return fakeReturns.result1, fakeReturns.result2 } func (fake *FakeReadSeeker) ReadCallCount() int { @@ -67,13 +69,22 @@ func (fake *FakeReadSeeker) ReadCallCount() int { return len(fake.readArgsForCall) } +func (fake *FakeReadSeeker) ReadCalls(stub func([]byte) (int, error)) { + fake.readMutex.Lock() + defer fake.readMutex.Unlock() + fake.ReadStub = stub +} + func (fake *FakeReadSeeker) ReadArgsForCall(i int) []byte { fake.readMutex.RLock() defer fake.readMutex.RUnlock() - return fake.readArgsForCall[i].p + argsForCall := fake.readArgsForCall[i] + return argsForCall.arg1 } func (fake *FakeReadSeeker) ReadReturns(result1 int, result2 error) { + fake.readMutex.Lock() + defer fake.readMutex.Unlock() fake.ReadStub = nil fake.readReturns = struct { result1 int @@ -82,6 +93,8 @@ func (fake *FakeReadSeeker) ReadReturns(result1 int, result2 error) { } func (fake *FakeReadSeeker) ReadReturnsOnCall(i int, result1 int, result2 error) { + fake.readMutex.Lock() + defer fake.readMutex.Unlock() fake.ReadStub = nil if fake.readReturnsOnCall == nil { fake.readReturnsOnCall = make(map[int]struct { @@ -95,22 +108,24 @@ func (fake *FakeReadSeeker) ReadReturnsOnCall(i int, result1 int, result2 error) }{result1, result2} } -func (fake *FakeReadSeeker) Seek(offset int64, whence int) (int64, error) { +func (fake *FakeReadSeeker) Seek(arg1 int64, arg2 int) (int64, error) { fake.seekMutex.Lock() ret, specificReturn := fake.seekReturnsOnCall[len(fake.seekArgsForCall)] fake.seekArgsForCall = append(fake.seekArgsForCall, struct { - offset int64 - whence int - }{offset, whence}) - fake.recordInvocation("Seek", []interface{}{offset, whence}) + arg1 int64 + arg2 int + }{arg1, arg2}) + stub := fake.SeekStub + fakeReturns := fake.seekReturns + fake.recordInvocation("Seek", []interface{}{arg1, arg2}) fake.seekMutex.Unlock() - if fake.SeekStub != nil { - return fake.SeekStub(offset, whence) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - return fake.seekReturns.result1, fake.seekReturns.result2 + return fakeReturns.result1, fakeReturns.result2 } func (fake *FakeReadSeeker) SeekCallCount() int { @@ -119,13 +134,22 @@ func (fake *FakeReadSeeker) SeekCallCount() int { return len(fake.seekArgsForCall) } +func (fake *FakeReadSeeker) SeekCalls(stub func(int64, int) (int64, error)) { + fake.seekMutex.Lock() + defer fake.seekMutex.Unlock() + fake.SeekStub = stub +} + func (fake *FakeReadSeeker) SeekArgsForCall(i int) (int64, int) { fake.seekMutex.RLock() defer fake.seekMutex.RUnlock() - return fake.seekArgsForCall[i].offset, fake.seekArgsForCall[i].whence + argsForCall := fake.seekArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 } func (fake *FakeReadSeeker) SeekReturns(result1 int64, result2 error) { + fake.seekMutex.Lock() + defer fake.seekMutex.Unlock() fake.SeekStub = nil fake.seekReturns = struct { result1 int64 @@ -134,6 +158,8 @@ func (fake *FakeReadSeeker) SeekReturns(result1 int64, result2 error) { } func (fake *FakeReadSeeker) SeekReturnsOnCall(i int, result1 int64, result2 error) { + fake.seekMutex.Lock() + defer fake.seekMutex.Unlock() fake.SeekStub = nil if fake.seekReturnsOnCall == nil { fake.seekReturnsOnCall = make(map[int]struct { diff --git a/api/cfnetworking/wrapper/uaa_authentication.go b/api/cfnetworking/wrapper/uaa_authentication.go index 9976cac13c..2a7f07eb77 100644 --- a/api/cfnetworking/wrapper/uaa_authentication.go +++ b/api/cfnetworking/wrapper/uaa_authentication.go @@ -1,81 +1,81 @@ package wrapper import ( - "code.cloudfoundry.org/cli/v9/api/cfnetworking" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" - "code.cloudfoundry.org/cli/v9/api/uaa" + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + "code.cloudfoundry.org/cli/v9/api/uaa" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient // UAAClient is the interface for getting a valid access token type UAAClient interface { - RefreshAccessToken(refreshToken string) (uaa.RefreshedTokens, error) + RefreshAccessToken(refreshToken string) (uaa.RefreshedTokens, error) } -//go:generate counterfeiter . TokenCache +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . TokenCache // TokenCache is where the UAA token information is stored. type TokenCache interface { - AccessToken() string - RefreshToken() string - SetAccessToken(token string) - SetRefreshToken(token string) + AccessToken() string + RefreshToken() string + SetAccessToken(token string) + SetRefreshToken(token string) } // UAAAuthentication wraps connections and adds authentication headers to all // requests type UAAAuthentication struct { - connection cfnetworking.Connection - client UAAClient - cache TokenCache + connection cfnetworking.Connection + client UAAClient + cache TokenCache } // NewUAAAuthentication returns a pointer to a UAAAuthentication wrapper with // the client and a token cache. func NewUAAAuthentication(client UAAClient, cache TokenCache) *UAAAuthentication { - return &UAAAuthentication{ - client: client, - cache: cache, - } + return &UAAAuthentication{ + client: client, + cache: cache, + } } // Wrap sets the connection on the UAAAuthentication and returns itself func (t *UAAAuthentication) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { - t.connection = innerconnection - return t + t.connection = innerconnection + return t } // SetClient sets the UAA client that the wrapper will use. func (t *UAAAuthentication) SetClient(client UAAClient) { - t.client = client + t.client = client } // Make adds authentication headers to the passed in request and then calls the // wrapped connection's Make. If the client is not set on the wrapper, it will // not add any header or handle any authentication errors. func (t *UAAAuthentication) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { - request.Header.Set("Authorization", t.cache.AccessToken()) + request.Header.Set("Authorization", t.cache.AccessToken()) - requestErr := t.connection.Make(request, passedResponse) - if _, ok := requestErr.(networkerror.InvalidAuthTokenError); ok { - tokens, err := t.client.RefreshAccessToken(t.cache.RefreshToken()) - if err != nil { - return err - } + requestErr := t.connection.Make(request, passedResponse) + if _, ok := requestErr.(networkerror.InvalidAuthTokenError); ok { + tokens, err := t.client.RefreshAccessToken(t.cache.RefreshToken()) + if err != nil { + return err + } - t.cache.SetAccessToken(tokens.AuthorizationToken()) - t.cache.SetRefreshToken(tokens.RefreshToken) + t.cache.SetAccessToken(tokens.AuthorizationToken()) + t.cache.SetRefreshToken(tokens.RefreshToken) - if request.Body != nil { - err = request.ResetBody() - if err != nil { - return err - } - } - request.Header.Set("Authorization", t.cache.AccessToken()) - requestErr = t.connection.Make(request, passedResponse) - } + if request.Body != nil { + err = request.ResetBody() + if err != nil { + return err + } + } + request.Header.Set("Authorization", t.cache.AccessToken()) + requestErr = t.connection.Make(request, passedResponse) + } - return requestErr + return requestErr } diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go b/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go index 539b0d1101..837896b75f 100644 --- a/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go @@ -9,11 +9,11 @@ import ( ) type FakeRequestLoggerOutput struct { - DisplayHeaderStub func(name string, value string) error + DisplayHeaderStub func(string, string) error displayHeaderMutex sync.RWMutex displayHeaderArgsForCall []struct { - name string - value string + arg1 string + arg2 string } displayHeaderReturns struct { result1 error @@ -21,10 +21,10 @@ type FakeRequestLoggerOutput struct { displayHeaderReturnsOnCall map[int]struct { result1 error } - DisplayHostStub func(name string) error + DisplayHostStub func(string) error displayHostMutex sync.RWMutex displayHostArgsForCall []struct { - name string + arg1 string } displayHostReturns struct { result1 error @@ -32,10 +32,10 @@ type FakeRequestLoggerOutput struct { displayHostReturnsOnCall map[int]struct { result1 error } - DisplayJSONBodyStub func(body []byte) error + DisplayJSONBodyStub func([]byte) error displayJSONBodyMutex sync.RWMutex displayJSONBodyArgsForCall []struct { - body []byte + arg1 []byte } displayJSONBodyReturns struct { result1 error @@ -43,10 +43,10 @@ type FakeRequestLoggerOutput struct { displayJSONBodyReturnsOnCall map[int]struct { result1 error } - DisplayMessageStub func(msg string) error + DisplayMessageStub func(string) error displayMessageMutex sync.RWMutex displayMessageArgsForCall []struct { - msg string + arg1 string } displayMessageReturns struct { result1 error @@ -54,12 +54,12 @@ type FakeRequestLoggerOutput struct { displayMessageReturnsOnCall map[int]struct { result1 error } - DisplayRequestHeaderStub func(method string, uri string, httpProtocol string) error + DisplayRequestHeaderStub func(string, string, string) error displayRequestHeaderMutex sync.RWMutex displayRequestHeaderArgsForCall []struct { - method string - uri string - httpProtocol string + arg1 string + arg2 string + arg3 string } displayRequestHeaderReturns struct { result1 error @@ -67,11 +67,11 @@ type FakeRequestLoggerOutput struct { displayRequestHeaderReturnsOnCall map[int]struct { result1 error } - DisplayResponseHeaderStub func(httpProtocol string, status string) error + DisplayResponseHeaderStub func(string, string) error displayResponseHeaderMutex sync.RWMutex displayResponseHeaderArgsForCall []struct { - httpProtocol string - status string + arg1 string + arg2 string } displayResponseHeaderReturns struct { result1 error @@ -79,11 +79,11 @@ type FakeRequestLoggerOutput struct { displayResponseHeaderReturnsOnCall map[int]struct { result1 error } - DisplayTypeStub func(name string, requestDate time.Time) error + DisplayTypeStub func(string, time.Time) error displayTypeMutex sync.RWMutex displayTypeArgsForCall []struct { - name string - requestDate time.Time + arg1 string + arg2 time.Time } displayTypeReturns struct { result1 error @@ -91,15 +91,16 @@ type FakeRequestLoggerOutput struct { displayTypeReturnsOnCall map[int]struct { result1 error } - HandleInternalErrorStub func(err error) + HandleInternalErrorStub func(error) handleInternalErrorMutex sync.RWMutex handleInternalErrorArgsForCall []struct { - err error + arg1 error } StartStub func() error startMutex sync.RWMutex - startArgsForCall []struct{} - startReturns struct { + startArgsForCall []struct { + } + startReturns struct { result1 error } startReturnsOnCall map[int]struct { @@ -107,8 +108,9 @@ type FakeRequestLoggerOutput struct { } StopStub func() error stopMutex sync.RWMutex - stopArgsForCall []struct{} - stopReturns struct { + stopArgsForCall []struct { + } + stopReturns struct { result1 error } stopReturnsOnCall map[int]struct { @@ -118,22 +120,24 @@ type FakeRequestLoggerOutput struct { invocationsMutex sync.RWMutex } -func (fake *FakeRequestLoggerOutput) DisplayHeader(name string, value string) error { +func (fake *FakeRequestLoggerOutput) DisplayHeader(arg1 string, arg2 string) error { fake.displayHeaderMutex.Lock() ret, specificReturn := fake.displayHeaderReturnsOnCall[len(fake.displayHeaderArgsForCall)] fake.displayHeaderArgsForCall = append(fake.displayHeaderArgsForCall, struct { - name string - value string - }{name, value}) - fake.recordInvocation("DisplayHeader", []interface{}{name, value}) + arg1 string + arg2 string + }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns + fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { - return fake.DisplayHeaderStub(name, value) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - return fake.displayHeaderReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) DisplayHeaderCallCount() int { @@ -142,13 +146,22 @@ func (fake *FakeRequestLoggerOutput) DisplayHeaderCallCount() int { return len(fake.displayHeaderArgsForCall) } +func (fake *FakeRequestLoggerOutput) DisplayHeaderCalls(stub func(string, string) error) { + fake.displayHeaderMutex.Lock() + defer fake.displayHeaderMutex.Unlock() + fake.DisplayHeaderStub = stub +} + func (fake *FakeRequestLoggerOutput) DisplayHeaderArgsForCall(i int) (string, string) { fake.displayHeaderMutex.RLock() defer fake.displayHeaderMutex.RUnlock() - return fake.displayHeaderArgsForCall[i].name, fake.displayHeaderArgsForCall[i].value + argsForCall := fake.displayHeaderArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 } func (fake *FakeRequestLoggerOutput) DisplayHeaderReturns(result1 error) { + fake.displayHeaderMutex.Lock() + defer fake.displayHeaderMutex.Unlock() fake.DisplayHeaderStub = nil fake.displayHeaderReturns = struct { result1 error @@ -156,6 +169,8 @@ func (fake *FakeRequestLoggerOutput) DisplayHeaderReturns(result1 error) { } func (fake *FakeRequestLoggerOutput) DisplayHeaderReturnsOnCall(i int, result1 error) { + fake.displayHeaderMutex.Lock() + defer fake.displayHeaderMutex.Unlock() fake.DisplayHeaderStub = nil if fake.displayHeaderReturnsOnCall == nil { fake.displayHeaderReturnsOnCall = make(map[int]struct { @@ -167,21 +182,23 @@ func (fake *FakeRequestLoggerOutput) DisplayHeaderReturnsOnCall(i int, result1 e }{result1} } -func (fake *FakeRequestLoggerOutput) DisplayHost(name string) error { +func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { fake.displayHostMutex.Lock() ret, specificReturn := fake.displayHostReturnsOnCall[len(fake.displayHostArgsForCall)] fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { - name string - }{name}) - fake.recordInvocation("DisplayHost", []interface{}{name}) + arg1 string + }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns + fake.recordInvocation("DisplayHost", []interface{}{arg1}) fake.displayHostMutex.Unlock() - if fake.DisplayHostStub != nil { - return fake.DisplayHostStub(name) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - return fake.displayHostReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) DisplayHostCallCount() int { @@ -190,13 +207,22 @@ func (fake *FakeRequestLoggerOutput) DisplayHostCallCount() int { return len(fake.displayHostArgsForCall) } +func (fake *FakeRequestLoggerOutput) DisplayHostCalls(stub func(string) error) { + fake.displayHostMutex.Lock() + defer fake.displayHostMutex.Unlock() + fake.DisplayHostStub = stub +} + func (fake *FakeRequestLoggerOutput) DisplayHostArgsForCall(i int) string { fake.displayHostMutex.RLock() defer fake.displayHostMutex.RUnlock() - return fake.displayHostArgsForCall[i].name + argsForCall := fake.displayHostArgsForCall[i] + return argsForCall.arg1 } func (fake *FakeRequestLoggerOutput) DisplayHostReturns(result1 error) { + fake.displayHostMutex.Lock() + defer fake.displayHostMutex.Unlock() fake.DisplayHostStub = nil fake.displayHostReturns = struct { result1 error @@ -204,6 +230,8 @@ func (fake *FakeRequestLoggerOutput) DisplayHostReturns(result1 error) { } func (fake *FakeRequestLoggerOutput) DisplayHostReturnsOnCall(i int, result1 error) { + fake.displayHostMutex.Lock() + defer fake.displayHostMutex.Unlock() fake.DisplayHostStub = nil if fake.displayHostReturnsOnCall == nil { fake.displayHostReturnsOnCall = make(map[int]struct { @@ -215,26 +243,28 @@ func (fake *FakeRequestLoggerOutput) DisplayHostReturnsOnCall(i int, result1 err }{result1} } -func (fake *FakeRequestLoggerOutput) DisplayJSONBody(body []byte) error { - var bodyCopy []byte - if body != nil { - bodyCopy = make([]byte, len(body)) - copy(bodyCopy, body) +func (fake *FakeRequestLoggerOutput) DisplayJSONBody(arg1 []byte) error { + var arg1Copy []byte + if arg1 != nil { + arg1Copy = make([]byte, len(arg1)) + copy(arg1Copy, arg1) } fake.displayJSONBodyMutex.Lock() ret, specificReturn := fake.displayJSONBodyReturnsOnCall[len(fake.displayJSONBodyArgsForCall)] fake.displayJSONBodyArgsForCall = append(fake.displayJSONBodyArgsForCall, struct { - body []byte - }{bodyCopy}) - fake.recordInvocation("DisplayJSONBody", []interface{}{bodyCopy}) + arg1 []byte + }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns + fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) fake.displayJSONBodyMutex.Unlock() - if fake.DisplayJSONBodyStub != nil { - return fake.DisplayJSONBodyStub(body) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - return fake.displayJSONBodyReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) DisplayJSONBodyCallCount() int { @@ -243,13 +273,22 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBodyCallCount() int { return len(fake.displayJSONBodyArgsForCall) } +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyCalls(stub func([]byte) error) { + fake.displayJSONBodyMutex.Lock() + defer fake.displayJSONBodyMutex.Unlock() + fake.DisplayJSONBodyStub = stub +} + func (fake *FakeRequestLoggerOutput) DisplayJSONBodyArgsForCall(i int) []byte { fake.displayJSONBodyMutex.RLock() defer fake.displayJSONBodyMutex.RUnlock() - return fake.displayJSONBodyArgsForCall[i].body + argsForCall := fake.displayJSONBodyArgsForCall[i] + return argsForCall.arg1 } func (fake *FakeRequestLoggerOutput) DisplayJSONBodyReturns(result1 error) { + fake.displayJSONBodyMutex.Lock() + defer fake.displayJSONBodyMutex.Unlock() fake.DisplayJSONBodyStub = nil fake.displayJSONBodyReturns = struct { result1 error @@ -257,6 +296,8 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBodyReturns(result1 error) { } func (fake *FakeRequestLoggerOutput) DisplayJSONBodyReturnsOnCall(i int, result1 error) { + fake.displayJSONBodyMutex.Lock() + defer fake.displayJSONBodyMutex.Unlock() fake.DisplayJSONBodyStub = nil if fake.displayJSONBodyReturnsOnCall == nil { fake.displayJSONBodyReturnsOnCall = make(map[int]struct { @@ -268,21 +309,23 @@ func (fake *FakeRequestLoggerOutput) DisplayJSONBodyReturnsOnCall(i int, result1 }{result1} } -func (fake *FakeRequestLoggerOutput) DisplayMessage(msg string) error { +func (fake *FakeRequestLoggerOutput) DisplayMessage(arg1 string) error { fake.displayMessageMutex.Lock() ret, specificReturn := fake.displayMessageReturnsOnCall[len(fake.displayMessageArgsForCall)] fake.displayMessageArgsForCall = append(fake.displayMessageArgsForCall, struct { - msg string - }{msg}) - fake.recordInvocation("DisplayMessage", []interface{}{msg}) + arg1 string + }{arg1}) + stub := fake.DisplayMessageStub + fakeReturns := fake.displayMessageReturns + fake.recordInvocation("DisplayMessage", []interface{}{arg1}) fake.displayMessageMutex.Unlock() - if fake.DisplayMessageStub != nil { - return fake.DisplayMessageStub(msg) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - return fake.displayMessageReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) DisplayMessageCallCount() int { @@ -291,13 +334,22 @@ func (fake *FakeRequestLoggerOutput) DisplayMessageCallCount() int { return len(fake.displayMessageArgsForCall) } +func (fake *FakeRequestLoggerOutput) DisplayMessageCalls(stub func(string) error) { + fake.displayMessageMutex.Lock() + defer fake.displayMessageMutex.Unlock() + fake.DisplayMessageStub = stub +} + func (fake *FakeRequestLoggerOutput) DisplayMessageArgsForCall(i int) string { fake.displayMessageMutex.RLock() defer fake.displayMessageMutex.RUnlock() - return fake.displayMessageArgsForCall[i].msg + argsForCall := fake.displayMessageArgsForCall[i] + return argsForCall.arg1 } func (fake *FakeRequestLoggerOutput) DisplayMessageReturns(result1 error) { + fake.displayMessageMutex.Lock() + defer fake.displayMessageMutex.Unlock() fake.DisplayMessageStub = nil fake.displayMessageReturns = struct { result1 error @@ -305,6 +357,8 @@ func (fake *FakeRequestLoggerOutput) DisplayMessageReturns(result1 error) { } func (fake *FakeRequestLoggerOutput) DisplayMessageReturnsOnCall(i int, result1 error) { + fake.displayMessageMutex.Lock() + defer fake.displayMessageMutex.Unlock() fake.DisplayMessageStub = nil if fake.displayMessageReturnsOnCall == nil { fake.displayMessageReturnsOnCall = make(map[int]struct { @@ -316,23 +370,25 @@ func (fake *FakeRequestLoggerOutput) DisplayMessageReturnsOnCall(i int, result1 }{result1} } -func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(method string, uri string, httpProtocol string) error { +func (fake *FakeRequestLoggerOutput) DisplayRequestHeader(arg1 string, arg2 string, arg3 string) error { fake.displayRequestHeaderMutex.Lock() ret, specificReturn := fake.displayRequestHeaderReturnsOnCall[len(fake.displayRequestHeaderArgsForCall)] fake.displayRequestHeaderArgsForCall = append(fake.displayRequestHeaderArgsForCall, struct { - method string - uri string - httpProtocol string - }{method, uri, httpProtocol}) - fake.recordInvocation("DisplayRequestHeader", []interface{}{method, uri, httpProtocol}) + arg1 string + arg2 string + arg3 string + }{arg1, arg2, arg3}) + stub := fake.DisplayRequestHeaderStub + fakeReturns := fake.displayRequestHeaderReturns + fake.recordInvocation("DisplayRequestHeader", []interface{}{arg1, arg2, arg3}) fake.displayRequestHeaderMutex.Unlock() - if fake.DisplayRequestHeaderStub != nil { - return fake.DisplayRequestHeaderStub(method, uri, httpProtocol) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - return fake.displayRequestHeaderReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderCallCount() int { @@ -341,13 +397,22 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderCallCount() int { return len(fake.displayRequestHeaderArgsForCall) } +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderCalls(stub func(string, string, string) error) { + fake.displayRequestHeaderMutex.Lock() + defer fake.displayRequestHeaderMutex.Unlock() + fake.DisplayRequestHeaderStub = stub +} + func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderArgsForCall(i int) (string, string, string) { fake.displayRequestHeaderMutex.RLock() defer fake.displayRequestHeaderMutex.RUnlock() - return fake.displayRequestHeaderArgsForCall[i].method, fake.displayRequestHeaderArgsForCall[i].uri, fake.displayRequestHeaderArgsForCall[i].httpProtocol + argsForCall := fake.displayRequestHeaderArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3 } func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderReturns(result1 error) { + fake.displayRequestHeaderMutex.Lock() + defer fake.displayRequestHeaderMutex.Unlock() fake.DisplayRequestHeaderStub = nil fake.displayRequestHeaderReturns = struct { result1 error @@ -355,6 +420,8 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderReturns(result1 error) } func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderReturnsOnCall(i int, result1 error) { + fake.displayRequestHeaderMutex.Lock() + defer fake.displayRequestHeaderMutex.Unlock() fake.DisplayRequestHeaderStub = nil if fake.displayRequestHeaderReturnsOnCall == nil { fake.displayRequestHeaderReturnsOnCall = make(map[int]struct { @@ -366,22 +433,24 @@ func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderReturnsOnCall(i int, re }{result1} } -func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(httpProtocol string, status string) error { +func (fake *FakeRequestLoggerOutput) DisplayResponseHeader(arg1 string, arg2 string) error { fake.displayResponseHeaderMutex.Lock() ret, specificReturn := fake.displayResponseHeaderReturnsOnCall[len(fake.displayResponseHeaderArgsForCall)] fake.displayResponseHeaderArgsForCall = append(fake.displayResponseHeaderArgsForCall, struct { - httpProtocol string - status string - }{httpProtocol, status}) - fake.recordInvocation("DisplayResponseHeader", []interface{}{httpProtocol, status}) + arg1 string + arg2 string + }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns + fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) fake.displayResponseHeaderMutex.Unlock() - if fake.DisplayResponseHeaderStub != nil { - return fake.DisplayResponseHeaderStub(httpProtocol, status) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - return fake.displayResponseHeaderReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderCallCount() int { @@ -390,13 +459,22 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderCallCount() int { return len(fake.displayResponseHeaderArgsForCall) } +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderCalls(stub func(string, string) error) { + fake.displayResponseHeaderMutex.Lock() + defer fake.displayResponseHeaderMutex.Unlock() + fake.DisplayResponseHeaderStub = stub +} + func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderArgsForCall(i int) (string, string) { fake.displayResponseHeaderMutex.RLock() defer fake.displayResponseHeaderMutex.RUnlock() - return fake.displayResponseHeaderArgsForCall[i].httpProtocol, fake.displayResponseHeaderArgsForCall[i].status + argsForCall := fake.displayResponseHeaderArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 } func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderReturns(result1 error) { + fake.displayResponseHeaderMutex.Lock() + defer fake.displayResponseHeaderMutex.Unlock() fake.DisplayResponseHeaderStub = nil fake.displayResponseHeaderReturns = struct { result1 error @@ -404,6 +482,8 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderReturns(result1 error) } func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderReturnsOnCall(i int, result1 error) { + fake.displayResponseHeaderMutex.Lock() + defer fake.displayResponseHeaderMutex.Unlock() fake.DisplayResponseHeaderStub = nil if fake.displayResponseHeaderReturnsOnCall == nil { fake.displayResponseHeaderReturnsOnCall = make(map[int]struct { @@ -415,22 +495,24 @@ func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderReturnsOnCall(i int, r }{result1} } -func (fake *FakeRequestLoggerOutput) DisplayType(name string, requestDate time.Time) error { +func (fake *FakeRequestLoggerOutput) DisplayType(arg1 string, arg2 time.Time) error { fake.displayTypeMutex.Lock() ret, specificReturn := fake.displayTypeReturnsOnCall[len(fake.displayTypeArgsForCall)] fake.displayTypeArgsForCall = append(fake.displayTypeArgsForCall, struct { - name string - requestDate time.Time - }{name, requestDate}) - fake.recordInvocation("DisplayType", []interface{}{name, requestDate}) + arg1 string + arg2 time.Time + }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns + fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) fake.displayTypeMutex.Unlock() - if fake.DisplayTypeStub != nil { - return fake.DisplayTypeStub(name, requestDate) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - return fake.displayTypeReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) DisplayTypeCallCount() int { @@ -439,13 +521,22 @@ func (fake *FakeRequestLoggerOutput) DisplayTypeCallCount() int { return len(fake.displayTypeArgsForCall) } +func (fake *FakeRequestLoggerOutput) DisplayTypeCalls(stub func(string, time.Time) error) { + fake.displayTypeMutex.Lock() + defer fake.displayTypeMutex.Unlock() + fake.DisplayTypeStub = stub +} + func (fake *FakeRequestLoggerOutput) DisplayTypeArgsForCall(i int) (string, time.Time) { fake.displayTypeMutex.RLock() defer fake.displayTypeMutex.RUnlock() - return fake.displayTypeArgsForCall[i].name, fake.displayTypeArgsForCall[i].requestDate + argsForCall := fake.displayTypeArgsForCall[i] + return argsForCall.arg1, argsForCall.arg2 } func (fake *FakeRequestLoggerOutput) DisplayTypeReturns(result1 error) { + fake.displayTypeMutex.Lock() + defer fake.displayTypeMutex.Unlock() fake.DisplayTypeStub = nil fake.displayTypeReturns = struct { result1 error @@ -453,6 +544,8 @@ func (fake *FakeRequestLoggerOutput) DisplayTypeReturns(result1 error) { } func (fake *FakeRequestLoggerOutput) DisplayTypeReturnsOnCall(i int, result1 error) { + fake.displayTypeMutex.Lock() + defer fake.displayTypeMutex.Unlock() fake.DisplayTypeStub = nil if fake.displayTypeReturnsOnCall == nil { fake.displayTypeReturnsOnCall = make(map[int]struct { @@ -464,15 +557,16 @@ func (fake *FakeRequestLoggerOutput) DisplayTypeReturnsOnCall(i int, result1 err }{result1} } -func (fake *FakeRequestLoggerOutput) HandleInternalError(err error) { +func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { fake.handleInternalErrorMutex.Lock() fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { - err error - }{err}) - fake.recordInvocation("HandleInternalError", []interface{}{err}) + arg1 error + }{arg1}) + stub := fake.HandleInternalErrorStub + fake.recordInvocation("HandleInternalError", []interface{}{arg1}) fake.handleInternalErrorMutex.Unlock() - if fake.HandleInternalErrorStub != nil { - fake.HandleInternalErrorStub(err) + if stub != nil { + fake.HandleInternalErrorStub(arg1) } } @@ -482,25 +576,35 @@ func (fake *FakeRequestLoggerOutput) HandleInternalErrorCallCount() int { return len(fake.handleInternalErrorArgsForCall) } +func (fake *FakeRequestLoggerOutput) HandleInternalErrorCalls(stub func(error)) { + fake.handleInternalErrorMutex.Lock() + defer fake.handleInternalErrorMutex.Unlock() + fake.HandleInternalErrorStub = stub +} + func (fake *FakeRequestLoggerOutput) HandleInternalErrorArgsForCall(i int) error { fake.handleInternalErrorMutex.RLock() defer fake.handleInternalErrorMutex.RUnlock() - return fake.handleInternalErrorArgsForCall[i].err + argsForCall := fake.handleInternalErrorArgsForCall[i] + return argsForCall.arg1 } func (fake *FakeRequestLoggerOutput) Start() error { fake.startMutex.Lock() ret, specificReturn := fake.startReturnsOnCall[len(fake.startArgsForCall)] - fake.startArgsForCall = append(fake.startArgsForCall, struct{}{}) + fake.startArgsForCall = append(fake.startArgsForCall, struct { + }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns fake.recordInvocation("Start", []interface{}{}) fake.startMutex.Unlock() - if fake.StartStub != nil { - return fake.StartStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - return fake.startReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) StartCallCount() int { @@ -509,7 +613,15 @@ func (fake *FakeRequestLoggerOutput) StartCallCount() int { return len(fake.startArgsForCall) } +func (fake *FakeRequestLoggerOutput) StartCalls(stub func() error) { + fake.startMutex.Lock() + defer fake.startMutex.Unlock() + fake.StartStub = stub +} + func (fake *FakeRequestLoggerOutput) StartReturns(result1 error) { + fake.startMutex.Lock() + defer fake.startMutex.Unlock() fake.StartStub = nil fake.startReturns = struct { result1 error @@ -517,6 +629,8 @@ func (fake *FakeRequestLoggerOutput) StartReturns(result1 error) { } func (fake *FakeRequestLoggerOutput) StartReturnsOnCall(i int, result1 error) { + fake.startMutex.Lock() + defer fake.startMutex.Unlock() fake.StartStub = nil if fake.startReturnsOnCall == nil { fake.startReturnsOnCall = make(map[int]struct { @@ -531,16 +645,19 @@ func (fake *FakeRequestLoggerOutput) StartReturnsOnCall(i int, result1 error) { func (fake *FakeRequestLoggerOutput) Stop() error { fake.stopMutex.Lock() ret, specificReturn := fake.stopReturnsOnCall[len(fake.stopArgsForCall)] - fake.stopArgsForCall = append(fake.stopArgsForCall, struct{}{}) + fake.stopArgsForCall = append(fake.stopArgsForCall, struct { + }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns fake.recordInvocation("Stop", []interface{}{}) fake.stopMutex.Unlock() - if fake.StopStub != nil { - return fake.StopStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - return fake.stopReturns.result1 + return fakeReturns.result1 } func (fake *FakeRequestLoggerOutput) StopCallCount() int { @@ -549,7 +666,15 @@ func (fake *FakeRequestLoggerOutput) StopCallCount() int { return len(fake.stopArgsForCall) } +func (fake *FakeRequestLoggerOutput) StopCalls(stub func() error) { + fake.stopMutex.Lock() + defer fake.stopMutex.Unlock() + fake.StopStub = stub +} + func (fake *FakeRequestLoggerOutput) StopReturns(result1 error) { + fake.stopMutex.Lock() + defer fake.stopMutex.Unlock() fake.StopStub = nil fake.stopReturns = struct { result1 error @@ -557,6 +682,8 @@ func (fake *FakeRequestLoggerOutput) StopReturns(result1 error) { } func (fake *FakeRequestLoggerOutput) StopReturnsOnCall(i int, result1 error) { + fake.stopMutex.Lock() + defer fake.stopMutex.Unlock() fake.StopStub = nil if fake.stopReturnsOnCall == nil { fake.stopReturnsOnCall = make(map[int]struct { diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go b/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go index 3df574837c..8742715ee4 100644 --- a/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go @@ -10,8 +10,9 @@ import ( type FakeTokenCache struct { AccessTokenStub func() string accessTokenMutex sync.RWMutex - accessTokenArgsForCall []struct{} - accessTokenReturns struct { + accessTokenArgsForCall []struct { + } + accessTokenReturns struct { result1 string } accessTokenReturnsOnCall map[int]struct { @@ -19,22 +20,23 @@ type FakeTokenCache struct { } RefreshTokenStub func() string refreshTokenMutex sync.RWMutex - refreshTokenArgsForCall []struct{} - refreshTokenReturns struct { + refreshTokenArgsForCall []struct { + } + refreshTokenReturns struct { result1 string } refreshTokenReturnsOnCall map[int]struct { result1 string } - SetAccessTokenStub func(token string) + SetAccessTokenStub func(string) setAccessTokenMutex sync.RWMutex setAccessTokenArgsForCall []struct { - token string + arg1 string } - SetRefreshTokenStub func(token string) + SetRefreshTokenStub func(string) setRefreshTokenMutex sync.RWMutex setRefreshTokenArgsForCall []struct { - token string + arg1 string } invocations map[string][][]interface{} invocationsMutex sync.RWMutex @@ -43,16 +45,19 @@ type FakeTokenCache struct { func (fake *FakeTokenCache) AccessToken() string { fake.accessTokenMutex.Lock() ret, specificReturn := fake.accessTokenReturnsOnCall[len(fake.accessTokenArgsForCall)] - fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct{}{}) + fake.accessTokenArgsForCall = append(fake.accessTokenArgsForCall, struct { + }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns fake.recordInvocation("AccessToken", []interface{}{}) fake.accessTokenMutex.Unlock() - if fake.AccessTokenStub != nil { - return fake.AccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - return fake.accessTokenReturns.result1 + return fakeReturns.result1 } func (fake *FakeTokenCache) AccessTokenCallCount() int { @@ -61,7 +66,15 @@ func (fake *FakeTokenCache) AccessTokenCallCount() int { return len(fake.accessTokenArgsForCall) } +func (fake *FakeTokenCache) AccessTokenCalls(stub func() string) { + fake.accessTokenMutex.Lock() + defer fake.accessTokenMutex.Unlock() + fake.AccessTokenStub = stub +} + func (fake *FakeTokenCache) AccessTokenReturns(result1 string) { + fake.accessTokenMutex.Lock() + defer fake.accessTokenMutex.Unlock() fake.AccessTokenStub = nil fake.accessTokenReturns = struct { result1 string @@ -69,6 +82,8 @@ func (fake *FakeTokenCache) AccessTokenReturns(result1 string) { } func (fake *FakeTokenCache) AccessTokenReturnsOnCall(i int, result1 string) { + fake.accessTokenMutex.Lock() + defer fake.accessTokenMutex.Unlock() fake.AccessTokenStub = nil if fake.accessTokenReturnsOnCall == nil { fake.accessTokenReturnsOnCall = make(map[int]struct { @@ -83,16 +98,19 @@ func (fake *FakeTokenCache) AccessTokenReturnsOnCall(i int, result1 string) { func (fake *FakeTokenCache) RefreshToken() string { fake.refreshTokenMutex.Lock() ret, specificReturn := fake.refreshTokenReturnsOnCall[len(fake.refreshTokenArgsForCall)] - fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct{}{}) + fake.refreshTokenArgsForCall = append(fake.refreshTokenArgsForCall, struct { + }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns fake.recordInvocation("RefreshToken", []interface{}{}) fake.refreshTokenMutex.Unlock() - if fake.RefreshTokenStub != nil { - return fake.RefreshTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - return fake.refreshTokenReturns.result1 + return fakeReturns.result1 } func (fake *FakeTokenCache) RefreshTokenCallCount() int { @@ -101,7 +119,15 @@ func (fake *FakeTokenCache) RefreshTokenCallCount() int { return len(fake.refreshTokenArgsForCall) } +func (fake *FakeTokenCache) RefreshTokenCalls(stub func() string) { + fake.refreshTokenMutex.Lock() + defer fake.refreshTokenMutex.Unlock() + fake.RefreshTokenStub = stub +} + func (fake *FakeTokenCache) RefreshTokenReturns(result1 string) { + fake.refreshTokenMutex.Lock() + defer fake.refreshTokenMutex.Unlock() fake.RefreshTokenStub = nil fake.refreshTokenReturns = struct { result1 string @@ -109,6 +135,8 @@ func (fake *FakeTokenCache) RefreshTokenReturns(result1 string) { } func (fake *FakeTokenCache) RefreshTokenReturnsOnCall(i int, result1 string) { + fake.refreshTokenMutex.Lock() + defer fake.refreshTokenMutex.Unlock() fake.RefreshTokenStub = nil if fake.refreshTokenReturnsOnCall == nil { fake.refreshTokenReturnsOnCall = make(map[int]struct { @@ -120,15 +148,16 @@ func (fake *FakeTokenCache) RefreshTokenReturnsOnCall(i int, result1 string) { }{result1} } -func (fake *FakeTokenCache) SetAccessToken(token string) { +func (fake *FakeTokenCache) SetAccessToken(arg1 string) { fake.setAccessTokenMutex.Lock() fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { - token string - }{token}) - fake.recordInvocation("SetAccessToken", []interface{}{token}) + arg1 string + }{arg1}) + stub := fake.SetAccessTokenStub + fake.recordInvocation("SetAccessToken", []interface{}{arg1}) fake.setAccessTokenMutex.Unlock() - if fake.SetAccessTokenStub != nil { - fake.SetAccessTokenStub(token) + if stub != nil { + fake.SetAccessTokenStub(arg1) } } @@ -138,21 +167,29 @@ func (fake *FakeTokenCache) SetAccessTokenCallCount() int { return len(fake.setAccessTokenArgsForCall) } +func (fake *FakeTokenCache) SetAccessTokenCalls(stub func(string)) { + fake.setAccessTokenMutex.Lock() + defer fake.setAccessTokenMutex.Unlock() + fake.SetAccessTokenStub = stub +} + func (fake *FakeTokenCache) SetAccessTokenArgsForCall(i int) string { fake.setAccessTokenMutex.RLock() defer fake.setAccessTokenMutex.RUnlock() - return fake.setAccessTokenArgsForCall[i].token + argsForCall := fake.setAccessTokenArgsForCall[i] + return argsForCall.arg1 } -func (fake *FakeTokenCache) SetRefreshToken(token string) { +func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { fake.setRefreshTokenMutex.Lock() fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { - token string - }{token}) - fake.recordInvocation("SetRefreshToken", []interface{}{token}) + arg1 string + }{arg1}) + stub := fake.SetRefreshTokenStub + fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) fake.setRefreshTokenMutex.Unlock() - if fake.SetRefreshTokenStub != nil { - fake.SetRefreshTokenStub(token) + if stub != nil { + fake.SetRefreshTokenStub(arg1) } } @@ -162,10 +199,17 @@ func (fake *FakeTokenCache) SetRefreshTokenCallCount() int { return len(fake.setRefreshTokenArgsForCall) } +func (fake *FakeTokenCache) SetRefreshTokenCalls(stub func(string)) { + fake.setRefreshTokenMutex.Lock() + defer fake.setRefreshTokenMutex.Unlock() + fake.SetRefreshTokenStub = stub +} + func (fake *FakeTokenCache) SetRefreshTokenArgsForCall(i int) string { fake.setRefreshTokenMutex.RLock() defer fake.setRefreshTokenMutex.RUnlock() - return fake.setRefreshTokenArgsForCall[i].token + argsForCall := fake.setRefreshTokenArgsForCall[i] + return argsForCall.arg1 } func (fake *FakeTokenCache) Invocations() map[string][][]interface{} { diff --git a/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go b/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go index 2c0897d0db..92d8ad1621 100644 --- a/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go @@ -9,10 +9,10 @@ import ( ) type FakeUAAClient struct { - RefreshAccessTokenStub func(refreshToken string) (uaa.RefreshedTokens, error) + RefreshAccessTokenStub func(string) (uaa.RefreshedTokens, error) refreshAccessTokenMutex sync.RWMutex refreshAccessTokenArgsForCall []struct { - refreshToken string + arg1 string } refreshAccessTokenReturns struct { result1 uaa.RefreshedTokens @@ -26,21 +26,23 @@ type FakeUAAClient struct { invocationsMutex sync.RWMutex } -func (fake *FakeUAAClient) RefreshAccessToken(refreshToken string) (uaa.RefreshedTokens, error) { +func (fake *FakeUAAClient) RefreshAccessToken(arg1 string) (uaa.RefreshedTokens, error) { fake.refreshAccessTokenMutex.Lock() ret, specificReturn := fake.refreshAccessTokenReturnsOnCall[len(fake.refreshAccessTokenArgsForCall)] fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { - refreshToken string - }{refreshToken}) - fake.recordInvocation("RefreshAccessToken", []interface{}{refreshToken}) + arg1 string + }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns + fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub(refreshToken) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - return fake.refreshAccessTokenReturns.result1, fake.refreshAccessTokenReturns.result2 + return fakeReturns.result1, fakeReturns.result2 } func (fake *FakeUAAClient) RefreshAccessTokenCallCount() int { @@ -49,13 +51,22 @@ func (fake *FakeUAAClient) RefreshAccessTokenCallCount() int { return len(fake.refreshAccessTokenArgsForCall) } +func (fake *FakeUAAClient) RefreshAccessTokenCalls(stub func(string) (uaa.RefreshedTokens, error)) { + fake.refreshAccessTokenMutex.Lock() + defer fake.refreshAccessTokenMutex.Unlock() + fake.RefreshAccessTokenStub = stub +} + func (fake *FakeUAAClient) RefreshAccessTokenArgsForCall(i int) string { fake.refreshAccessTokenMutex.RLock() defer fake.refreshAccessTokenMutex.RUnlock() - return fake.refreshAccessTokenArgsForCall[i].refreshToken + argsForCall := fake.refreshAccessTokenArgsForCall[i] + return argsForCall.arg1 } func (fake *FakeUAAClient) RefreshAccessTokenReturns(result1 uaa.RefreshedTokens, result2 error) { + fake.refreshAccessTokenMutex.Lock() + defer fake.refreshAccessTokenMutex.Unlock() fake.RefreshAccessTokenStub = nil fake.refreshAccessTokenReturns = struct { result1 uaa.RefreshedTokens @@ -64,6 +75,8 @@ func (fake *FakeUAAClient) RefreshAccessTokenReturns(result1 uaa.RefreshedTokens } func (fake *FakeUAAClient) RefreshAccessTokenReturnsOnCall(i int, result1 uaa.RefreshedTokens, result2 error) { + fake.refreshAccessTokenMutex.Lock() + defer fake.refreshAccessTokenMutex.Unlock() fake.RefreshAccessTokenStub = nil if fake.refreshAccessTokenReturnsOnCall == nil { fake.refreshAccessTokenReturnsOnCall = make(map[int]struct { diff --git a/go.mod b/go.mod index 765bce45ee..4c0f4b2585 100644 --- a/go.mod +++ b/go.mod @@ -30,6 +30,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0 github.com/moby/term v0.5.0 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d + github.com/onsi/ginkgo v1.16.4 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.1 github.com/pkg/errors v0.9.1 @@ -72,6 +73,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/nxadm/tail v1.4.8 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/rivo/uniseg v0.2.0 // indirect @@ -89,6 +91,7 @@ require ( google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.35.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect diff --git a/go.sum b/go.sum index 5fd45b49ec..c66f3afe9c 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,5 @@ code.cloudfoundry.org/bytefmt v0.21.0 h1:6a4eAhlnMCSXuPP8TMFtqVY4y93EL1FAqmGG5ePBAew= code.cloudfoundry.org/bytefmt v0.21.0/go.mod h1:/OAOT/x29iXD/O+HuUR2cioFu7+3PSLchUWLQMrAmP8= -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 v7.1.0+incompatible h1:1Zn3I+epQBaBvnZAaTudCQQ0WdqcWtjtjEV9MBZP08Y= -code.cloudfoundry.org/cli v7.1.0+incompatible/go.mod h1:e4d+EpbwevNhyTZKybrLlyTvpH+W22vMsmdmcTxs/Fo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85 h1:jaHWw9opYjKPrDT19uydBBWSxl+g5F4Hv030fqMsalo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85/go.mod h1:R1EiyOAr7lW0l/YkZNqItUNZ01Q/dYUfbTn4X4Z+82M= code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 h1:O+j8afQWaDuxzKGcculsjgHGK+biBTn6iMjgFpBf54c= diff --git a/integration/v7/isolated/task_command_test.go b/integration/v7/isolated/task_command_test.go index 079e1acda4..8ee9ab97e0 100644 --- a/integration/v7/isolated/task_command_test.go +++ b/integration/v7/isolated/task_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" From b0a06dfc88cb0c69b3447313da53c3d7ba776100 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 3 Jan 2025 16:04:43 +0100 Subject: [PATCH 09/19] use counterfeiter generate for fake generation --- api/cfnetworking/cfnetv1/cfvnetv1.go | 3 + .../cfnetv1/connection_wrapper.go | 10 +- api/cfnetworking/cfnetworking.go | 6 + api/cfnetworking/connection.go | 6 +- api/cfnetworking/request.go | 31 ++- api/cfnetworking/wrapper/request_logger.go | 232 +++++++++--------- .../wrapper/uaa_authentication.go | 8 +- api/cfnetworking/wrapper/wrapper.go | 3 + 8 files changed, 155 insertions(+), 144 deletions(-) create mode 100644 api/cfnetworking/cfnetv1/cfvnetv1.go create mode 100644 api/cfnetworking/cfnetworking.go create mode 100644 api/cfnetworking/wrapper/wrapper.go diff --git a/api/cfnetworking/cfnetv1/cfvnetv1.go b/api/cfnetworking/cfnetv1/cfvnetv1.go new file mode 100644 index 0000000000..c80661d5e3 --- /dev/null +++ b/api/cfnetworking/cfnetv1/cfvnetv1.go @@ -0,0 +1,3 @@ +package cfnetv1 + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/api/cfnetworking/cfnetv1/connection_wrapper.go b/api/cfnetworking/cfnetv1/connection_wrapper.go index 4518f8fe0f..fc2367015f 100644 --- a/api/cfnetworking/cfnetv1/connection_wrapper.go +++ b/api/cfnetworking/cfnetv1/connection_wrapper.go @@ -2,16 +2,16 @@ package cfnetv1 import "code.cloudfoundry.org/cli/v9/api/cfnetworking" -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ConnectionWrapper - // ConnectionWrapper can wrap a given connection allowing the wrapper to modify // all requests going in and out of the given connection. +// +//counterfeiter:generate . ConnectionWrapper type ConnectionWrapper interface { - cfnetworking.Connection - Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection + cfnetworking.Connection + Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection } // WrapConnection wraps the current Client connection in the wrapper. func (client *Client) WrapConnection(wrapper ConnectionWrapper) { - client.connection = wrapper.Wrap(client.connection) + client.connection = wrapper.Wrap(client.connection) } diff --git a/api/cfnetworking/cfnetworking.go b/api/cfnetworking/cfnetworking.go new file mode 100644 index 0000000000..93b0cacabd --- /dev/null +++ b/api/cfnetworking/cfnetworking.go @@ -0,0 +1,6 @@ +// CF networking API. Copied from code.cloudfoundry.org/cfnetworking-cli-api +// to reduce recursive dependencies and allow proper go module management. + +package cfnetworking + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/api/cfnetworking/connection.go b/api/cfnetworking/connection.go index 57797a6f9a..96958130dc 100644 --- a/api/cfnetworking/connection.go +++ b/api/cfnetworking/connection.go @@ -1,8 +1,8 @@ package cfnetworking -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Connection - // Connection creates and executes http requests +// +//counterfeiter:generate . Connection type Connection interface { - Make(request *Request, passedResponse *Response) error + Make(request *Request, passedResponse *Response) error } diff --git a/api/cfnetworking/request.go b/api/cfnetworking/request.go index 02db6c5f89..8a81ca5389 100644 --- a/api/cfnetworking/request.go +++ b/api/cfnetworking/request.go @@ -1,35 +1,34 @@ package cfnetworking import ( - "io" - "net/http" + "io" + "net/http" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ReadSeeker - +//counterfeiter:generate . ReadSeeker type ReadSeeker interface { - io.ReadSeeker + io.ReadSeeker } // Request represents the request of the cloud controller. type Request struct { - *http.Request + *http.Request - body io.ReadSeeker + body io.ReadSeeker } func (r *Request) ResetBody() error { - if r.body == nil { - return nil - } + if r.body == nil { + return nil + } - _, err := r.body.Seek(0, 0) - return err + _, err := r.body.Seek(0, 0) + return err } func NewRequest(request *http.Request, body io.ReadSeeker) *Request { - return &Request{ - Request: request, - body: body, - } + return &Request{ + Request: request, + body: body, + } } diff --git a/api/cfnetworking/wrapper/request_logger.go b/api/cfnetworking/wrapper/request_logger.go index 60db04d46e..fb2d21b7fc 100644 --- a/api/cfnetworking/wrapper/request_logger.go +++ b/api/cfnetworking/wrapper/request_logger.go @@ -1,156 +1,156 @@ package wrapper import ( - "fmt" - "io/ioutil" - "net/http" - "sort" - "strings" - "time" - - "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "fmt" + "io/ioutil" + "net/http" + "sort" + "strings" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RequestLoggerOutput - // RequestLoggerOutput is the interface for displaying logs +// +//counterfeiter:generate . RequestLoggerOutput type RequestLoggerOutput interface { - DisplayHeader(name string, value string) error - DisplayHost(name string) error - DisplayJSONBody(body []byte) error - DisplayMessage(msg string) error - DisplayRequestHeader(method string, uri string, httpProtocol string) error - DisplayResponseHeader(httpProtocol string, status string) error - DisplayType(name string, requestDate time.Time) error - HandleInternalError(err error) - Start() error - Stop() error + DisplayHeader(name string, value string) error + DisplayHost(name string) error + DisplayJSONBody(body []byte) error + DisplayMessage(msg string) error + DisplayRequestHeader(method string, uri string, httpProtocol string) error + DisplayResponseHeader(httpProtocol string, status string) error + DisplayType(name string, requestDate time.Time) error + HandleInternalError(err error) + Start() error + Stop() error } // RequestLogger is the wrapper that logs requests to and responses from the // Cloud Controller server type RequestLogger struct { - connection cfnetworking.Connection - output RequestLoggerOutput + connection cfnetworking.Connection + output RequestLoggerOutput } // NewRequestLogger returns a pointer to a RequestLogger wrapper func NewRequestLogger(output RequestLoggerOutput) *RequestLogger { - return &RequestLogger{ - output: output, - } + return &RequestLogger{ + output: output, + } } // Wrap sets the connection on the RequestLogger and returns itself func (logger *RequestLogger) Wrap(innerconnection cfnetworking.Connection) cfnetworking.Connection { - logger.connection = innerconnection - return logger + logger.connection = innerconnection + return logger } // Make records the request and the response to UI func (logger *RequestLogger) Make(request *cfnetworking.Request, passedResponse *cfnetworking.Response) error { - err := logger.displayRequest(request) - if err != nil { - logger.output.HandleInternalError(err) - } + err := logger.displayRequest(request) + if err != nil { + logger.output.HandleInternalError(err) + } - err = logger.connection.Make(request, passedResponse) + err = logger.connection.Make(request, passedResponse) - if passedResponse.HTTPResponse != nil { - displayErr := logger.displayResponse(passedResponse) - if displayErr != nil { - logger.output.HandleInternalError(displayErr) - } - } + if passedResponse.HTTPResponse != nil { + displayErr := logger.displayResponse(passedResponse) + if displayErr != nil { + logger.output.HandleInternalError(displayErr) + } + } - return err + return err } func (logger *RequestLogger) displayRequest(request *cfnetworking.Request) error { - err := logger.output.Start() - if err != nil { - return err - } - defer logger.output.Stop() - - err = logger.output.DisplayType("REQUEST", time.Now()) - if err != nil { - return err - } - err = logger.output.DisplayRequestHeader(request.Method, request.URL.RequestURI(), request.Proto) - if err != nil { - return err - } - err = logger.output.DisplayHost(request.URL.Host) - if err != nil { - return err - } - err = logger.displaySortedHeaders(request.Header) - if err != nil { - return err - } - - contentType := request.Header.Get("Content-Type") - if request.Body != nil { - if strings.Contains(contentType, "json") { - rawRequestBody, err := ioutil.ReadAll(request.Body) - if err != nil { - return err - } - - defer request.ResetBody() - - return logger.output.DisplayJSONBody(rawRequestBody) - } else if contentType != "" { - return logger.output.DisplayMessage(fmt.Sprintf("[%s Content Hidden]", strings.Split(contentType, ";")[0])) - } - } - return nil + err := logger.output.Start() + if err != nil { + return err + } + defer logger.output.Stop() + + err = logger.output.DisplayType("REQUEST", time.Now()) + if err != nil { + return err + } + err = logger.output.DisplayRequestHeader(request.Method, request.URL.RequestURI(), request.Proto) + if err != nil { + return err + } + err = logger.output.DisplayHost(request.URL.Host) + if err != nil { + return err + } + err = logger.displaySortedHeaders(request.Header) + if err != nil { + return err + } + + contentType := request.Header.Get("Content-Type") + if request.Body != nil { + if strings.Contains(contentType, "json") { + rawRequestBody, err := ioutil.ReadAll(request.Body) + if err != nil { + return err + } + + defer request.ResetBody() + + return logger.output.DisplayJSONBody(rawRequestBody) + } else if contentType != "" { + return logger.output.DisplayMessage(fmt.Sprintf("[%s Content Hidden]", strings.Split(contentType, ";")[0])) + } + } + return nil } func (logger *RequestLogger) displayResponse(passedResponse *cfnetworking.Response) error { - err := logger.output.Start() - if err != nil { - return err - } - defer logger.output.Stop() - - err = logger.output.DisplayType("RESPONSE", time.Now()) - if err != nil { - return err - } - err = logger.output.DisplayResponseHeader(passedResponse.HTTPResponse.Proto, passedResponse.HTTPResponse.Status) - if err != nil { - return err - } - err = logger.displaySortedHeaders(passedResponse.HTTPResponse.Header) - if err != nil { - return err - } - return logger.output.DisplayJSONBody(passedResponse.RawResponse) + err := logger.output.Start() + if err != nil { + return err + } + defer logger.output.Stop() + + err = logger.output.DisplayType("RESPONSE", time.Now()) + if err != nil { + return err + } + err = logger.output.DisplayResponseHeader(passedResponse.HTTPResponse.Proto, passedResponse.HTTPResponse.Status) + if err != nil { + return err + } + err = logger.displaySortedHeaders(passedResponse.HTTPResponse.Header) + if err != nil { + return err + } + return logger.output.DisplayJSONBody(passedResponse.RawResponse) } func (logger *RequestLogger) displaySortedHeaders(headers http.Header) error { - keys := []string{} - for key, _ := range headers { - keys = append(keys, key) - } - sort.Strings(keys) - - for _, key := range keys { - for _, value := range headers[key] { - err := logger.output.DisplayHeader(key, redactHeaders(key, value)) - if err != nil { - return err - } - } - } - return nil + keys := []string{} + for key, _ := range headers { + keys = append(keys, key) + } + sort.Strings(keys) + + for _, key := range keys { + for _, value := range headers[key] { + err := logger.output.DisplayHeader(key, redactHeaders(key, value)) + if err != nil { + return err + } + } + } + return nil } func redactHeaders(key string, value string) string { - if key == "Authorization" { - return "[PRIVATE DATA HIDDEN]" - } - return value + if key == "Authorization" { + return "[PRIVATE DATA HIDDEN]" + } + return value } diff --git a/api/cfnetworking/wrapper/uaa_authentication.go b/api/cfnetworking/wrapper/uaa_authentication.go index 2a7f07eb77..7562c3e659 100644 --- a/api/cfnetworking/wrapper/uaa_authentication.go +++ b/api/cfnetworking/wrapper/uaa_authentication.go @@ -6,16 +6,16 @@ import ( "code.cloudfoundry.org/cli/v9/api/uaa" ) -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient - // UAAClient is the interface for getting a valid access token +// +//counterfeiter:generate . UAAClient type UAAClient interface { RefreshAccessToken(refreshToken string) (uaa.RefreshedTokens, error) } -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . TokenCache - // TokenCache is where the UAA token information is stored. +// +//counterfeiter:generate . TokenCache type TokenCache interface { AccessToken() string RefreshToken() string diff --git a/api/cfnetworking/wrapper/wrapper.go b/api/cfnetworking/wrapper/wrapper.go new file mode 100644 index 0000000000..c9964d9827 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapper.go @@ -0,0 +1,3 @@ +package wrapper + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate From 0dc504ba9a6ee17ad781bc8082b25a88ffdd3d0c Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:48:43 +0100 Subject: [PATCH 10/19] best practice improvements, ginkgo upgrade and tests fixes --- .../cfnetv1/cfnetv1_suite_test.go | 48 +- api/cfnetworking/cfnetv1/policy.go | 136 ++-- api/cfnetworking/cfnetv1/policy_test.go | 442 ++++++------ api/cfnetworking/cfnetv1/request.go | 94 +-- api/cfnetworking/cfnetworking_suite_test.go | 2 +- api/cfnetworking/errors_test.go | 51 +- .../networkerror/request_error.go | 2 +- .../networkerror/unverified_server_error.go | 2 +- api/cfnetworking/networking_connection.go | 186 ++--- .../networking_connection_test.go | 461 ++++++------- api/cfnetworking/wrapper/request_logger.go | 8 +- .../wrapper/request_logger_test.go | 642 +++++++++--------- .../wrapper/retry_request_test.go | 207 +++--- .../wrapper/uaa_authentication_test.go | 334 ++++----- .../wrapper/util/in_memory_cache.go | 4 +- .../wrapper/wrapper_suite_test.go | 5 +- 16 files changed, 1312 insertions(+), 1312 deletions(-) diff --git a/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go b/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go index 6c9c74a9ec..f591fe7664 100644 --- a/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go +++ b/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go @@ -7,49 +7,49 @@ import ( . "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) func TestCFNetV1(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "CF Networking V1 Client Suite") + RegisterFailHandler(Fail) + RunSpecs(t, "CF Networking V1 Client Suite") } var server *Server var _ = SynchronizedBeforeSuite(func() []byte { - return []byte{} + return []byte{} }, func(data []byte) { - server = NewTLSServer() + server = NewTLSServer() - // Suppresses ginkgo server logs - server.HTTPTestServer.Config.ErrorLog = log.New(&bytes.Buffer{}, "", 0) + // Suppresses ginkgo server logs + server.HTTPTestServer.Config.ErrorLog = log.New(&bytes.Buffer{}, "", 0) }) var _ = SynchronizedAfterSuite(func() { - server.Close() + server.Close() }, func() {}) var _ = BeforeEach(func() { - server.Reset() + server.Reset() }) func NewTestClient(passed ...Config) *Client { - var config Config - if len(passed) > 0 { - config = passed[0] - } else { - config = Config{} - } - config.AppName = "CF Networking V1 Test" - config.AppVersion = "Unknown" - config.SkipSSLValidation = true - - if config.URL == "" { - config.URL = server.URL() - } - - return NewClient(config) + var config Config + if len(passed) > 0 { + config = passed[0] + } else { + config = Config{} + } + config.AppName = "CF Networking V1 Test" + config.AppVersion = "Unknown" + config.SkipSSLValidation = true + + if config.URL == "" { + config.URL = server.URL() + } + + return NewClient(config) } diff --git a/api/cfnetworking/cfnetv1/policy.go b/api/cfnetworking/cfnetv1/policy.go index dd06800396..113cb8d6ea 100644 --- a/api/cfnetworking/cfnetv1/policy.go +++ b/api/cfnetworking/cfnetv1/policy.go @@ -12,93 +12,93 @@ import ( type PolicyProtocol string const ( - PolicyProtocolTCP PolicyProtocol = "tcp" - PolicyProtocolUDP PolicyProtocol = "udp" + PolicyProtocolTCP PolicyProtocol = "tcp" + PolicyProtocolUDP PolicyProtocol = "udp" ) type PolicyList struct { - TotalPolicies int `json:"total_policies,omitempty"` - Policies []Policy `json:"policies"` + TotalPolicies int `json:"total_policies,omitempty"` + Policies []Policy `json:"policies"` } type Policy struct { - Source PolicySource `json:"source"` - Destination PolicyDestination `json:"destination"` + Source PolicySource `json:"source"` + Destination PolicyDestination `json:"destination"` } type PolicySource struct { - ID string `json:"id"` + ID string `json:"id"` } type PolicyDestination struct { - ID string `json:"id"` - Protocol PolicyProtocol `json:"protocol"` - Ports Ports `json:"ports"` + ID string `json:"id"` + Protocol PolicyProtocol `json:"protocol"` + Ports Ports `json:"ports"` } // CreatePolicies will create the network policy with the given parameters. -func (client Client) CreatePolicies(policies []Policy) error { - rawJSON, err := json.Marshal(PolicyList{Policies: policies}) - if err != nil { - return err - } - - request, err := client.newHTTPRequest(requestOptions{ - RequestName: internal.CreatePolicies, - Body: bytes.NewReader(rawJSON), - }) - if err != nil { - return err - } - - return client.connection.Make(request, &cfnetworking.Response{}) +func (client *Client) CreatePolicies(policies []Policy) error { + rawJSON, err := json.Marshal(PolicyList{Policies: policies}) + if err != nil { + return err + } + + request, err := client.newHTTPRequest(requestOptions{ + RequestName: internal.CreatePolicies, + Body: bytes.NewReader(rawJSON), + }) + if err != nil { + return err + } + + return client.connection.Make(request, &cfnetworking.Response{}) } // ListPolicies will list the policies with the app guids in either the source or destination. -func (client Client) ListPolicies(appGUIDs ...string) ([]Policy, error) { - var request *cfnetworking.Request - var err error - if len(appGUIDs) == 0 { - request, err = client.newHTTPRequest(requestOptions{ - RequestName: internal.ListPolicies, - }) - } else { - request, err = client.newHTTPRequest(requestOptions{ - RequestName: internal.ListPolicies, - Query: map[string][]string{ - "id": {strings.Join(appGUIDs, ",")}, - }, - }) - } - if err != nil { - return []Policy{}, err - } - - policies := PolicyList{} - response := &cfnetworking.Response{} - - err = client.connection.Make(request, response) - if err != nil { - return []Policy{}, err - } - - err = json.Unmarshal(response.RawResponse, &policies) - if err != nil { - return []Policy{}, err - } - - return policies.Policies, nil +func (client *Client) ListPolicies(appGUIDs ...string) ([]Policy, error) { + var request *cfnetworking.Request + var err error + if len(appGUIDs) == 0 { + request, err = client.newHTTPRequest(requestOptions{ + RequestName: internal.ListPolicies, + }) + } else { + request, err = client.newHTTPRequest(requestOptions{ + RequestName: internal.ListPolicies, + Query: map[string][]string{ + "id": {strings.Join(appGUIDs, ",")}, + }, + }) + } + if err != nil { + return []Policy{}, err + } + + policies := PolicyList{} + response := &cfnetworking.Response{} + + err = client.connection.Make(request, response) + if err != nil { + return []Policy{}, err + } + + err = json.Unmarshal(response.RawResponse, &policies) + if err != nil { + return []Policy{}, err + } + + return policies.Policies, nil } // RemovePolicies will remove the network policy with the given parameters. -func (client Client) RemovePolicies(policies []Policy) error { - rawJSON, err := json.Marshal(PolicyList{Policies: policies}) - if err != nil { - return err - } - request, err := client.newHTTPRequest(requestOptions{ - RequestName: internal.DeletePolicies, - Body: bytes.NewReader(rawJSON), - }) - return client.connection.Make(request, &cfnetworking.Response{}) +func (client *Client) RemovePolicies(policies []Policy) error { + rawJSON, err := json.Marshal(PolicyList{Policies: policies}) + if err != nil { + return err + } + request, err := client.newHTTPRequest(requestOptions{ + RequestName: internal.DeletePolicies, + Body: bytes.NewReader(rawJSON), + }) + return client.connection.Make(request, &cfnetworking.Response{}) } diff --git a/api/cfnetworking/cfnetv1/policy_test.go b/api/cfnetworking/cfnetv1/policy_test.go index 0936645360..6ccebded82 100644 --- a/api/cfnetworking/cfnetv1/policy_test.go +++ b/api/cfnetworking/cfnetv1/policy_test.go @@ -1,25 +1,25 @@ package cfnetv1_test import ( - "net/http" + "net/http" - . "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - . "github.com/onsi/gomega/ghttp" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" ) var _ = Describe("Policy", func() { - var client *Client - BeforeEach(func() { - client = NewTestClient() - }) + var client *Client + BeforeEach(func() { + client = NewTestClient() + }) - Describe("CreatePolicies", func() { - Context("when the stack is found", func() { - BeforeEach(func() { - expectedBody := `{ + Describe("CreatePolicies", func() { + Context("when the stack is found", func() { + BeforeEach(func() { + expectedBody := `{ "policies": [ { "source": { @@ -49,76 +49,76 @@ var _ = Describe("Policy", func() { } ] }` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodPost, "/policies"), - VerifyJSON(expectedBody), - RespondWith(http.StatusOK, ""), - ), - ) - }) + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies"), + VerifyJSON(expectedBody), + RespondWith(http.StatusOK, ""), + ), + ) + }) - It("passes the body correctly", func() { - err := client.CreatePolicies([]Policy{ - { - Source: PolicySource{ - ID: "source-id-1", - }, - Destination: PolicyDestination{ - ID: "destination-id-1", - Protocol: PolicyProtocolTCP, - Ports: Ports{ - Start: 1234, - End: 1235, - }, - }, - }, - { - Source: PolicySource{ - ID: "source-id-2", - }, - Destination: PolicyDestination{ - ID: "destination-id-2", - Protocol: PolicyProtocolUDP, - Ports: Ports{ - Start: 1234, - End: 1235, - }, - }, - }, - }) - Expect(err).ToNot(HaveOccurred()) - Expect(server.ReceivedRequests()).To(HaveLen(1)) - }) - }) + It("passes the body correctly", func() { + err := client.CreatePolicies([]Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: PolicyProtocolTCP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: PolicyProtocolUDP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + }) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) - Context("when the client returns an error", func() { - BeforeEach(func() { - response := `{ + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ "error": "Oh Noes" }` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodPost, "/policies"), - RespondWith(http.StatusBadRequest, response), - ), - ) - }) + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) - It("returns the error and warnings", func() { - err := client.CreatePolicies(nil) - Expect(err).To(MatchError(networkerror.BadRequestError{ - Message: "Oh Noes", - })) - }) - }) - }) + It("returns the error and warnings", func() { + err := client.CreatePolicies(nil) + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) - Describe("ListPolicies", func() { - var expectedPolicies []Policy - Context("when the policies are found", func() { - BeforeEach(func() { - response := `{ + Describe("ListPolicies", func() { + var expectedPolicies []Policy + Context("when the policies are found", func() { + BeforeEach(func() { + response := `{ "policies": [ { "source": { @@ -148,101 +148,101 @@ var _ = Describe("Policy", func() { } ] }` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodGet, "/policies"), - RespondWith(http.StatusOK, response), - ), - ) - expectedPolicies = []Policy{ - { - Source: PolicySource{ - ID: "source-id-1", - }, - Destination: PolicyDestination{ - ID: "destination-id-1", - Protocol: "tcp", - Ports: Ports{ - Start: 1234, - End: 1235, - }, - }, - }, - { - Source: PolicySource{ - ID: "source-id-2", - }, - Destination: PolicyDestination{ - ID: "destination-id-2", - Protocol: "tcp", - Ports: Ports{ - Start: 4321, - End: 5321, - }, - }, - }, - } - }) + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/policies"), + RespondWith(http.StatusOK, response), + ), + ) + expectedPolicies = []Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: "tcp", + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: "tcp", + Ports: Ports{ + Start: 4321, + End: 5321, + }, + }, + }, + } + }) - It("returns the policies correctly", func() { - policies, err := client.ListPolicies() - Expect(policies).To(Equal(expectedPolicies)) - Expect(err).ToNot(HaveOccurred()) - Expect(server.ReceivedRequests()).To(HaveLen(1)) - }) + It("returns the policies correctly", func() { + policies, err := client.ListPolicies() + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) - Context("when an app guid is passed", func() { - It("makes the query correctly", func() { - policies, err := client.ListPolicies("source-id-1") - Expect(policies).To(Equal(expectedPolicies)) - Expect(err).ToNot(HaveOccurred()) + Context("when an app guid is passed", func() { + It("makes the query correctly", func() { + policies, err := client.ListPolicies("source-id-1") + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) - requests := server.ReceivedRequests() - Expect(requests).To(HaveLen(1)) - Expect(requests[0].RequestURI).To(Equal("/policies?id=source-id-1")) - }) - }) + requests := server.ReceivedRequests() + Expect(requests).To(HaveLen(1)) + Expect(requests[0].RequestURI).To(Equal("/policies?id=source-id-1")) + }) + }) - Context("when multiple app guid are passed", func() { - It("makes the query correctly", func() { - policies, err := client.ListPolicies("source-id-1", "source-id-2") - Expect(policies).To(Equal(expectedPolicies)) - Expect(err).ToNot(HaveOccurred()) + Context("when multiple app guid are passed", func() { + It("makes the query correctly", func() { + policies, err := client.ListPolicies("source-id-1", "source-id-2") + Expect(policies).To(Equal(expectedPolicies)) + Expect(err).ToNot(HaveOccurred()) - requests := server.ReceivedRequests() - Expect(requests).To(HaveLen(1)) - Expect(requests[0].RequestURI).To(Equal("/policies?id=source-id-1%2Csource-id-2")) - }) - }) + requests := server.ReceivedRequests() + Expect(requests).To(HaveLen(1)) + Expect(requests[0].RequestURI).To(Equal("/policies?id=source-id-1%2Csource-id-2")) + }) + }) - }) + }) - Context("when the client returns an error", func() { - BeforeEach(func() { - response := `{ + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ "error": "Oh Noes" }` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodGet, "/policies"), - RespondWith(http.StatusBadRequest, response), - ), - ) - }) + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/policies"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) - It("returns the error", func() { - _, err := client.ListPolicies() - Expect(err).To(MatchError(networkerror.BadRequestError{ - Message: "Oh Noes", - })) - }) - }) - }) + It("returns the error", func() { + _, err := client.ListPolicies() + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) - Describe("RemovePolicies", func() { - Context("when the policy is found", func() { - BeforeEach(func() { - expectedBody := `{ + Describe("RemovePolicies", func() { + Context("when the policy is found", func() { + BeforeEach(func() { + expectedBody := `{ "policies": [ { "source": { @@ -272,68 +272,68 @@ var _ = Describe("Policy", func() { } ] }` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodPost, "/policies/delete"), - VerifyJSON(expectedBody), - RespondWith(http.StatusOK, ""), - ), - ) - }) + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies/delete"), + VerifyJSON(expectedBody), + RespondWith(http.StatusOK, ""), + ), + ) + }) - It("passes the body correctly", func() { - err := client.RemovePolicies([]Policy{ - { - Source: PolicySource{ - ID: "source-id-1", - }, - Destination: PolicyDestination{ - ID: "destination-id-1", - Protocol: PolicyProtocolTCP, - Ports: Ports{ - Start: 1234, - End: 1235, - }, - }, - }, - { - Source: PolicySource{ - ID: "source-id-2", - }, - Destination: PolicyDestination{ - ID: "destination-id-2", - Protocol: PolicyProtocolUDP, - Ports: Ports{ - Start: 1234, - End: 1235, - }, - }, - }, - }) - Expect(err).ToNot(HaveOccurred()) - Expect(server.ReceivedRequests()).To(HaveLen(1)) - }) - }) + It("passes the body correctly", func() { + err := client.RemovePolicies([]Policy{ + { + Source: PolicySource{ + ID: "source-id-1", + }, + Destination: PolicyDestination{ + ID: "destination-id-1", + Protocol: PolicyProtocolTCP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + { + Source: PolicySource{ + ID: "source-id-2", + }, + Destination: PolicyDestination{ + ID: "destination-id-2", + Protocol: PolicyProtocolUDP, + Ports: Ports{ + Start: 1234, + End: 1235, + }, + }, + }, + }) + Expect(err).ToNot(HaveOccurred()) + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) - Context("when the client returns an error", func() { - BeforeEach(func() { - response := `{ + Context("when the client returns an error", func() { + BeforeEach(func() { + response := `{ "error": "Oh Noes" }` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodPost, "/policies/delete"), - RespondWith(http.StatusBadRequest, response), - ), - ) - }) + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodPost, "/policies/delete"), + RespondWith(http.StatusBadRequest, response), + ), + ) + }) - It("returns the error", func() { - err := client.RemovePolicies(nil) - Expect(err).To(MatchError(networkerror.BadRequestError{ - Message: "Oh Noes", - })) - }) - }) - }) + It("returns the error", func() { + err := client.RemovePolicies(nil) + Expect(err).To(MatchError(networkerror.BadRequestError{ + Message: "Oh Noes", + })) + }) + }) + }) }) diff --git a/api/cfnetworking/cfnetv1/request.go b/api/cfnetworking/cfnetv1/request.go index f564996880..8511e5e683 100644 --- a/api/cfnetworking/cfnetv1/request.go +++ b/api/cfnetworking/cfnetv1/request.go @@ -1,12 +1,12 @@ package cfnetv1 import ( - "fmt" - "io" - "net/http" - "net/url" + "fmt" + "io" + "net/http" + "net/url" - "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking" ) // Params represents URI parameters for a request. @@ -14,57 +14,57 @@ type Params map[string]string // requestOptions contains all the options to create an HTTP request. type requestOptions struct { - // URIParams are the list URI route parameters - URIParams Params + // URIParams are the list URI route parameters + URIParams Params - // Query is a list of HTTP query parameters - Query url.Values + // Query is a list of HTTP query parameters + Query url.Values - // RequestName is the name of the request (see routes) - RequestName string + // RequestName is the name of the request (see routes) + RequestName string - // URI is the URI of the request. - URI string - // Method is the HTTP method of the request. - Method string + // URI is the URI of the request. + URI string + // Method is the HTTP method of the request. + Method string - // Body is the request body - Body io.ReadSeeker + // Body is the request body + Body io.ReadSeeker } // newHTTPRequest returns a constructed HTTP.Request with some defaults. // Defaults are applied when Request fields are not filled in. -func (client Client) newHTTPRequest(passedRequest requestOptions) (*cfnetworking.Request, error) { - var request *http.Request - var err error - if passedRequest.URI != "" { - request, err = http.NewRequest( - passedRequest.Method, - fmt.Sprintf("%s%s", client.url, passedRequest.URI), - passedRequest.Body, - ) - } else { - request, err = client.router.CreateRequest( - passedRequest.RequestName, - map[string]string(passedRequest.URIParams), - passedRequest.Body, - ) - if err == nil { - request.URL.RawQuery = passedRequest.Query.Encode() - } - } - if err != nil { - return nil, err - } +func (client *Client) newHTTPRequest(passedRequest requestOptions) (*cfnetworking.Request, error) { + var request *http.Request + var err error + if passedRequest.URI != "" { + request, err = http.NewRequest( + passedRequest.Method, + fmt.Sprintf("%s%s", client.url, passedRequest.URI), + passedRequest.Body, + ) + } else { + request, err = client.router.CreateRequest( + passedRequest.RequestName, + map[string]string(passedRequest.URIParams), + passedRequest.Body, + ) + if err == nil { + request.URL.RawQuery = passedRequest.Query.Encode() + } + } + if err != nil { + return nil, err + } - request.Header = http.Header{} - request.Header.Set("Accept", "application/json") - request.Header.Set("User-Agent", client.userAgent) + request.Header = http.Header{} + request.Header.Set("Accept", "application/json") + request.Header.Set("User-Agent", client.userAgent) - if passedRequest.Body != nil { - request.Header.Set("Content-Type", "application/json") - } + if passedRequest.Body != nil { + request.Header.Set("Content-Type", "application/json") + } - // Make sure the body is the same as the one in the request - return cfnetworking.NewRequest(request, passedRequest.Body), nil + // Make sure the body is the same as the one in the request + return cfnetworking.NewRequest(request, passedRequest.Body), nil } diff --git a/api/cfnetworking/cfnetworking_suite_test.go b/api/cfnetworking/cfnetworking_suite_test.go index 5ed7ecab05..b434160e52 100644 --- a/api/cfnetworking/cfnetworking_suite_test.go +++ b/api/cfnetworking/cfnetworking_suite_test.go @@ -5,7 +5,7 @@ import ( "log" "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cfnetworking/errors_test.go b/api/cfnetworking/errors_test.go index f428f9b72d..1edf8d4f04 100644 --- a/api/cfnetworking/errors_test.go +++ b/api/cfnetworking/errors_test.go @@ -1,37 +1,36 @@ package cfnetworking_test import ( - "fmt" - "net/http" + "fmt" + "net/http" - . "code.cloudfoundry.org/cli/v9/api/cfnetworking" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" - . "github.com/onsi/gomega" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) var _ = Describe("Error Wrapper", func() { - const errorMessage = "I am an error" + const errorMessage = "I am an error" - DescribeTable("Make", - func(statusCode int, expectedError error) { - fakeConnection := new(cfnetworkingfakes.FakeConnection) - fakeConnection.MakeReturns(networkerror.RawHTTPStatusError{ - StatusCode: statusCode, - RawResponse: []byte(fmt.Sprintf(`{"error":"%s"}`, errorMessage)), - }) + DescribeTable("Make", + func(statusCode int, expectedError error) { + fakeConnection := new(cfnetworkingfakes.FakeConnection) + fakeConnection.MakeReturns(networkerror.RawHTTPStatusError{ + StatusCode: statusCode, + RawResponse: []byte(fmt.Sprintf(`{"error":"%s"}`, errorMessage)), + }) - errorWrapper := NewErrorWrapper().Wrap(fakeConnection) - err := errorWrapper.Make(nil, nil) - Expect(err).To(MatchError(expectedError)) - }, - Entry("400 -> BadRequestError", http.StatusBadRequest, networkerror.BadRequestError{Message: errorMessage}), - Entry("401 -> UnauthorizedError", http.StatusUnauthorized, networkerror.UnauthorizedError{Message: errorMessage}), - Entry("403 -> ForbiddenError", http.StatusForbidden, networkerror.ForbiddenError{Message: errorMessage}), - Entry("406 -> NotAcceptable", http.StatusNotAcceptable, networkerror.NotAcceptableError{Message: errorMessage}), - Entry("409 -> ConflictError", http.StatusConflict, networkerror.ConflictError{Message: errorMessage}), - ) + errorWrapper := NewErrorWrapper().Wrap(fakeConnection) + err := errorWrapper.Make(nil, nil) + Expect(err).To(MatchError(expectedError)) + }, + Entry("400 -> BadRequestError", http.StatusBadRequest, networkerror.BadRequestError{Message: errorMessage}), + Entry("401 -> UnauthorizedError", http.StatusUnauthorized, networkerror.UnauthorizedError{Message: errorMessage}), + Entry("403 -> ForbiddenError", http.StatusForbidden, networkerror.ForbiddenError{Message: errorMessage}), + Entry("406 -> NotAcceptable", http.StatusNotAcceptable, networkerror.NotAcceptableError{Message: errorMessage}), + Entry("409 -> ConflictError", http.StatusConflict, networkerror.ConflictError{Message: errorMessage}), + ) }) diff --git a/api/cfnetworking/networkerror/request_error.go b/api/cfnetworking/networkerror/request_error.go index 7b0ff48937..0a4c17a6f7 100644 --- a/api/cfnetworking/networkerror/request_error.go +++ b/api/cfnetworking/networkerror/request_error.go @@ -1,7 +1,7 @@ package networkerror // RequestError represents a generic error encountered while performing the -// HTTP request. This generic error occurs before a HTTP response is obtained. +// HTTP request. This generic error occurs before an HTTP response is obtained. type RequestError struct { Err error } diff --git a/api/cfnetworking/networkerror/unverified_server_error.go b/api/cfnetworking/networkerror/unverified_server_error.go index 59a877302a..97b7992e61 100644 --- a/api/cfnetworking/networkerror/unverified_server_error.go +++ b/api/cfnetworking/networkerror/unverified_server_error.go @@ -1,7 +1,7 @@ package networkerror // UnverifiedServerError replaces x509.UnknownAuthorityError when the server -// has SSL but the client is unable to verify it's certificate +// has SSL but the client is unable to verify its certificate type UnverifiedServerError struct { URL string } diff --git a/api/cfnetworking/networking_connection.go b/api/cfnetworking/networking_connection.go index 6e9add07e4..2fc0ceacd2 100644 --- a/api/cfnetworking/networking_connection.go +++ b/api/cfnetworking/networking_connection.go @@ -1,126 +1,126 @@ package cfnetworking import ( - "bytes" - "crypto/tls" - "crypto/x509" - "encoding/json" - "io/ioutil" - "net" - "net/http" - "net/url" - "time" - - "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + "bytes" + "crypto/tls" + "crypto/x509" + "encoding/json" + "io" + "net" + "net/http" + "net/url" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" ) // NetworkingConnection represents a connection to the Cloud Controller // server. type NetworkingConnection struct { - HTTPClient *http.Client - UserAgent string + HTTPClient *http.Client + UserAgent string } // Config is for configuring a NetworkingConnection. type Config struct { - DialTimeout time.Duration - SkipSSLValidation bool + DialTimeout time.Duration + SkipSSLValidation bool } // NewConnection returns a new NetworkingConnection with provided // configuration. func NewConnection(config Config) *NetworkingConnection { - tr := &http.Transport{ - TLSClientConfig: &tls.Config{ - InsecureSkipVerify: config.SkipSSLValidation, - }, - Proxy: http.ProxyFromEnvironment, - DialContext: (&net.Dialer{ - KeepAlive: 30 * time.Second, - Timeout: config.DialTimeout, - }).DialContext, - } - - return &NetworkingConnection{ - HTTPClient: &http.Client{Transport: tr}, - } + tr := &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: config.SkipSSLValidation, + }, + Proxy: http.ProxyFromEnvironment, + DialContext: (&net.Dialer{ + KeepAlive: 30 * time.Second, + Timeout: config.DialTimeout, + }).DialContext, + } + + return &NetworkingConnection{ + HTTPClient: &http.Client{Transport: tr}, + } } // Make performs the request and parses the response. func (connection *NetworkingConnection) Make(request *Request, passedResponse *Response) error { - // In case this function is called from a retry, passedResponse may already - // be populated with a previous response. We reset in case there's an HTTP - // error and we don't repopulate it in populateResponse. - passedResponse.reset() + // In case this function is called from a retry, passedResponse may already + // be populated with a previous response. We reset in case there's an HTTP + // error, and we don't repopulate it in populateResponse. + passedResponse.reset() - response, err := connection.HTTPClient.Do(request.Request) - if err != nil { - return connection.processRequestErrors(request.Request, err) - } + response, err := connection.HTTPClient.Do(request.Request) + if err != nil { + return connection.processRequestErrors(request.Request, err) + } - return connection.populateResponse(response, passedResponse) + return connection.populateResponse(response, passedResponse) } func (*NetworkingConnection) processRequestErrors(request *http.Request, err error) error { - switch e := err.(type) { - case *url.Error: - switch urlErr := e.Err.(type) { - case x509.UnknownAuthorityError: - return networkerror.UnverifiedServerError{ - URL: request.URL.String(), - } - case x509.HostnameError: - return networkerror.SSLValidationHostnameError{ - Message: urlErr.Error(), - } - default: - return networkerror.RequestError{Err: e} - } - default: - return err - } + switch e := err.(type) { + case *url.Error: + switch urlErr := e.Err.(type) { + case x509.UnknownAuthorityError: + return networkerror.UnverifiedServerError{ + URL: request.URL.String(), + } + case x509.HostnameError: + return networkerror.SSLValidationHostnameError{ + Message: urlErr.Error(), + } + default: + return networkerror.RequestError{Err: e} + } + default: + return err + } } func (connection *NetworkingConnection) populateResponse(response *http.Response, passedResponse *Response) error { - passedResponse.HTTPResponse = response - - if resourceLocationURL := response.Header.Get("Location"); resourceLocationURL != "" { - passedResponse.ResourceLocationURL = resourceLocationURL - } - - rawBytes, err := ioutil.ReadAll(response.Body) - defer response.Body.Close() - if err != nil { - return err - } - - passedResponse.RawResponse = rawBytes - - err = connection.handleStatusCodes(response, passedResponse) - if err != nil { - return err - } - - if passedResponse.Result != nil { - decoder := json.NewDecoder(bytes.NewBuffer(passedResponse.RawResponse)) - decoder.UseNumber() - err = decoder.Decode(passedResponse.Result) - if err != nil { - return err - } - } - - return nil + passedResponse.HTTPResponse = response + + if resourceLocationURL := response.Header.Get("Location"); resourceLocationURL != "" { + passedResponse.ResourceLocationURL = resourceLocationURL + } + + rawBytes, err := io.ReadAll(response.Body) + defer response.Body.Close() + if err != nil { + return err + } + + passedResponse.RawResponse = rawBytes + + err = connection.handleStatusCodes(response, passedResponse) + if err != nil { + return err + } + + if passedResponse.Result != nil { + decoder := json.NewDecoder(bytes.NewBuffer(passedResponse.RawResponse)) + decoder.UseNumber() + err = decoder.Decode(passedResponse.Result) + if err != nil { + return err + } + } + + return nil } func (*NetworkingConnection) handleStatusCodes(response *http.Response, passedResponse *Response) error { - if response.StatusCode >= 400 { - return networkerror.RawHTTPStatusError{ - StatusCode: response.StatusCode, - RawResponse: passedResponse.RawResponse, - RequestIDs: response.Header["X-Vcap-Request-Id"], - } - } - - return nil + if response.StatusCode >= 400 { + return networkerror.RawHTTPStatusError{ + StatusCode: response.StatusCode, + RawResponse: passedResponse.RawResponse, + RequestIDs: response.Header["X-Vcap-Request-Id"], + } + } + + return nil } diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go index 4a9376be36..9eeb45d250 100644 --- a/api/cfnetworking/networking_connection_test.go +++ b/api/cfnetworking/networking_connection_test.go @@ -1,251 +1,254 @@ package cfnetworking_test import ( - "fmt" - "net/http" - "runtime" - "strings" - - . "code.cloudfoundry.org/cli/v9/api/cfnetworking" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - . "github.com/onsi/gomega/ghttp" + "fmt" + "net/http" + "runtime" + "strings" + + . "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" ) type DummyResponse struct { - Val1 string `json:"val1"` - Val2 int `json:"val2"` - Val3 interface{} `json:"val3,omitempty"` + Val1 string `json:"val1"` + Val2 int `json:"val2"` + Val3 interface{} `json:"val3,omitempty"` } var _ = Describe("CF Networking Connection", func() { - var connection *NetworkingConnection + var connection *NetworkingConnection - BeforeEach(func() { - connection = NewConnection(Config{SkipSSLValidation: true}) - }) + BeforeEach(func() { + connection = NewConnection(Config{SkipSSLValidation: true}) + }) - Describe("Make", func() { - Describe("Data Unmarshalling", func() { - var request *Request + Describe("Make", func() { + Describe("Data Unmarshalling", func() { + var request *Request - BeforeEach(func() { - response := `{ + BeforeEach(func() { + response := `{ "val1":"2.59.0", "val2":2, "val3":1111111111111111111 }` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodGet, "/v2/foo", ""), - RespondWith(http.StatusOK, response), - ), - ) - - req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) - Expect(err).ToNot(HaveOccurred()) - request = &Request{Request: req} - }) - - Context("when passed a response with a result set", func() { - It("unmarshals the data into a struct", func() { - var body DummyResponse - response := Response{ - Result: &body, - } - - err := connection.Make(request, &response) - Expect(err).NotTo(HaveOccurred()) - - Expect(body.Val1).To(Equal("2.59.0")) - Expect(body.Val2).To(Equal(2)) - }) - - It("keeps numbers unmarshalled to interfaces as interfaces", func() { - var body DummyResponse - response := Response{ - Result: &body, - } - - err := connection.Make(request, &response) - Expect(err).NotTo(HaveOccurred()) - Expect(fmt.Sprint(body.Val3)).To(Equal("1111111111111111111")) - }) - }) - - Context("when passed an empty response", func() { - It("skips the unmarshalling step", func() { - var response Response - err := connection.Make(request, &response) - Expect(err).NotTo(HaveOccurred()) - Expect(response.Result).To(BeNil()) - }) - }) - }) - - Describe("HTTP Response", func() { - var request *Request - - BeforeEach(func() { - response := `{}` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodGet, "/v2/foo", ""), - RespondWith(http.StatusOK, response), - ), - ) - - req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) - Expect(err).ToNot(HaveOccurred()) - request = &Request{Request: req} - }) - - It("returns the status", func() { - response := Response{} - - err := connection.Make(request, &response) - Expect(err).NotTo(HaveOccurred()) - - Expect(response.HTTPResponse.Status).To(Equal("200 OK")) - }) - }) - - Describe("Response Headers", func() { - Describe("Location", func() { - BeforeEach(func() { - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodGet, "/v2/foo"), - RespondWith(http.StatusAccepted, "{}", http.Header{"Location": {"/v2/some-location"}}), - ), - ) - }) - - It("returns the location in the ResourceLocationURL", func() { - req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) - Expect(err).ToNot(HaveOccurred()) - request := &Request{Request: req} - - var response Response - err = connection.Make(request, &response) - Expect(err).NotTo(HaveOccurred()) - - Expect(server.ReceivedRequests()).To(HaveLen(1)) - Expect(response.ResourceLocationURL).To(Equal("/v2/some-location")) - }) - }) - }) - - Describe("Errors", func() { - Context("when the server does not exist", func() { - BeforeEach(func() { - connection = NewConnection(Config{}) - }) - - It("returns a RequestError", func() { - req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", "http://garbledyguk.com"), nil) - Expect(err).ToNot(HaveOccurred()) - request := &Request{Request: req} - - var response Response - err = connection.Make(request, &response) - Expect(err).To(HaveOccurred()) - - requestErr, ok := err.(networkerror.RequestError) - Expect(ok).To(BeTrue()) - Expect(requestErr.Error()).To(MatchRegexp(".*http://garbledyguk.com/v2/foo.*[nN]o such host")) - }) - }) - - Context("when the server does not have a verified certificate", func() { - Context("skipSSLValidation is false", func() { - BeforeEach(func() { - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodGet, "/v2/foo"), - ), - ) - - connection = NewConnection(Config{}) - }) - - It("returns a UnverifiedServerError", func() { - req, err := http.NewRequest(http.MethodGet, server.URL(), nil) - Expect(err).ToNot(HaveOccurred()) - request := &Request{Request: req} - - var response Response - err = connection.Make(request, &response) - Expect(err).To(MatchError(networkerror.UnverifiedServerError{URL: server.URL()})) - }) - }) - }) - - Context("when the server's certificate does not match the hostname", func() { - Context("skipSSLValidation is false", func() { - BeforeEach(func() { - if runtime.GOOS == "windows" { - Skip("ssl validation has a different order on windows, will not be returned properly") - } - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodGet, "/"), - ), - ) - - connection = NewConnection(Config{}) - }) - - // loopback.cli.ci.cf-app.com is a custom DNS record setup to point to 127.0.0.1 - It("returns a SSLValidationHostnameError", func() { - altHostURL := strings.Replace(server.URL(), "127.0.0.1", "loopback.cli.ci.cf-app.com", -1) - req, err := http.NewRequest(http.MethodGet, altHostURL, nil) - Expect(err).ToNot(HaveOccurred()) - request := &Request{Request: req} - - var response Response - err = connection.Make(request, &response) - Expect(err).To(MatchError(networkerror.SSLValidationHostnameError{ - Message: "x509: certificate is valid for example.com, not loopback.cli.ci.cf-app.com", - })) - }) - }) - }) - - Describe("RawHTTPStatusError", func() { - var networkResponse string - BeforeEach(func() { - networkResponse = `{ + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo", ""), + RespondWith(http.StatusOK, response), + ), + ) + + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request = &Request{Request: req} + }) + + Context("when passed a response with a result set", func() { + It("unmarshals the data into a struct", func() { + var body DummyResponse + response := Response{ + Result: &body, + } + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(body.Val1).To(Equal("2.59.0")) + Expect(body.Val2).To(Equal(2)) + }) + + It("keeps numbers unmarshalled to interfaces as interfaces", func() { + var body DummyResponse + response := Response{ + Result: &body, + } + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + Expect(fmt.Sprint(body.Val3)).To(Equal("1111111111111111111")) + }) + }) + + Context("when passed an empty response", func() { + It("skips the unmarshalling step", func() { + var response Response + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + Expect(response.Result).To(BeNil()) + }) + }) + }) + + Describe("HTTP Response", func() { + var request *Request + + BeforeEach(func() { + response := `{}` + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo", ""), + RespondWith(http.StatusOK, response), + ), + ) + + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request = &Request{Request: req} + }) + + It("returns the status", func() { + response := Response{} + + err := connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(response.HTTPResponse.Status).To(Equal("200 OK")) + }) + }) + + Describe("Response Headers", func() { + Describe("Location", func() { + BeforeEach(func() { + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + RespondWith(http.StatusAccepted, "{}", http.Header{"Location": {"/v2/some-location"}}), + ), + ) + }) + + It("returns the location in the ResourceLocationURL", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).NotTo(HaveOccurred()) + + Expect(server.ReceivedRequests()).To(HaveLen(1)) + Expect(response.ResourceLocationURL).To(Equal("/v2/some-location")) + }) + }) + }) + + Describe("Errors", func() { + Context("when the server does not exist", func() { + BeforeEach(func() { + connection = NewConnection(Config{}) + }) + + It("returns a RequestError", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", "http://garbledyguk.com"), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(HaveOccurred()) + + requestErr, ok := err.(networkerror.RequestError) + Expect(ok).To(BeTrue()) + Expect(requestErr.Error()).To(MatchRegexp(".*http://garbledyguk.com/v2/foo.*[nN]o such host")) + }) + }) + + Context("when the server does not have a verified certificate", func() { + Context("skipSSLValidation is false", func() { + BeforeEach(func() { + if runtime.GOOS == "darwin" { + Skip("ssl verification is different on darwin") + } + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + ), + ) + + connection = NewConnection(Config{}) + }) + + It("returns a UnverifiedServerError", func() { + req, err := http.NewRequest(http.MethodGet, server.URL(), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.UnverifiedServerError{URL: server.URL()})) + }) + }) + }) + + When("the server's certificate does not match the hostname", func() { + Context("skipSSLValidation is false", func() { + BeforeEach(func() { + if runtime.GOOS == "windows" || runtime.GOOS == "darwin" { + Skip("ssl validation has a different order on windows/darwin, will not be returned properly") + } + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/"), + ), + ) + + connection = NewConnection(Config{}) + }) + + // loopback.cli.fun is a custom DNS record setup to point to 127.0.0.1 + It("returns a SSLValidationHostnameError", func() { + altHostURL := strings.Replace(server.URL(), "127.0.0.1", "loopback.cli.fun", -1) + req, err := http.NewRequest(http.MethodGet, altHostURL, nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.SSLValidationHostnameError{ + Message: "x509: certificate is valid for example.com, not loopback.cli.fun", + })) + }) + }) + }) + + Describe("RawHTTPStatusError", func() { + var networkResponse string + BeforeEach(func() { + networkResponse = `{ "code": 90004, "description": "The service binding could not be found: some-guid", "error_code": "CF-ServiceBindingNotFound" }` - server.AppendHandlers( - CombineHandlers( - VerifyRequest(http.MethodGet, "/v2/foo"), - RespondWith(http.StatusNotFound, networkResponse, http.Header{"X-Vcap-Request-Id": {"6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95", "6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95::7445d9db-c31e-410d-8dc5-9f79ec3fc26f"}}), - ), - ) - }) - - It("returns a CCRawResponse", func() { - req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) - Expect(err).ToNot(HaveOccurred()) - request := &Request{Request: req} - - var response Response - err = connection.Make(request, &response) - Expect(err).To(MatchError(networkerror.RawHTTPStatusError{ - StatusCode: http.StatusNotFound, - RawResponse: []byte(networkResponse), - RequestIDs: []string{"6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95", "6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95::7445d9db-c31e-410d-8dc5-9f79ec3fc26f"}, - })) - - Expect(server.ReceivedRequests()).To(HaveLen(1)) - }) - }) - }) - }) + server.AppendHandlers( + CombineHandlers( + VerifyRequest(http.MethodGet, "/v2/foo"), + RespondWith(http.StatusNotFound, networkResponse, http.Header{"X-Vcap-Request-Id": {"6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95", "6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95::7445d9db-c31e-410d-8dc5-9f79ec3fc26f"}}), + ), + ) + }) + + It("returns a CCRawResponse", func() { + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/v2/foo", server.URL()), nil) + Expect(err).ToNot(HaveOccurred()) + request := &Request{Request: req} + + var response Response + err = connection.Make(request, &response) + Expect(err).To(MatchError(networkerror.RawHTTPStatusError{ + StatusCode: http.StatusNotFound, + RawResponse: []byte(networkResponse), + RequestIDs: []string{"6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95", "6e0b4379-f5f7-4b2b-56b0-9ab7e96eed95::7445d9db-c31e-410d-8dc5-9f79ec3fc26f"}, + })) + + Expect(server.ReceivedRequests()).To(HaveLen(1)) + }) + }) + }) + }) }) diff --git a/api/cfnetworking/wrapper/request_logger.go b/api/cfnetworking/wrapper/request_logger.go index fb2d21b7fc..410fcc80ce 100644 --- a/api/cfnetworking/wrapper/request_logger.go +++ b/api/cfnetworking/wrapper/request_logger.go @@ -2,7 +2,7 @@ package wrapper import ( "fmt" - "io/ioutil" + "io" "net/http" "sort" "strings" @@ -93,7 +93,7 @@ func (logger *RequestLogger) displayRequest(request *cfnetworking.Request) error contentType := request.Header.Get("Content-Type") if request.Body != nil { if strings.Contains(contentType, "json") { - rawRequestBody, err := ioutil.ReadAll(request.Body) + rawRequestBody, err := io.ReadAll(request.Body) if err != nil { return err } @@ -131,8 +131,8 @@ func (logger *RequestLogger) displayResponse(passedResponse *cfnetworking.Respon } func (logger *RequestLogger) displaySortedHeaders(headers http.Header) error { - keys := []string{} - for key, _ := range headers { + keys := make([]string, 0) + for key := range headers { keys = append(keys, key) } sort.Strings(keys) diff --git a/api/cfnetworking/wrapper/request_logger_test.go b/api/cfnetworking/wrapper/request_logger_test.go index 5f48ca23c5..aa2a21d48f 100644 --- a/api/cfnetworking/wrapper/request_logger_test.go +++ b/api/cfnetworking/wrapper/request_logger_test.go @@ -1,328 +1,328 @@ package wrapper_test import ( - "bytes" - "errors" - "io/ioutil" - "net/http" - "net/url" - "time" - - "code.cloudfoundry.org/cli/v9/api/cfnetworking" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" - . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/wrapperfakes" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" + "bytes" + "errors" + "io" + "net/http" + "net/url" + "time" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/wrapperfakes" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) var _ = Describe("Request Logger", func() { - var ( - fakeConnection *cfnetworkingfakes.FakeConnection - fakeOutput *wrapperfakes.FakeRequestLoggerOutput - - wrapper cfnetworking.Connection - - request *cfnetworking.Request - response *cfnetworking.Response - executeErr error - ) - - BeforeEach(func() { - fakeConnection = new(cfnetworkingfakes.FakeConnection) - fakeOutput = new(wrapperfakes.FakeRequestLoggerOutput) - - wrapper = NewRequestLogger(fakeOutput).Wrap(fakeConnection) - - body := bytes.NewReader([]byte("foo")) - - req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", body) - Expect(err).NotTo(HaveOccurred()) - - req.URL.RawQuery = url.Values{ - "query1": {"a"}, - "query2": {"b"}, - }.Encode() - - headers := http.Header{} - headers.Add("Aghi", "bar") - headers.Add("Abc", "json") - headers.Add("Adef", "application/json") - req.Header = headers - - response = &cfnetworking.Response{ - RawResponse: []byte("some-response-body"), - HTTPResponse: &http.Response{}, - } - request = cfnetworking.NewRequest(req, body) - }) - - JustBeforeEach(func() { - executeErr = wrapper.Make(request, response) - }) - - Describe("Make", func() { - It("outputs the request", func() { - Expect(executeErr).NotTo(HaveOccurred()) - - Expect(fakeOutput.DisplayTypeCallCount()).To(BeNumerically(">=", 1)) - name, date := fakeOutput.DisplayTypeArgsForCall(0) - Expect(name).To(Equal("REQUEST")) - Expect(date).To(BeTemporally("~", time.Now(), time.Second)) - - Expect(fakeOutput.DisplayRequestHeaderCallCount()).To(Equal(1)) - method, uri, protocol := fakeOutput.DisplayRequestHeaderArgsForCall(0) - Expect(method).To(Equal(http.MethodGet)) - Expect(uri).To(MatchRegexp("/banana\\?(?:query1=a&query2=b|query2=b&query1=a)")) - Expect(protocol).To(Equal("HTTP/1.1")) - - Expect(fakeOutput.DisplayHostCallCount()).To(Equal(1)) - host := fakeOutput.DisplayHostArgsForCall(0) - Expect(host).To(Equal("foo.bar.com")) - - Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 3)) - name, value := fakeOutput.DisplayHeaderArgsForCall(0) - Expect(name).To(Equal("Abc")) - Expect(value).To(Equal("json")) - name, value = fakeOutput.DisplayHeaderArgsForCall(1) - Expect(name).To(Equal("Adef")) - Expect(value).To(Equal("application/json")) - name, value = fakeOutput.DisplayHeaderArgsForCall(2) - Expect(name).To(Equal("Aghi")) - Expect(value).To(Equal("bar")) - - Expect(fakeOutput.DisplayMessageCallCount()).To(Equal(0)) - }) - - Context("when an authorization header is in the request", func() { - BeforeEach(func() { - request.Header = http.Header{"Authorization": []string{"should not be shown"}} - }) - - It("redacts the contents of the authorization header", func() { - Expect(executeErr).NotTo(HaveOccurred()) - Expect(fakeOutput.DisplayHeaderCallCount()).To(Equal(1)) - key, value := fakeOutput.DisplayHeaderArgsForCall(0) - Expect(key).To(Equal("Authorization")) - Expect(value).To(Equal("[PRIVATE DATA HIDDEN]")) - }) - }) - - Context("when passed a body", func() { - Context("when the request's Content-Type is application/json", func() { - BeforeEach(func() { - request.Header.Set("Content-Type", "application/json") - }) - - It("outputs the body", func() { - Expect(executeErr).NotTo(HaveOccurred()) - - Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) - Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("foo"))) - - bytes, err := ioutil.ReadAll(request.Body) - Expect(err).NotTo(HaveOccurred()) - Expect(bytes).To(Equal([]byte("foo"))) - }) - }) - - Context("when request's Content-Type is anything else", func() { - BeforeEach(func() { - request.Header.Set("Content-Type", "banana;rama") - }) - - It("does not display the body", func() { - Expect(fakeOutput.DisplayJSONBodyCallCount()).To(Equal(1)) // Once for response body only - Expect(fakeOutput.DisplayMessageCallCount()).To(Equal(1)) - Expect(fakeOutput.DisplayMessageArgsForCall(0)).To(Equal("[banana Content Hidden]")) - }) - }) - }) - - Context("when an error occures while trying to log the request", func() { - var expectedErr error - - BeforeEach(func() { - expectedErr = errors.New("this should never block the request") - - calledOnce := false - fakeOutput.StartStub = func() error { - if !calledOnce { - calledOnce = true - return expectedErr - } - return nil - } - }) - - It("should display the error and continue on", func() { - Expect(executeErr).NotTo(HaveOccurred()) - - Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(1)) - Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) - }) - }) - - Context("when the request is successful", func() { - BeforeEach(func() { - response = &cfnetworking.Response{ - RawResponse: []byte("some-response-body"), - HTTPResponse: &http.Response{ - Proto: "HTTP/1.1", - Status: "200 OK", - Header: http.Header{ - "BBBBB": {"second"}, - "AAAAA": {"first"}, - "CCCCC": {"third"}, - }, - }, - } - }) - - It("outputs the response", func() { - Expect(executeErr).NotTo(HaveOccurred()) - - Expect(fakeOutput.DisplayTypeCallCount()).To(Equal(2)) - name, date := fakeOutput.DisplayTypeArgsForCall(1) - Expect(name).To(Equal("RESPONSE")) - Expect(date).To(BeTemporally("~", time.Now(), time.Second)) - - Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(1)) - protocol, status := fakeOutput.DisplayResponseHeaderArgsForCall(0) - Expect(protocol).To(Equal("HTTP/1.1")) - Expect(status).To(Equal("200 OK")) - - Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 6)) - name, value := fakeOutput.DisplayHeaderArgsForCall(3) - Expect(name).To(Equal("AAAAA")) - Expect(value).To(Equal("first")) - name, value = fakeOutput.DisplayHeaderArgsForCall(4) - Expect(name).To(Equal("BBBBB")) - Expect(value).To(Equal("second")) - name, value = fakeOutput.DisplayHeaderArgsForCall(5) - Expect(name).To(Equal("CCCCC")) - Expect(value).To(Equal("third")) - - Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) - Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("some-response-body"))) - }) - }) - - Context("when the request is unsuccessful", func() { - var expectedErr error - - BeforeEach(func() { - expectedErr = errors.New("banana") - fakeConnection.MakeReturns(expectedErr) - }) - - Context("when the http response is not set", func() { - BeforeEach(func() { - response = &cfnetworking.Response{} - }) - - It("outputs nothing", func() { - Expect(executeErr).To(MatchError(expectedErr)) - Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(0)) - }) - }) - - Context("when the http response is set", func() { - BeforeEach(func() { - response = &cfnetworking.Response{ - RawResponse: []byte("some-error-body"), - HTTPResponse: &http.Response{ - Proto: "HTTP/1.1", - Status: "200 OK", - Header: http.Header{ - "BBBBB": {"second"}, - "AAAAA": {"first"}, - "CCCCC": {"third"}, - }, - }, - } - }) - - It("outputs the response", func() { - Expect(executeErr).To(MatchError(expectedErr)) - - Expect(fakeOutput.DisplayTypeCallCount()).To(Equal(2)) - name, date := fakeOutput.DisplayTypeArgsForCall(1) - Expect(name).To(Equal("RESPONSE")) - Expect(date).To(BeTemporally("~", time.Now(), time.Second)) - - Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(1)) - protocol, status := fakeOutput.DisplayResponseHeaderArgsForCall(0) - Expect(protocol).To(Equal("HTTP/1.1")) - Expect(status).To(Equal("200 OK")) - - Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 6)) - name, value := fakeOutput.DisplayHeaderArgsForCall(3) - Expect(name).To(Equal("AAAAA")) - Expect(value).To(Equal("first")) - name, value = fakeOutput.DisplayHeaderArgsForCall(4) - Expect(name).To(Equal("BBBBB")) - Expect(value).To(Equal("second")) - name, value = fakeOutput.DisplayHeaderArgsForCall(5) - Expect(name).To(Equal("CCCCC")) - Expect(value).To(Equal("third")) - - Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) - Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("some-error-body"))) - }) - }) - }) - - Context("when an error occures while trying to log the response", func() { - var ( - originalErr error - expectedErr error - ) - - BeforeEach(func() { - originalErr = errors.New("this error should not be overwritten") - fakeConnection.MakeReturns(originalErr) - - expectedErr = errors.New("this should never block the request") - - calledOnce := false - fakeOutput.StartStub = func() error { - if !calledOnce { - calledOnce = true - return nil - } - return expectedErr - } - }) - - It("should display the error and continue on", func() { - Expect(executeErr).To(MatchError(originalErr)) - - Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(1)) - Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) - }) - }) - - It("starts and stops the output", func() { - Expect(fakeOutput.StartCallCount()).To(Equal(2)) - Expect(fakeOutput.StopCallCount()).To(Equal(2)) - }) - - Context("when displaying the logs have an error", func() { - var expectedErr error - BeforeEach(func() { - expectedErr = errors.New("Display error on request") - fakeOutput.StartReturns(expectedErr) - }) - - It("calls handle internal error", func() { - Expect(executeErr).ToNot(HaveOccurred()) - - Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(2)) - Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) - Expect(fakeOutput.HandleInternalErrorArgsForCall(1)).To(MatchError(expectedErr)) - }) - }) - }) + var ( + fakeConnection *cfnetworkingfakes.FakeConnection + fakeOutput *wrapperfakes.FakeRequestLoggerOutput + + wrapper cfnetworking.Connection + + request *cfnetworking.Request + response *cfnetworking.Response + executeErr error + ) + + BeforeEach(func() { + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeOutput = new(wrapperfakes.FakeRequestLoggerOutput) + + wrapper = NewRequestLogger(fakeOutput).Wrap(fakeConnection) + + body := bytes.NewReader([]byte("foo")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", body) + Expect(err).NotTo(HaveOccurred()) + + req.URL.RawQuery = url.Values{ + "query1": {"a"}, + "query2": {"b"}, + }.Encode() + + headers := http.Header{} + headers.Add("Aghi", "bar") + headers.Add("Abc", "json") + headers.Add("Adef", "application/json") + req.Header = headers + + response = &cfnetworking.Response{ + RawResponse: []byte("some-response-body"), + HTTPResponse: &http.Response{}, + } + request = cfnetworking.NewRequest(req, body) + }) + + JustBeforeEach(func() { + executeErr = wrapper.Make(request, response) + }) + + Describe("Make", func() { + It("outputs the request", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayTypeCallCount()).To(BeNumerically(">=", 1)) + name, date := fakeOutput.DisplayTypeArgsForCall(0) + Expect(name).To(Equal("REQUEST")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayRequestHeaderCallCount()).To(Equal(1)) + method, uri, protocol := fakeOutput.DisplayRequestHeaderArgsForCall(0) + Expect(method).To(Equal(http.MethodGet)) + Expect(uri).To(MatchRegexp("/banana\\?(?:query1=a&query2=b|query2=b&query1=a)")) + Expect(protocol).To(Equal("HTTP/1.1")) + + Expect(fakeOutput.DisplayHostCallCount()).To(Equal(1)) + host := fakeOutput.DisplayHostArgsForCall(0) + Expect(host).To(Equal("foo.bar.com")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 3)) + name, value := fakeOutput.DisplayHeaderArgsForCall(0) + Expect(name).To(Equal("Abc")) + Expect(value).To(Equal("json")) + name, value = fakeOutput.DisplayHeaderArgsForCall(1) + Expect(name).To(Equal("Adef")) + Expect(value).To(Equal("application/json")) + name, value = fakeOutput.DisplayHeaderArgsForCall(2) + Expect(name).To(Equal("Aghi")) + Expect(value).To(Equal("bar")) + + Expect(fakeOutput.DisplayMessageCallCount()).To(Equal(0)) + }) + + Context("when an authorization header is in the request", func() { + BeforeEach(func() { + request.Header = http.Header{"Authorization": []string{"should not be shown"}} + }) + + It("redacts the contents of the authorization header", func() { + Expect(executeErr).NotTo(HaveOccurred()) + Expect(fakeOutput.DisplayHeaderCallCount()).To(Equal(1)) + key, value := fakeOutput.DisplayHeaderArgsForCall(0) + Expect(key).To(Equal("Authorization")) + Expect(value).To(Equal("[PRIVATE DATA HIDDEN]")) + }) + }) + + Context("when passed a body", func() { + Context("when the request's Content-Type is application/json", func() { + BeforeEach(func() { + request.Header.Set("Content-Type", "application/json") + }) + + It("outputs the body", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("foo"))) + + bytes, err := io.ReadAll(request.Body) + Expect(err).NotTo(HaveOccurred()) + Expect(bytes).To(Equal([]byte("foo"))) + }) + }) + + Context("when request's Content-Type is anything else", func() { + BeforeEach(func() { + request.Header.Set("Content-Type", "banana;rama") + }) + + It("does not display the body", func() { + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(Equal(1)) // Once for response body only + Expect(fakeOutput.DisplayMessageCallCount()).To(Equal(1)) + Expect(fakeOutput.DisplayMessageArgsForCall(0)).To(Equal("[banana Content Hidden]")) + }) + }) + }) + + Context("when an error occures while trying to log the request", func() { + var expectedErr error + + BeforeEach(func() { + expectedErr = errors.New("this should never block the request") + + calledOnce := false + fakeOutput.StartStub = func() error { + if !calledOnce { + calledOnce = true + return expectedErr + } + return nil + } + }) + + It("should display the error and continue on", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(1)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + }) + }) + + Context("when the request is successful", func() { + BeforeEach(func() { + response = &cfnetworking.Response{ + RawResponse: []byte("some-response-body"), + HTTPResponse: &http.Response{ + Proto: "HTTP/1.1", + Status: "200 OK", + Header: http.Header{ + "BBBBB": {"second"}, + "AAAAA": {"first"}, + "CCCCC": {"third"}, + }, + }, + } + }) + + It("outputs the response", func() { + Expect(executeErr).NotTo(HaveOccurred()) + + Expect(fakeOutput.DisplayTypeCallCount()).To(Equal(2)) + name, date := fakeOutput.DisplayTypeArgsForCall(1) + Expect(name).To(Equal("RESPONSE")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(1)) + protocol, status := fakeOutput.DisplayResponseHeaderArgsForCall(0) + Expect(protocol).To(Equal("HTTP/1.1")) + Expect(status).To(Equal("200 OK")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 6)) + name, value := fakeOutput.DisplayHeaderArgsForCall(3) + Expect(name).To(Equal("AAAAA")) + Expect(value).To(Equal("first")) + name, value = fakeOutput.DisplayHeaderArgsForCall(4) + Expect(name).To(Equal("BBBBB")) + Expect(value).To(Equal("second")) + name, value = fakeOutput.DisplayHeaderArgsForCall(5) + Expect(name).To(Equal("CCCCC")) + Expect(value).To(Equal("third")) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("some-response-body"))) + }) + }) + + Context("when the request is unsuccessful", func() { + var expectedErr error + + BeforeEach(func() { + expectedErr = errors.New("banana") + fakeConnection.MakeReturns(expectedErr) + }) + + Context("when the http response is not set", func() { + BeforeEach(func() { + response = &cfnetworking.Response{} + }) + + It("outputs nothing", func() { + Expect(executeErr).To(MatchError(expectedErr)) + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(0)) + }) + }) + + Context("when the http response is set", func() { + BeforeEach(func() { + response = &cfnetworking.Response{ + RawResponse: []byte("some-error-body"), + HTTPResponse: &http.Response{ + Proto: "HTTP/1.1", + Status: "200 OK", + Header: http.Header{ + "BBBBB": {"second"}, + "AAAAA": {"first"}, + "CCCCC": {"third"}, + }, + }, + } + }) + + It("outputs the response", func() { + Expect(executeErr).To(MatchError(expectedErr)) + + Expect(fakeOutput.DisplayTypeCallCount()).To(Equal(2)) + name, date := fakeOutput.DisplayTypeArgsForCall(1) + Expect(name).To(Equal("RESPONSE")) + Expect(date).To(BeTemporally("~", time.Now(), time.Second)) + + Expect(fakeOutput.DisplayResponseHeaderCallCount()).To(Equal(1)) + protocol, status := fakeOutput.DisplayResponseHeaderArgsForCall(0) + Expect(protocol).To(Equal("HTTP/1.1")) + Expect(status).To(Equal("200 OK")) + + Expect(fakeOutput.DisplayHeaderCallCount()).To(BeNumerically(">=", 6)) + name, value := fakeOutput.DisplayHeaderArgsForCall(3) + Expect(name).To(Equal("AAAAA")) + Expect(value).To(Equal("first")) + name, value = fakeOutput.DisplayHeaderArgsForCall(4) + Expect(name).To(Equal("BBBBB")) + Expect(value).To(Equal("second")) + name, value = fakeOutput.DisplayHeaderArgsForCall(5) + Expect(name).To(Equal("CCCCC")) + Expect(value).To(Equal("third")) + + Expect(fakeOutput.DisplayJSONBodyCallCount()).To(BeNumerically(">=", 1)) + Expect(fakeOutput.DisplayJSONBodyArgsForCall(0)).To(Equal([]byte("some-error-body"))) + }) + }) + }) + + Context("when an error occures while trying to log the response", func() { + var ( + originalErr error + expectedErr error + ) + + BeforeEach(func() { + originalErr = errors.New("this error should not be overwritten") + fakeConnection.MakeReturns(originalErr) + + expectedErr = errors.New("this should never block the request") + + calledOnce := false + fakeOutput.StartStub = func() error { + if !calledOnce { + calledOnce = true + return nil + } + return expectedErr + } + }) + + It("should display the error and continue on", func() { + Expect(executeErr).To(MatchError(originalErr)) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(1)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + }) + }) + + It("starts and stops the output", func() { + Expect(fakeOutput.StartCallCount()).To(Equal(2)) + Expect(fakeOutput.StopCallCount()).To(Equal(2)) + }) + + Context("when displaying the logs have an error", func() { + var expectedErr error + BeforeEach(func() { + expectedErr = errors.New("Display error on request") + fakeOutput.StartReturns(expectedErr) + }) + + It("calls handle internal error", func() { + Expect(executeErr).ToNot(HaveOccurred()) + + Expect(fakeOutput.HandleInternalErrorCallCount()).To(Equal(2)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(0)).To(MatchError(expectedErr)) + Expect(fakeOutput.HandleInternalErrorArgsForCall(1)).To(MatchError(expectedErr)) + }) + }) + }) }) diff --git a/api/cfnetworking/wrapper/retry_request_test.go b/api/cfnetworking/wrapper/retry_request_test.go index 014b3d08c6..b98b833c3c 100644 --- a/api/cfnetworking/wrapper/retry_request_test.go +++ b/api/cfnetworking/wrapper/retry_request_test.go @@ -1,111 +1,110 @@ package wrapper_test import ( - "errors" - "io/ioutil" - "net/http" - "strings" - - "code.cloudfoundry.org/cli/v9/api/cfnetworking" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" - . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" - . "github.com/onsi/gomega" + "errors" + "io" + "net/http" + "strings" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) var _ = Describe("Retry Request", func() { - DescribeTable("number of retries", - func(requestMethod string, responseStatusCode int, expectedNumberOfRetries int) { - rawRequestBody := "banana pants" - body := strings.NewReader(rawRequestBody) - - req, err := http.NewRequest(requestMethod, "https://foo.bar.com/banana", body) - Expect(err).NotTo(HaveOccurred()) - request := cfnetworking.NewRequest(req, body) - - response := &cfnetworking.Response{ - HTTPResponse: &http.Response{ - StatusCode: responseStatusCode, - }, - } - - fakeConnection := new(cfnetworkingfakes.FakeConnection) - expectedErr := networkerror.RawHTTPStatusError{ - StatusCode: responseStatusCode, - } - fakeConnection.MakeStub = func(req *cfnetworking.Request, passedResponse *cfnetworking.Response) error { - defer req.Body.Close() - body, readBodyErr := ioutil.ReadAll(request.Body) - Expect(readBodyErr).ToNot(HaveOccurred()) - Expect(string(body)).To(Equal(rawRequestBody)) - return expectedErr - } - - wrapper := NewRetryRequest(2).Wrap(fakeConnection) - err = wrapper.Make(request, response) - Expect(err).To(MatchError(expectedErr)) - Expect(fakeConnection.MakeCallCount()).To(Equal(expectedNumberOfRetries)) - }, - - Entry("maxRetries for Non-Post (500) Internal Server Error", http.MethodGet, http.StatusInternalServerError, 3), - Entry("1 for Post (502) Bad Gateway", http.MethodGet, http.StatusBadGateway, 1), - Entry("1 for Post (503) Service Unavailable", http.MethodGet, http.StatusServiceUnavailable, 1), - Entry("1 for Post (504) Gateway Timeout", http.MethodGet, http.StatusGatewayTimeout, 1), - - Entry("1 for 4XX Errors", http.MethodGet, http.StatusNotFound, 1), - ) - - It("does not retry on success", func() { - req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", nil) - Expect(err).NotTo(HaveOccurred()) - request := cfnetworking.NewRequest(req, nil) - response := &cfnetworking.Response{ - HTTPResponse: &http.Response{ - StatusCode: http.StatusOK, - }, - } - - fakeConnection := new(cfnetworkingfakes.FakeConnection) - wrapper := NewRetryRequest(2).Wrap(fakeConnection) - - err = wrapper.Make(request, response) - Expect(err).ToNot(HaveOccurred()) - Expect(fakeConnection.MakeCallCount()).To(Equal(1)) - }) - - Context("when seeking errors", func() { - var ( - request *cfnetworking.Request - response *cfnetworking.Response - - fakeConnection *cfnetworkingfakes.FakeConnection - wrapper cfnetworking.Connection - ) - - BeforeEach(func() { - fakeReadSeeker := new(cfnetworkingfakes.FakeReadSeeker) - fakeReadSeeker.SeekReturns(0, errors.New("oh noes")) - - req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", fakeReadSeeker) - Expect(err).NotTo(HaveOccurred()) - request = cfnetworking.NewRequest(req, fakeReadSeeker) - - response = &cfnetworking.Response{ - HTTPResponse: &http.Response{ - StatusCode: http.StatusInternalServerError, - }, - } - fakeConnection = new(cfnetworkingfakes.FakeConnection) - fakeConnection.MakeReturns(errors.New("some error")) - wrapper = NewRetryRequest(3).Wrap(fakeConnection) - }) - - It("sets the err on SeekError", func() { - err := wrapper.Make(request, response) - Expect(err).To(MatchError("oh noes")) - Expect(fakeConnection.MakeCallCount()).To(Equal(1)) - }) - }) + DescribeTable("number of retries", + func(requestMethod string, responseStatusCode int, expectedNumberOfRetries int) { + rawRequestBody := "banana pants" + body := strings.NewReader(rawRequestBody) + + req, err := http.NewRequest(requestMethod, "https://foo.bar.com/banana", body) + Expect(err).NotTo(HaveOccurred()) + request := cfnetworking.NewRequest(req, body) + + response := &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: responseStatusCode, + }, + } + + fakeConnection := new(cfnetworkingfakes.FakeConnection) + expectedErr := networkerror.RawHTTPStatusError{ + StatusCode: responseStatusCode, + } + fakeConnection.MakeStub = func(req *cfnetworking.Request, passedResponse *cfnetworking.Response) error { + defer req.Body.Close() + body, readBodyErr := io.ReadAll(request.Body) + Expect(readBodyErr).ToNot(HaveOccurred()) + Expect(string(body)).To(Equal(rawRequestBody)) + return expectedErr + } + + wrapper := NewRetryRequest(2).Wrap(fakeConnection) + err = wrapper.Make(request, response) + Expect(err).To(MatchError(expectedErr)) + Expect(fakeConnection.MakeCallCount()).To(Equal(expectedNumberOfRetries)) + }, + + Entry("maxRetries for Non-Post (500) Internal Server Error", http.MethodGet, http.StatusInternalServerError, 3), + Entry("1 for Post (502) Bad Gateway", http.MethodGet, http.StatusBadGateway, 1), + Entry("1 for Post (503) Service Unavailable", http.MethodGet, http.StatusServiceUnavailable, 1), + Entry("1 for Post (504) Gateway Timeout", http.MethodGet, http.StatusGatewayTimeout, 1), + + Entry("1 for 4XX Errors", http.MethodGet, http.StatusNotFound, 1), + ) + + It("does not retry on success", func() { + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", nil) + Expect(err).NotTo(HaveOccurred()) + request := cfnetworking.NewRequest(req, nil) + response := &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: http.StatusOK, + }, + } + + fakeConnection := new(cfnetworkingfakes.FakeConnection) + wrapper := NewRetryRequest(2).Wrap(fakeConnection) + + err = wrapper.Make(request, response) + Expect(err).ToNot(HaveOccurred()) + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + }) + + Context("when seeking errors", func() { + var ( + request *cfnetworking.Request + response *cfnetworking.Response + + fakeConnection *cfnetworkingfakes.FakeConnection + wrapper cfnetworking.Connection + ) + + BeforeEach(func() { + fakeReadSeeker := new(cfnetworkingfakes.FakeReadSeeker) + fakeReadSeeker.SeekReturns(0, errors.New("oh noes")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", fakeReadSeeker) + Expect(err).NotTo(HaveOccurred()) + request = cfnetworking.NewRequest(req, fakeReadSeeker) + + response = &cfnetworking.Response{ + HTTPResponse: &http.Response{ + StatusCode: http.StatusInternalServerError, + }, + } + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeConnection.MakeReturns(errors.New("some error")) + wrapper = NewRetryRequest(3).Wrap(fakeConnection) + }) + + It("sets the err on SeekError", func() { + err := wrapper.Make(request, response) + Expect(err).To(MatchError("oh noes")) + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + }) + }) }) diff --git a/api/cfnetworking/wrapper/uaa_authentication_test.go b/api/cfnetworking/wrapper/uaa_authentication_test.go index b7713a225e..fc26022c7d 100644 --- a/api/cfnetworking/wrapper/uaa_authentication_test.go +++ b/api/cfnetworking/wrapper/uaa_authentication_test.go @@ -1,174 +1,174 @@ package wrapper_test import ( - "errors" - "io/ioutil" - "net/http" - "strings" - - "code.cloudfoundry.org/cli/v9/api/cfnetworking" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" - . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/util" - "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/wrapperfakes" - "code.cloudfoundry.org/cli/v9/api/uaa" - - "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" + "errors" + "io" + "net/http" + "strings" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/cfnetworkingfakes" + . "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/util" + "code.cloudfoundry.org/cli/v9/api/cfnetworking/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v9/api/uaa" + + "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) var _ = Describe("UAA Authentication", func() { - var ( - fakeConnection *cfnetworkingfakes.FakeConnection - fakeClient *wrapperfakes.FakeUAAClient - inMemoryCache *util.InMemoryCache - - wrapper cfnetworking.Connection - request *cfnetworking.Request - inner *UAAAuthentication - ) - - BeforeEach(func() { - fakeConnection = new(cfnetworkingfakes.FakeConnection) - fakeClient = new(wrapperfakes.FakeUAAClient) - inMemoryCache = util.NewInMemoryTokenCache() - inMemoryCache.SetAccessToken("a-ok") - - inner = NewUAAAuthentication(fakeClient, inMemoryCache) - wrapper = inner.Wrap(fakeConnection) - - request = &cfnetworking.Request{ - Request: &http.Request{ - Header: http.Header{}, - }, - } - }) - - Describe("Make", func() { - It("adds authentication headers", func() { - err := wrapper.Make(request, nil) - Expect(err).ToNot(HaveOccurred()) - - Expect(fakeConnection.MakeCallCount()).To(Equal(1)) - authenticatedRequest, _ := fakeConnection.MakeArgsForCall(0) - headers := authenticatedRequest.Header - Expect(headers["Authorization"]).To(ConsistOf([]string{"a-ok"})) - }) - - Context("when the token is valid", func() { - Context("when the request already has headers", func() { - It("preserves existing headers", func() { - request.Header.Add("Existing", "header") - err := wrapper.Make(request, nil) - Expect(err).ToNot(HaveOccurred()) - - Expect(fakeConnection.MakeCallCount()).To(Equal(1)) - authenticatedRequest, _ := fakeConnection.MakeArgsForCall(0) - headers := authenticatedRequest.Header - Expect(headers["Existing"]).To(ConsistOf([]string{"header"})) - }) - }) - - Context("when the wrapped connection returns nil", func() { - It("returns nil", func() { - fakeConnection.MakeReturns(nil) - - err := wrapper.Make(request, nil) - Expect(err).ToNot(HaveOccurred()) - }) - }) - - Context("when the wrapped connection returns an error", func() { - It("returns the error", func() { - innerError := errors.New("inner error") - fakeConnection.MakeReturns(innerError) - - err := wrapper.Make(request, nil) - Expect(err).To(Equal(innerError)) - }) - }) - }) - - Context("when the token is invalid", func() { - var ( - expectedBody string - request *cfnetworking.Request - executeErr error - ) - - BeforeEach(func() { - expectedBody = "this body content should be preserved" - body := strings.NewReader(expectedBody) - request = cfnetworking.NewRequest(&http.Request{ - Header: http.Header{}, - Body: ioutil.NopCloser(body), - }, body) - - makeCount := 0 - fakeConnection.MakeStub = func(request *cfnetworking.Request, response *cfnetworking.Response) error { - body, err := ioutil.ReadAll(request.Body) - Expect(err).NotTo(HaveOccurred()) - Expect(string(body)).To(Equal(expectedBody)) - - if makeCount == 0 { - makeCount += 1 - return networkerror.InvalidAuthTokenError{} - } else { - return nil - } - } - - inMemoryCache.SetAccessToken("what") - - fakeClient.RefreshAccessTokenReturns( - uaa.RefreshedTokens{ - AccessToken: "foobar-2", - RefreshToken: "bananananananana", - Type: "bearer", - }, - nil, - ) - }) - - JustBeforeEach(func() { - executeErr = wrapper.Make(request, nil) - }) - - It("should refresh the token", func() { - Expect(executeErr).ToNot(HaveOccurred()) - Expect(fakeClient.RefreshAccessTokenCallCount()).To(Equal(1)) - }) - - It("should resend the request", func() { - Expect(executeErr).ToNot(HaveOccurred()) - Expect(fakeConnection.MakeCallCount()).To(Equal(2)) - - requestArg, _ := fakeConnection.MakeArgsForCall(1) - Expect(requestArg.Header.Get("Authorization")).To(Equal("bearer foobar-2")) - }) - - It("should save the refresh token", func() { - Expect(executeErr).ToNot(HaveOccurred()) - Expect(inMemoryCache.RefreshToken()).To(Equal("bananananananana")) - }) - - Context("when the reseting the request body fails", func() { - BeforeEach(func() { - fakeConnection.MakeReturnsOnCall(0, networkerror.InvalidAuthTokenError{}) - - fakeReadSeeker := new(cfnetworkingfakes.FakeReadSeeker) - fakeReadSeeker.SeekReturns(0, errors.New("oh noes")) - - req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", fakeReadSeeker) - Expect(err).NotTo(HaveOccurred()) - request = cfnetworking.NewRequest(req, fakeReadSeeker) - }) - - It("returns error on seek", func() { - Expect(executeErr).To(MatchError("oh noes")) - }) - }) - }) - }) + var ( + fakeConnection *cfnetworkingfakes.FakeConnection + fakeClient *wrapperfakes.FakeUAAClient + inMemoryCache *util.InMemoryCache + + wrapper cfnetworking.Connection + request *cfnetworking.Request + inner *UAAAuthentication + ) + + BeforeEach(func() { + fakeConnection = new(cfnetworkingfakes.FakeConnection) + fakeClient = new(wrapperfakes.FakeUAAClient) + inMemoryCache = util.NewInMemoryTokenCache() + inMemoryCache.SetAccessToken("a-ok") + + inner = NewUAAAuthentication(fakeClient, inMemoryCache) + wrapper = inner.Wrap(fakeConnection) + + request = &cfnetworking.Request{ + Request: &http.Request{ + Header: http.Header{}, + }, + } + }) + + Describe("Make", func() { + It("adds authentication headers", func() { + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + authenticatedRequest, _ := fakeConnection.MakeArgsForCall(0) + headers := authenticatedRequest.Header + Expect(headers["Authorization"]).To(ConsistOf([]string{"a-ok"})) + }) + + Context("when the token is valid", func() { + Context("when the request already has headers", func() { + It("preserves existing headers", func() { + request.Header.Add("Existing", "header") + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + + Expect(fakeConnection.MakeCallCount()).To(Equal(1)) + authenticatedRequest, _ := fakeConnection.MakeArgsForCall(0) + headers := authenticatedRequest.Header + Expect(headers["Existing"]).To(ConsistOf([]string{"header"})) + }) + }) + + Context("when the wrapped connection returns nil", func() { + It("returns nil", func() { + fakeConnection.MakeReturns(nil) + + err := wrapper.Make(request, nil) + Expect(err).ToNot(HaveOccurred()) + }) + }) + + Context("when the wrapped connection returns an error", func() { + It("returns the error", func() { + innerError := errors.New("inner error") + fakeConnection.MakeReturns(innerError) + + err := wrapper.Make(request, nil) + Expect(err).To(Equal(innerError)) + }) + }) + }) + + Context("when the token is invalid", func() { + var ( + expectedBody string + request *cfnetworking.Request + executeErr error + ) + + BeforeEach(func() { + expectedBody = "this body content should be preserved" + body := strings.NewReader(expectedBody) + request = cfnetworking.NewRequest(&http.Request{ + Header: http.Header{}, + Body: io.NopCloser(body), + }, body) + + makeCount := 0 + fakeConnection.MakeStub = func(request *cfnetworking.Request, response *cfnetworking.Response) error { + body, err := io.ReadAll(request.Body) + Expect(err).NotTo(HaveOccurred()) + Expect(string(body)).To(Equal(expectedBody)) + + if makeCount == 0 { + makeCount += 1 + return networkerror.InvalidAuthTokenError{} + } else { + return nil + } + } + + inMemoryCache.SetAccessToken("what") + + fakeClient.RefreshAccessTokenReturns( + uaa.RefreshedTokens{ + AccessToken: "foobar-2", + RefreshToken: "bananananananana", + Type: "bearer", + }, + nil, + ) + }) + + JustBeforeEach(func() { + executeErr = wrapper.Make(request, nil) + }) + + It("should refresh the token", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(fakeClient.RefreshAccessTokenCallCount()).To(Equal(1)) + }) + + It("should resend the request", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(fakeConnection.MakeCallCount()).To(Equal(2)) + + requestArg, _ := fakeConnection.MakeArgsForCall(1) + Expect(requestArg.Header.Get("Authorization")).To(Equal("bearer foobar-2")) + }) + + It("should save the refresh token", func() { + Expect(executeErr).ToNot(HaveOccurred()) + Expect(inMemoryCache.RefreshToken()).To(Equal("bananananananana")) + }) + + Context("when the reseting the request body fails", func() { + BeforeEach(func() { + fakeConnection.MakeReturnsOnCall(0, networkerror.InvalidAuthTokenError{}) + + fakeReadSeeker := new(cfnetworkingfakes.FakeReadSeeker) + fakeReadSeeker.SeekReturns(0, errors.New("oh noes")) + + req, err := http.NewRequest(http.MethodGet, "https://foo.bar.com/banana", fakeReadSeeker) + Expect(err).NotTo(HaveOccurred()) + request = cfnetworking.NewRequest(req, fakeReadSeeker) + }) + + It("returns error on seek", func() { + Expect(executeErr).To(MatchError("oh noes")) + }) + }) + }) + }) }) diff --git a/api/cfnetworking/wrapper/util/in_memory_cache.go b/api/cfnetworking/wrapper/util/in_memory_cache.go index 91ef7af265..7e1f291fef 100644 --- a/api/cfnetworking/wrapper/util/in_memory_cache.go +++ b/api/cfnetworking/wrapper/util/in_memory_cache.go @@ -5,11 +5,11 @@ type InMemoryCache struct { refreshToken string } -func (c InMemoryCache) AccessToken() string { +func (c *InMemoryCache) AccessToken() string { return c.accessToken } -func (c InMemoryCache) RefreshToken() string { +func (c *InMemoryCache) RefreshToken() string { return c.refreshToken } diff --git a/api/cfnetworking/wrapper/wrapper_suite_test.go b/api/cfnetworking/wrapper/wrapper_suite_test.go index a56eec41d0..36bb7436be 100644 --- a/api/cfnetworking/wrapper/wrapper_suite_test.go +++ b/api/cfnetworking/wrapper/wrapper_suite_test.go @@ -3,12 +3,11 @@ package wrapper_test import ( "bytes" "log" + "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" - - "testing" ) func TestWrapper(t *testing.T) { From 56a9737b6ca3509a3aa9133af12136431b4a2e19 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:52:21 +0100 Subject: [PATCH 11/19] fix max-inflight restage command test --- .../v7/isolated/restage_command_test.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/integration/v7/isolated/restage_command_test.go b/integration/v7/isolated/restage_command_test.go index 03bbf59438..34f42b6124 100644 --- a/integration/v7/isolated/restage_command_test.go +++ b/integration/v7/isolated/restage_command_test.go @@ -146,7 +146,7 @@ var _ = Describe("restage command", func() { userName, _ := helpers.GetCredentials() session := helpers.CustomCF(helpers.CFEnv{ EnvVars: map[string]string{"CF_STARTUP_TIMEOUT": "0.1"}, - }, "restage", appName, "--strategy", "rolling", "--max-in-flight", "3") + }, "restage", appName, "--strategy", "rolling") Consistently(session.Err).ShouldNot(Say(`This action will cause app downtime\.`)) Eventually(session).Should(Say(`Restaging app %s in org %s / space %s as %s\.\.\.`, appName, orgName, spaceName, userName)) Eventually(session).Should(Say(`Creating deployment for app %s\.\.\.`, appName)) @@ -157,6 +157,22 @@ var _ = Describe("restage command", func() { Eventually(session).Should(Exit(1)) }) }) + + When("strategy rolling is given with max-in-flight", func() { + It("fails and displays the deployment failure message", func() { + userName, _ := helpers.GetCredentials() + session := helpers.CustomCF(helpers.CFEnv{ + EnvVars: map[string]string{"CF_STARTUP_TIMEOUT": "0.1"}, + }, "restage", appName, "--strategy", "rolling", "--max-in-flight", "3") + Consistently(session.Err).ShouldNot(Say(`This action will cause app downtime\.`)) + Eventually(session).Should(Say(`Restaging app %s in org %s / space %s as %s\.\.\.`, appName, orgName, spaceName, userName)) + Eventually(session).Should(Say(`Creating deployment for app %s\.\.\.`, appName)) + Eventually(session).Should(Say(`Waiting for app to deploy\.\.\.`)) + Eventually(session.Err).Should(Say(`Cannot cancel a deployment with status: FINALIZED and reason: DEPLOYED`)) + Eventually(session).Should(Say("FAILED")) + Eventually(session).Should(Exit(1)) + }) + }) }) When("the app stages and starts properly", func() { From cb39b7bbc7cde9dbdaf56858017726c1769556ea Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 3 Jan 2025 19:21:40 +0100 Subject: [PATCH 12/19] better error handling for cfnetworking --- api/cfnetworking/networking_connection.go | 14 +++++++------- api/cfnetworking/networking_connection_test.go | 10 ++++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/api/cfnetworking/networking_connection.go b/api/cfnetworking/networking_connection.go index 2fc0ceacd2..79dad04ae5 100644 --- a/api/cfnetworking/networking_connection.go +++ b/api/cfnetworking/networking_connection.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "crypto/x509" "encoding/json" + "errors" "io" "net" "net/http" @@ -62,20 +63,19 @@ func (connection *NetworkingConnection) Make(request *Request, passedResponse *R } func (*NetworkingConnection) processRequestErrors(request *http.Request, err error) error { - switch e := err.(type) { + switch err.(type) { case *url.Error: - switch urlErr := e.Err.(type) { - case x509.UnknownAuthorityError: + if errors.Is(err, x509.UnknownAuthorityError{}) { return networkerror.UnverifiedServerError{ URL: request.URL.String(), } - case x509.HostnameError: + } + if errors.Is(err, x509.HostnameError{}) { return networkerror.SSLValidationHostnameError{ - Message: urlErr.Error(), + Message: err.Error(), } - default: - return networkerror.RequestError{Err: e} } + return networkerror.RequestError{Err: err} default: return err } diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go index 9eeb45d250..7c3a841883 100644 --- a/api/cfnetworking/networking_connection_test.go +++ b/api/cfnetworking/networking_connection_test.go @@ -3,6 +3,7 @@ package cfnetworking_test import ( "fmt" "net/http" + "reflect" "runtime" "strings" @@ -48,7 +49,7 @@ var _ = Describe("CF Networking Connection", func() { request = &Request{Request: req} }) - Context("when passed a response with a result set", func() { + When("passed a response with a result set", func() { It("unmarshals the data into a struct", func() { var body DummyResponse response := Response{ @@ -74,7 +75,7 @@ var _ = Describe("CF Networking Connection", func() { }) }) - Context("when passed an empty response", func() { + When("passed an empty response", func() { It("skips the unmarshalling step", func() { var response Response err := connection.Make(request, &response) @@ -138,7 +139,7 @@ var _ = Describe("CF Networking Connection", func() { }) Describe("Errors", func() { - Context("when the server does not exist", func() { + When("the server does not exist", func() { BeforeEach(func() { connection = NewConnection(Config{}) }) @@ -153,12 +154,13 @@ var _ = Describe("CF Networking Connection", func() { Expect(err).To(HaveOccurred()) requestErr, ok := err.(networkerror.RequestError) + fmt.Println("type of requestErr: ", reflect.TypeOf(err)) Expect(ok).To(BeTrue()) Expect(requestErr.Error()).To(MatchRegexp(".*http://garbledyguk.com/v2/foo.*[nN]o such host")) }) }) - Context("when the server does not have a verified certificate", func() { + When("the server does not have a verified certificate", func() { Context("skipSSLValidation is false", func() { BeforeEach(func() { if runtime.GOOS == "darwin" { From 1fa69c5b360485025715d24710333c631e3e706b Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 3 Jan 2025 19:28:48 +0100 Subject: [PATCH 13/19] better error handling for cfnetworking --- api/cfnetworking/networking_connection.go | 4 ++-- api/cfnetworking/networking_connection_test.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/api/cfnetworking/networking_connection.go b/api/cfnetworking/networking_connection.go index 79dad04ae5..f96a8b5164 100644 --- a/api/cfnetworking/networking_connection.go +++ b/api/cfnetworking/networking_connection.go @@ -65,12 +65,12 @@ func (connection *NetworkingConnection) Make(request *Request, passedResponse *R func (*NetworkingConnection) processRequestErrors(request *http.Request, err error) error { switch err.(type) { case *url.Error: - if errors.Is(err, x509.UnknownAuthorityError{}) { + if errors.As(err, &x509.UnknownAuthorityError{}) { return networkerror.UnverifiedServerError{ URL: request.URL.String(), } } - if errors.Is(err, x509.HostnameError{}) { + if errors.As(err, &x509.HostnameError{}) { return networkerror.SSLValidationHostnameError{ Message: err.Error(), } diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go index 7c3a841883..6db55cfeb4 100644 --- a/api/cfnetworking/networking_connection_test.go +++ b/api/cfnetworking/networking_connection_test.go @@ -3,7 +3,6 @@ package cfnetworking_test import ( "fmt" "net/http" - "reflect" "runtime" "strings" @@ -154,7 +153,6 @@ var _ = Describe("CF Networking Connection", func() { Expect(err).To(HaveOccurred()) requestErr, ok := err.(networkerror.RequestError) - fmt.Println("type of requestErr: ", reflect.TypeOf(err)) Expect(ok).To(BeTrue()) Expect(requestErr.Error()).To(MatchRegexp(".*http://garbledyguk.com/v2/foo.*[nN]o such host")) }) From 9b249d15f8fa47d5c48853142a7c5c94e75664f7 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Fri, 3 Jan 2025 19:44:09 +0100 Subject: [PATCH 14/19] use the actual hostname error message --- api/cfnetworking/networking_connection.go | 5 +++-- api/cfnetworking/networking_connection_test.go | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/api/cfnetworking/networking_connection.go b/api/cfnetworking/networking_connection.go index f96a8b5164..2db049fb4b 100644 --- a/api/cfnetworking/networking_connection.go +++ b/api/cfnetworking/networking_connection.go @@ -70,9 +70,10 @@ func (*NetworkingConnection) processRequestErrors(request *http.Request, err err URL: request.URL.String(), } } - if errors.As(err, &x509.HostnameError{}) { + hostnameError := x509.HostnameError{} + if errors.As(err, &hostnameError) { return networkerror.SSLValidationHostnameError{ - Message: err.Error(), + Message: hostnameError.Error(), } } return networkerror.RequestError{Err: err} diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go index 6db55cfeb4..d40abb6e28 100644 --- a/api/cfnetworking/networking_connection_test.go +++ b/api/cfnetworking/networking_connection_test.go @@ -161,9 +161,6 @@ var _ = Describe("CF Networking Connection", func() { When("the server does not have a verified certificate", func() { Context("skipSSLValidation is false", func() { BeforeEach(func() { - if runtime.GOOS == "darwin" { - Skip("ssl verification is different on darwin") - } server.AppendHandlers( CombineHandlers( VerifyRequest(http.MethodGet, "/v2/foo"), From 836943583abea6d741df6343938e796e6b87f8a6 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Wed, 12 Mar 2025 16:48:07 +0100 Subject: [PATCH 15/19] fix merge inconsistencies --- .../process_readiness_health_check.go | 2 +- .../process_readiness_health_check_test.go | 12 +- .../v7/get_readiness_health_check_command.go | 6 +- ...get_readiness_health_check_command_test.go | 18 +-- command/v7/map_route_command_test.go | 2 +- command/v7/update_route_command.go | 10 +- command/v7/update_route_command_test.go | 24 ++-- go.sum | 106 +++++++++--------- ...get_readiness_health_check_command_test.go | 4 +- .../v7/isolated/update_route_command_test.go | 4 +- 10 files changed, 93 insertions(+), 95 deletions(-) diff --git a/actor/v7action/process_readiness_health_check.go b/actor/v7action/process_readiness_health_check.go index 4dbe860325..388f0ec6fc 100644 --- a/actor/v7action/process_readiness_health_check.go +++ b/actor/v7action/process_readiness_health_check.go @@ -3,7 +3,7 @@ package v7action import ( "sort" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" ) type ProcessReadinessHealthCheck struct { diff --git a/actor/v7action/process_readiness_health_check_test.go b/actor/v7action/process_readiness_health_check_test.go index 056e3666c7..b8f2425053 100644 --- a/actor/v7action/process_readiness_health_check_test.go +++ b/actor/v7action/process_readiness_health_check_test.go @@ -3,12 +3,12 @@ package v7action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + . "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/get_readiness_health_check_command.go b/command/v7/get_readiness_health_check_command.go index 83cbabc12a..5fafc16b61 100644 --- a/command/v7/get_readiness_health_check_command.go +++ b/command/v7/get_readiness_health_check_command.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/util/ui" ) type GetReadinessHealthCheckCommand struct { diff --git a/command/v7/get_readiness_health_check_command_test.go b/command/v7/get_readiness_health_check_command_test.go index b3c5137ca6..26573d82a0 100644 --- a/command/v7/get_readiness_health_check_command_test.go +++ b/command/v7/get_readiness_health_check_command_test.go @@ -3,15 +3,15 @@ package v7_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "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 f2e69cfd64..b05fb5b824 100644 --- a/command/v7/map_route_command_test.go +++ b/command/v7/map_route_command_test.go @@ -4,7 +4,7 @@ import ( "errors" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/v9/actor/actionerror" "code.cloudfoundry.org/cli/v9/actor/v7action" diff --git a/command/v7/update_route_command.go b/command/v7/update_route_command.go index 3c6adf3018..210627b567 100644 --- a/command/v7/update_route_command.go +++ b/command/v7/update_route_command.go @@ -3,11 +3,11 @@ package v7 import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v9/command" + "code.cloudfoundry.org/cli/v9/command/flag" + "code.cloudfoundry.org/cli/v9/resources" ) type UpdateRouteCommand struct { diff --git a/command/v7/update_route_command_test.go b/command/v7/update_route_command_test.go index 9ca34a3243..196db66098 100644 --- a/command/v7/update_route_command_test.go +++ b/command/v7/update_route_command_test.go @@ -5,17 +5,17 @@ import ( "fmt" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccversion" + + "code.cloudfoundry.org/cli/v9/actor/actionerror" + "code.cloudfoundry.org/cli/v9/actor/v7action" + "code.cloudfoundry.org/cli/v9/command/commandfakes" + "code.cloudfoundry.org/cli/v9/command/flag" + . "code.cloudfoundry.org/cli/v9/command/v7" + "code.cloudfoundry.org/cli/v9/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v9/resources" + "code.cloudfoundry.org/cli/v9/util/configv3" + "code.cloudfoundry.org/cli/v9/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -258,7 +258,7 @@ var _ = Describe("update-route Command", func() { Expect(actualRouteGUID).To(Equal("route-guid")) Expect(actualOptions).To(Equal(options)) - //Second update route call to remove the option + // Second update route call to remove the option actualRouteGUID, actualOptions = fakeActor.UpdateRouteArgsForCall(1) Expect(actualRouteGUID).To(Equal("route-guid")) options["loadbalancing"] = nil diff --git a/go.sum b/go.sum index c66f3afe9c..688013e625 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,11 @@ -code.cloudfoundry.org/bytefmt v0.21.0 h1:6a4eAhlnMCSXuPP8TMFtqVY4y93EL1FAqmGG5ePBAew= -code.cloudfoundry.org/bytefmt v0.21.0/go.mod h1:/OAOT/x29iXD/O+HuUR2cioFu7+3PSLchUWLQMrAmP8= +code.cloudfoundry.org/bytefmt v0.31.0 h1:7Vh8P2Vnz7W89QgtArF1kaS5DS7RnktTCZ7eUKyEzF8= +code.cloudfoundry.org/bytefmt v0.31.0/go.mod h1:HIz0xOci24hA/16xtQ6aeIT9yXP7KxokFlaJ0Orfs/8= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85 h1:jaHWw9opYjKPrDT19uydBBWSxl+g5F4Hv030fqMsalo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85/go.mod h1:R1EiyOAr7lW0l/YkZNqItUNZ01Q/dYUfbTn4X4Z+82M= code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 h1:O+j8afQWaDuxzKGcculsjgHGK+biBTn6iMjgFpBf54c= code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4/go.mod h1:dVTgo9kQbYns/QM4A1C2GtxqUnFSvJTk2Qhw+M0/uzk= -code.cloudfoundry.org/clock v1.24.0 h1:AQ5NS/5utgqQL9YpGS50lCboR4r2YsWQo/GP2NefjRY= -code.cloudfoundry.org/clock v1.24.0/go.mod h1:pH98Hw+HZTctzUEKPBCzGvT5qSBtOvs8rNyWW6Oi3Ow= +code.cloudfoundry.org/clock v1.29.0 h1:j0ZaxWsKJomgSEKHN+WeBM6QtE3z5zz4sL8+PHy62Cc= +code.cloudfoundry.org/clock v1.29.0/go.mod h1:LwoAL1eASicRkaPI2oS3CbMCG6FY/dKh/WQXbMXCTIk= 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= @@ -19,16 +19,16 @@ code.cloudfoundry.org/inigo v0.0.0-20230612153013-b300679e6ed6/go.mod h1:1ZB1JCh 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/v3 v3.18.0 h1:ZPNv70fnu2iVS4mMycv+Lm0bNlYzvoOY2g/6AEQAiBc= -code.cloudfoundry.org/lager/v3 v3.18.0/go.mod h1:l0A6+06jLPrEwJMYx5WV4+lVDzP1uBfiiO+Jg0QlfKM= -code.cloudfoundry.org/tlsconfig v0.12.0 h1:wM2xJrJzpiwAdtxpp1yDHbA4fh24cGzZ0Ioj0bN8yyA= -code.cloudfoundry.org/tlsconfig v0.12.0/go.mod h1:pszkpK9KjYpkAzL8W1eRAeJWqX4AfFKgqOTZ5e3E9YE= +code.cloudfoundry.org/lager/v3 v3.28.0 h1:SypXJGyBHVXkJFN3mgj5ndwMSP0IR+iE9vvaIaYvlL0= +code.cloudfoundry.org/lager/v3 v3.28.0/go.mod h1:k4G2PFGK6R46i8v4+Cv9LjCCWl4OkOFahfEi1WlhYic= +code.cloudfoundry.org/tlsconfig v0.20.0 h1:KutIw0C20n/v2sOYIzaTiE85IZzUJXbSRWGYZqzy7rs= +code.cloudfoundry.org/tlsconfig v0.20.0/go.mod h1:EmhTAjI91VUkKhShpS6TmwFw3QDh0cXzcETpnDdtAq0= code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d h1:M+zXqtXJqcsmpL76aU0tdl1ho23eYa4axYoM4gD62UA= code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d/go.mod h1:YUJiVOr5xl0N/RjMxM1tHmgSpBbi5UM+KoVR5AoejO0= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 h1:koK7z0nSsRiRiBWwa+E714Puh+DO+ZRdIyAXiXzL+lg= @@ -56,8 +56,8 @@ github.com/cppforlife/go-patch v0.1.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaA github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= -github.com/cyphar/filepath-securejoin v0.3.5 h1:L81NHjquoQmcPgXcttUS9qTSR/+bXry6pbSINQGpjj4= -github.com/cyphar/filepath-securejoin v0.3.5/go.mod h1:edhVd3c6OXKjUmSrVa/tGJRS9joFTxlslFCAyaxigkE= +github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= +github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -114,16 +114,16 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20241206021119-61a79c692802 h1:US08AXzP0bLurpzFUV3Poa9ZijrRdd1zAIOVtoHEiS8= -github.com/google/pprof v0.0.0-20241206021119-61a79c692802/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 h1:+J3r2e8+RsmN3vKfo75g0YSY61ms37qzPglu4p0sGro= +github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -160,18 +160,17 @@ github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+L github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0 h1:9WsegDYiSKtZXru+NcOB4z7iqb00n4atjmQlyy5TRXI= -github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0/go.mod h1:TeVdzh+5QB5IpWDJAU/uviXA6kOg9yXzLrrjeLKJXqY= -github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= -github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 h1:yVCLo4+ACVroOEr4iFU1iH46Ldlzz2rTuu18Ra7M8sU= +github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2/go.mod h1:VzB2VoMh1Y32/QqDfg9ZJYHj99oM4LiGtqPZydTiQSQ= +github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ= +github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -193,8 +192,8 @@ github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= -github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= -github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/ginkgo/v2 v2.23.0 h1:FA1xjp8ieYDzlgS5ABTpdUDB7wtngggONc8a7ku2NqQ= +github.com/onsi/ginkgo/v2 v2.23.0/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM= github.com/onsi/gomega v0.0.0-20171105031654-1eecca0ba8e6/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -203,8 +202,8 @@ 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.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= -github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= +github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= +github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= 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.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg= @@ -253,22 +252,22 @@ github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcY github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.step.sm/crypto v0.55.0 h1:575Q7NahuM/ZRxUVN1GkO2e1aDYQJqIIg+nbfOajQJk= -go.step.sm/crypto v0.55.0/go.mod h1:MgEmD1lgwsuzZwTgI0GwKapHjKVEQLVggSvHuf3bYnU= +go.step.sm/crypto v0.59.0 h1:BDEbdyYJpp0yOSx7dmT+9git2/BXfkCsCzJKOj3v9RI= +go.step.sm/crypto v0.59.0/go.mod h1:wz5S8Q0NI/x22TIWQxdGD+ioHa+ge2FbkcPmbXUzNao= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= -golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= +golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180418062111-d41e8174641f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -284,8 +283,8 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= -golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= +golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -293,8 +292,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180419222023-a2a45943ae67/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -316,22 +315,21 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= +golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -343,8 +341,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= +golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -366,8 +364,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= @@ -394,12 +392,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.4.0-0.dev/go.mod h1:vlRD9XErLMGT+mDuofSr0mMMquscM/1nQqtRSsh6m70= -k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= -k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= -k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= -k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= -k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= +k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= +k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= +k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= +k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= diff --git a/integration/v7/isolated/get_readiness_health_check_command_test.go b/integration/v7/isolated/get_readiness_health_check_command_test.go index 39fb50c382..b38e2a35de 100644 --- a/integration/v7/isolated/get_readiness_health_check_command_test.go +++ b/integration/v7/isolated/get_readiness_health_check_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/update_route_command_test.go b/integration/v7/isolated/update_route_command_test.go index 0dd13ab0c4..1a1617f010 100644 --- a/integration/v7/isolated/update_route_command_test.go +++ b/integration/v7/isolated/update_route_command_test.go @@ -1,8 +1,8 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v9/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v9/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" From aca0c583c583a6314c097c760adcc4c0872d6db8 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Thu, 13 Mar 2025 08:27:02 +0100 Subject: [PATCH 16/19] update cfnetworking connection test to support *.example.com certificates --- api/cfnetworking/networking_connection_test.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go index d40abb6e28..f77fe3d9fe 100644 --- a/api/cfnetworking/networking_connection_test.go +++ b/api/cfnetworking/networking_connection_test.go @@ -8,6 +8,7 @@ import ( . "code.cloudfoundry.org/cli/v9/api/cfnetworking" "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" + "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" @@ -206,9 +207,14 @@ var _ = Describe("CF Networking Connection", func() { var response Response err = connection.Make(request, &response) - Expect(err).To(MatchError(networkerror.SSLValidationHostnameError{ - Message: "x509: certificate is valid for example.com, not loopback.cli.fun", - })) + Expect(err).To( + SatisfyAny( + MatchError(ccerror.SSLValidationHostnameError{ + Message: "x509: certificate is valid for example.com, *.example.com, not loopback.cli.fun", + }), + MatchError(ccerror.SSLValidationHostnameError{ + Message: "x509: certificate is valid for example.com, not loopback.cli.fun", + }))) }) }) }) From b80ca104c9ce1d21d253942e264418ae8afeb84d Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Thu, 13 Mar 2025 08:59:39 +0100 Subject: [PATCH 17/19] fix copy&paste mistake --- api/cfnetworking/networking_connection_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go index f77fe3d9fe..d102e765b5 100644 --- a/api/cfnetworking/networking_connection_test.go +++ b/api/cfnetworking/networking_connection_test.go @@ -8,7 +8,6 @@ import ( . "code.cloudfoundry.org/cli/v9/api/cfnetworking" "code.cloudfoundry.org/cli/v9/api/cfnetworking/networkerror" - "code.cloudfoundry.org/cli/v9/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" @@ -209,10 +208,10 @@ var _ = Describe("CF Networking Connection", func() { err = connection.Make(request, &response) Expect(err).To( SatisfyAny( - MatchError(ccerror.SSLValidationHostnameError{ + MatchError(networkerror.SSLValidationHostnameError{ Message: "x509: certificate is valid for example.com, *.example.com, not loopback.cli.fun", }), - MatchError(ccerror.SSLValidationHostnameError{ + MatchError(networkerror.SSLValidationHostnameError{ Message: "x509: certificate is valid for example.com, not loopback.cli.fun", }))) }) From 1229af4c51dc900546348a767dbb56a4ac66e8e9 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Tue, 18 Mar 2025 09:25:19 +0100 Subject: [PATCH 18/19] error message for restage command with max-in-flight seems to have changed again --- .../v7/isolated/restage_command_test.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/integration/v7/isolated/restage_command_test.go b/integration/v7/isolated/restage_command_test.go index ba280d1937..395c96fe00 100644 --- a/integration/v7/isolated/restage_command_test.go +++ b/integration/v7/isolated/restage_command_test.go @@ -142,22 +142,6 @@ var _ = Describe("restage command", func() { }) When("strategy rolling is given", func() { - It("fails and displays the deployment failure message", func() { - userName, _ := helpers.GetCredentials() - session := helpers.CustomCF(helpers.CFEnv{ - EnvVars: map[string]string{"CF_STARTUP_TIMEOUT": "0.1"}, - }, "restage", appName, "--strategy", "rolling") - Consistently(session.Err).ShouldNot(Say(`This action will cause app downtime\.`)) - Eventually(session).Should(Say(`Restaging app %s in org %s / space %s as %s\.\.\.`, appName, orgName, spaceName, userName)) - Eventually(session).Should(Say(`Creating deployment for app %s\.\.\.`, appName)) - Eventually(session).Should(Say(`Waiting for app to deploy\.\.\.`)) - Eventually(session.Err).Should(Say(`Cannot cancel a deployment with status: FINALIZED and reason: DEPLOYED`)) - Eventually(session).Should(Say("FAILED")) - Eventually(session).Should(Exit(1)) - }) - }) - - When("strategy rolling is given with max-in-flight", func() { It("fails and displays the deployment failure message", func() { userName, _ := helpers.GetCredentials() session := helpers.CustomCF(helpers.CFEnv{ @@ -167,7 +151,8 @@ var _ = Describe("restage command", func() { Eventually(session).Should(Say(`Restaging app %s in org %s / space %s as %s\.\.\.`, appName, orgName, spaceName, userName)) Eventually(session).Should(Say(`Creating deployment for app %s\.\.\.`, appName)) Eventually(session).Should(Say(`Waiting for app to deploy\.\.\.`)) - Eventually(session.Err).Should(Say(`Cannot cancel a deployment with status: FINALIZED and reason: DEPLOYED`)) + Eventually(session.Err).Should(Say(`Start app timeout`)) + Eventually(session.Err).Should(Say(`TIP: Application must be listening on the right port\. Instead of hard coding the port, use the $PORT environment variable\.`)) Eventually(session).Should(Say("FAILED")) Eventually(session).Should(Exit(1)) }) From a02c164ee0b42d1650ea6125baa4da30557a3a1d Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Tue, 18 Mar 2025 11:28:15 +0100 Subject: [PATCH 19/19] escape dollar sign for regular expression --- integration/v7/isolated/restage_command_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/v7/isolated/restage_command_test.go b/integration/v7/isolated/restage_command_test.go index 395c96fe00..de71bf8cb7 100644 --- a/integration/v7/isolated/restage_command_test.go +++ b/integration/v7/isolated/restage_command_test.go @@ -152,7 +152,7 @@ var _ = Describe("restage command", func() { Eventually(session).Should(Say(`Creating deployment for app %s\.\.\.`, appName)) Eventually(session).Should(Say(`Waiting for app to deploy\.\.\.`)) Eventually(session.Err).Should(Say(`Start app timeout`)) - Eventually(session.Err).Should(Say(`TIP: Application must be listening on the right port\. Instead of hard coding the port, use the $PORT environment variable\.`)) + Eventually(session.Err).Should(Say(`TIP: Application must be listening on the right port\. Instead of hard coding the port, use the \$PORT environment variable\.`)) Eventually(session).Should(Say("FAILED")) Eventually(session).Should(Exit(1)) })