From 425f941fdd967f815ea94996c2ba1fb93ba84abf Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:40:31 +0200 Subject: [PATCH 1/4] upgrade module to v7 standard go version workflow --- .github/license/CF_NOTICE | 4 +- .../win/integrations/integration-tests.ps1 | 4 +- .github/workflows/release-update-repos.yml | 2 +- Makefile | 6 +- .../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_error.go | 2 +- ...security_group_not_bound_to_space_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 | 10 +-- 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/pushaction/actor.go | 2 +- actor/pushaction/actualize.go | 4 +- actor/pushaction/actualize_test.go | 12 ++-- actor/pushaction/application.go | 12 ++-- actor/pushaction/application_config.go | 8 +-- actor/pushaction/application_config_test.go | 20 +++--- actor/pushaction/application_test.go | 16 ++--- actor/pushaction/apply.go | 4 +- actor/pushaction/apply_test.go | 12 ++-- actor/pushaction/command_line_settings.go | 4 +- .../pushaction/command_line_settings_test.go | 6 +- .../command_line_settings_unix_test.go | 4 +- .../command_line_settings_windows_test.go | 4 +- actor/pushaction/domain.go | 4 +- actor/pushaction/domain_test.go | 8 +-- ...erge_and_validate_settings_and_manifest.go | 4 +- ...and_validate_settings_and_manifest_test.go | 8 +-- ...alidate_settings_and_manifest_unix_test.go | 6 +- ...date_settings_and_manifest_windows_test.go | 6 +- actor/pushaction/push_plan.go | 6 +- actor/pushaction/push_plan_test.go | 10 +-- actor/pushaction/pushaction_suite_test.go | 4 +- .../pushactionfakes/fake_progress_bar.go | 2 +- .../fake_random_word_generator.go | 2 +- .../pushactionfakes/fake_shared_actor.go | 4 +- .../pushactionfakes/fake_v2actor.go | 4 +- .../pushactionfakes/fake_v3actor.go | 6 +- actor/pushaction/read_manifest.go | 2 +- actor/pushaction/read_manifest_test.go | 6 +- actor/pushaction/resource.go | 6 +- actor/pushaction/resource_test.go | 6 +- actor/pushaction/route.go | 8 +-- actor/pushaction/route_test.go | 12 ++-- actor/pushaction/service_binding_test.go | 6 +- actor/pushaction/shared_actor.go | 2 +- actor/pushaction/v2_actor.go | 2 +- actor/pushaction/v3_actor.go | 4 +- actor/pushaction/version_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_logged_in_test.go | 4 +- 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/v2action/application.go | 8 +-- actor/v2action/application_instance.go | 8 +-- actor/v2action/application_instance_test.go | 12 ++-- .../application_instance_with_stats.go | 6 +- .../application_instance_with_stats_test.go | 12 ++-- actor/v2action/application_summary.go | 4 +- actor/v2action/application_summary_test.go | 12 ++-- actor/v2action/application_test.go | 14 ++-- actor/v2action/auth.go | 4 +- actor/v2action/auth_test.go | 8 +-- actor/v2action/buildpack.go | 14 ++-- actor/v2action/buildpack_test.go | 16 ++--- actor/v2action/buildpack_unix_test.go | 4 +- actor/v2action/buildpack_windows_test.go | 4 +- actor/v2action/cloud_controller_client.go | 2 +- .../compositefakes/fake_broker_actor.go | 4 +- .../fake_get_apiversion_actor.go | 2 +- .../fake_get_service_instance_actor.go | 4 +- .../fake_get_service_plan_actor.go | 4 +- .../compositefakes/fake_organization_actor.go | 4 +- .../compositefakes/fake_service_actor.go | 4 +- ...service_instance_maintenance_info_actor.go | 4 +- .../compositefakes/fake_visibility_actor.go | 4 +- .../composite/service_broker_summary.go | 6 +- .../composite/service_broker_summary_test.go | 10 +-- .../composite/update_service_instance.go | 4 +- .../composite/update_service_instance_test.go | 10 +-- actor/v2action/config.go | 2 +- actor/v2action/domain.go | 8 +-- actor/v2action/domain_test.go | 12 ++-- actor/v2action/feature_flag.go | 2 +- actor/v2action/feature_flag_test.go | 6 +- actor/v2action/job.go | 2 +- actor/v2action/job_test.go | 6 +- actor/v2action/logging.go | 2 +- actor/v2action/logging_test.go | 14 ++-- actor/v2action/manifest.go | 4 +- actor/v2action/manifest_test.go | 12 ++-- actor/v2action/organization.go | 10 +-- actor/v2action/organization_quota.go | 8 +-- actor/v2action/organization_quota_test.go | 12 ++-- actor/v2action/organization_summary_test.go | 6 +- actor/v2action/organization_test.go | 14 ++-- actor/v2action/resource.go | 2 +- actor/v2action/resource_test.go | 6 +- actor/v2action/route.go | 10 +-- actor/v2action/route_test.go | 14 ++-- actor/v2action/router_client.go | 2 +- actor/v2action/router_group.go | 6 +- actor/v2action/router_group_test.go | 8 +-- actor/v2action/security_group.go | 8 +-- actor/v2action/security_group_test.go | 12 ++-- actor/v2action/service.go | 6 +- actor/v2action/service_access.go | 8 +-- actor/v2action/service_access_test.go | 12 ++-- actor/v2action/service_binding.go | 6 +- actor/v2action/service_binding_test.go | 10 +-- actor/v2action/service_broker.go | 6 +- actor/v2action/service_broker_test.go | 10 +-- actor/v2action/service_instance.go | 8 +-- .../v2action/service_instance_shared_from.go | 2 +- .../service_instance_shared_from_test.go | 6 +- actor/v2action/service_instance_shared_to.go | 2 +- .../service_instance_shared_to_test.go | 6 +- actor/v2action/service_instance_summary.go | 8 +-- .../v2action/service_instance_summary_test.go | 10 +-- actor/v2action/service_instance_test.go | 12 ++-- .../service_instance_user_provided.go | 2 +- .../service_instance_user_provided_test.go | 6 +- actor/v2action/service_key.go | 2 +- actor/v2action/service_key_test.go | 10 +-- actor/v2action/service_plan.go | 6 +- actor/v2action/service_plan_test.go | 8 +-- actor/v2action/service_plan_visibility.go | 4 +- .../v2action/service_plan_visibility_test.go | 8 +-- actor/v2action/service_summary.go | 6 +- actor/v2action/service_summary_test.go | 10 +-- actor/v2action/service_test.go | 10 +-- actor/v2action/shared_domain_test.go | 6 +- actor/v2action/space.go | 10 +-- actor/v2action/space_quota.go | 6 +- actor/v2action/space_quota_test.go | 10 +-- actor/v2action/space_summary.go | 2 +- actor/v2action/space_summary_test.go | 8 +-- actor/v2action/space_test.go | 14 ++-- actor/v2action/ssh_test.go | 4 +- actor/v2action/stack.go | 8 +-- actor/v2action/stack_test.go | 12 ++-- actor/v2action/target.go | 4 +- actor/v2action/target_test.go | 4 +- actor/v2action/token_test.go | 6 +- actor/v2action/uaa_client.go | 4 +- actor/v2action/user.go | 2 +- actor/v2action/user_test.go | 8 +-- actor/v2action/v2action_suite_test.go | 4 +- .../fake_cloud_controller_client.go | 4 +- actor/v2action/v2actionfakes/fake_config.go | 4 +- .../v2action/v2actionfakes/fake_downloader.go | 2 +- .../v2action/v2actionfakes/fake_noaaclient.go | 2 +- .../v2actionfakes/fake_router_client.go | 4 +- .../v2actionfakes/fake_simple_progress_bar.go | 2 +- .../v2action/v2actionfakes/fake_uaaclient.go | 6 +- actor/v2action/version_test.go | 4 +- actor/v2v3action/application_summary.go | 10 +-- actor/v2v3action/application_summary_test.go | 16 ++--- actor/v2v3action/manifest.go | 6 +- actor/v2v3action/manifest_test.go | 12 ++-- actor/v2v3action/service_instance.go | 6 +- actor/v2v3action/service_instance_test.go | 16 ++--- actor/v2v3action/v2_actor.go | 2 +- .../v2v3actionfakes/fake_v2actor.go | 6 +- .../v2v3actionfakes/fake_v3actor.go | 6 +- actor/v2v3action/v3_actor.go | 4 +- actor/v2v3action/version_test.go | 4 +- actor/v3action/application.go | 8 +-- actor/v3action/application_manifest.go | 4 +- actor/v3action/application_manifest_test.go | 12 ++-- actor/v3action/application_summary.go | 2 +- actor/v3action/application_summary_test.go | 14 ++-- actor/v3action/application_test.go | 14 ++-- .../application_with_process_summary.go | 2 +- .../application_with_process_summary_test.go | 10 +-- actor/v3action/auth.go | 6 +- actor/v3action/auth_test.go | 10 +-- actor/v3action/build.go | 10 +-- actor/v3action/build_test.go | 14 ++-- actor/v3action/cloud_controller_client.go | 4 +- actor/v3action/config.go | 2 +- actor/v3action/droplet.go | 10 +-- actor/v3action/droplet_test.go | 14 ++-- actor/v3action/environment_variable.go | 6 +- actor/v3action/environment_variable_test.go | 10 +-- actor/v3action/isolation_segment.go | 8 +-- actor/v3action/isolation_segment_test.go | 12 ++-- actor/v3action/logcache_test.go | 10 +-- actor/v3action/logging.go | 2 +- actor/v3action/logging_test.go | 10 +-- actor/v3action/organization.go | 6 +- actor/v3action/organization_test.go | 10 +-- actor/v3action/organization_test.go.txt | 8 +-- actor/v3action/package.go | 10 +-- actor/v3action/package_test.go | 14 ++-- actor/v3action/process.go | 6 +- actor/v3action/process_health_check.go | 8 +-- actor/v3action/process_health_check_test.go | 14 ++-- actor/v3action/process_instance.go | 8 +-- actor/v3action/process_instance_test.go | 12 ++-- actor/v3action/process_summary.go | 4 +- actor/v3action/process_summary_test.go | 6 +- actor/v3action/process_test.go | 16 ++--- actor/v3action/relationship_list.go | 2 +- actor/v3action/relationship_list_test.go | 8 +-- actor/v3action/service_instance.go | 8 +-- actor/v3action/service_instance_test.go | 10 +-- actor/v3action/shared_actor.go | 2 +- actor/v3action/space.go | 8 +-- actor/v3action/space_test.go | 12 ++-- actor/v3action/ssh.go | 2 +- actor/v3action/ssh_actor.go | 2 +- actor/v3action/ssh_test.go | 12 ++-- actor/v3action/target.go | 8 +-- actor/v3action/target_test.go | 8 +-- actor/v3action/task.go | 8 +-- actor/v3action/task_test.go | 14 ++-- actor/v3action/uaa_client.go | 2 +- actor/v3action/v3action_suite_test.go | 4 +- .../fake_cloud_controller_client.go | 6 +- actor/v3action/v3actionfakes/fake_config.go | 4 +- .../v3actionfakes/fake_manifest_parser.go | 2 +- .../v3action/v3actionfakes/fake_noaaclient.go | 2 +- .../v3actionfakes/fake_shared_actor.go | 4 +- actor/v3action/v3actionfakes/fake_sshactor.go | 4 +- .../v3action/v3actionfakes/fake_uaaclient.go | 4 +- actor/v3action/version_test.go | 4 +- actor/v3action/zdt.go | 8 +-- actor/v3action/zdt_test.go | 12 ++-- 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 | 14 ++-- actor/v7action/application_summary.go | 8 +-- actor/v7action/application_summary_test.go | 18 +++--- actor/v7action/application_test.go | 18 +++--- actor/v7action/auth.go | 6 +- actor/v7action/auth_test.go | 8 +-- 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 | 6 +- actor/v7action/config.go | 2 +- 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 | 8 +-- actor/v7action/feature_flag_test.go | 12 ++-- actor/v7action/info_test.go | 8 +-- actor/v7action/isolation_segment.go | 8 +-- actor/v7action/isolation_segment_test.go | 12 ++-- actor/v7action/job.go | 2 +- actor/v7action/job_test.go | 8 +-- actor/v7action/label.go | 6 +- actor/v7action/label_test.go | 12 ++-- 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/relationship_list.go | 2 +- actor/v7action/relationship_list_test.go | 8 +-- 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 | 14 ++-- 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 | 12 ++-- actor/v7action/security_group_test.go | 16 ++--- actor/v7action/service_access.go | 6 +- actor/v7action/service_access_test.go | 12 ++-- actor/v7action/service_broker.go | 6 +- actor/v7action/service_broker_test.go | 10 +-- actor/v7action/service_instance.go | 8 +-- actor/v7action/service_instance_test.go | 10 +-- actor/v7action/service_offering.go | 2 +- 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 | 4 +- actor/v7action/space_manifest_test.go | 10 +-- 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 | 8 +-- actor/v7action/v7actionfakes/fake_config.go | 4 +- .../v7action/v7actionfakes/fake_downloader.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 +- actor/v7action/version_test.go | 4 +- actor/v7pushaction/actor_test.go | 4 +- actor/v7pushaction/actualize_test.go | 10 +-- actor/v7pushaction/application.go | 2 +- actor/v7pushaction/application_test.go | 6 +- .../create_bits_package_for_application.go | 10 +-- ...reate_bits_package_for_application_test.go | 16 ++--- .../create_deployment_for_push_plan_test.go | 8 +-- ...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_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 +-- actor/v7pushaction/handle_memory_override.go | 6 +- .../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 +-- ..._deployment_strategy_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/v2_actor.go | 2 +- 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_v2actor.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/ccv2/application.go | 10 +-- .../ccv2/application_instance.go | 6 +- .../ccv2/application_instance_status.go | 6 +- .../ccv2/application_instance_status_test.go | 6 +- .../ccv2/application_instance_test.go | 6 +- api/cloudcontroller/ccv2/application_test.go | 10 +-- api/cloudcontroller/ccv2/buildpack.go | 10 +-- api/cloudcontroller/ccv2/buildpack_test.go | 14 ++-- .../ccv2/ccv2fakes/fake_connection_wrapper.go | 4 +- .../ccv2/ccv2fakes/fake_reader.go | 2 +- api/cloudcontroller/ccv2/client.go | 2 +- api/cloudcontroller/ccv2/client_test.go | 4 +- .../ccv2/cloudcontrollerv2_suite_test.go | 2 +- .../ccv2/connection_wrapper.go | 2 +- api/cloudcontroller/ccv2/domain.go | 8 +-- api/cloudcontroller/ccv2/domain_test.go | 6 +- api/cloudcontroller/ccv2/errors.go | 4 +- api/cloudcontroller/ccv2/errors_test.go | 4 +- api/cloudcontroller/ccv2/event.go | 8 +-- api/cloudcontroller/ccv2/event_test.go | 6 +- api/cloudcontroller/ccv2/feature_flag.go | 4 +- api/cloudcontroller/ccv2/feature_flag_test.go | 4 +- api/cloudcontroller/ccv2/filter.go | 2 +- api/cloudcontroller/ccv2/info.go | 6 +- api/cloudcontroller/ccv2/info_test.go | 4 +- api/cloudcontroller/ccv2/job.go | 8 +-- api/cloudcontroller/ccv2/job_test.go | 12 ++-- api/cloudcontroller/ccv2/last_operation.go | 2 +- api/cloudcontroller/ccv2/organization.go | 6 +- .../ccv2/organization_quota.go | 6 +- .../ccv2/organization_quota_test.go | 6 +- api/cloudcontroller/ccv2/organization_test.go | 6 +- .../ccv2/paginated_resources.go | 2 +- .../ccv2/paginated_resources_test.go | 4 +- api/cloudcontroller/ccv2/request.go | 2 +- api/cloudcontroller/ccv2/resource.go | 4 +- api/cloudcontroller/ccv2/resource_test.go | 4 +- api/cloudcontroller/ccv2/route.go | 8 +-- api/cloudcontroller/ccv2/route_mapping.go | 6 +- .../ccv2/route_mapping_test.go | 6 +- api/cloudcontroller/ccv2/route_test.go | 8 +-- api/cloudcontroller/ccv2/security_group.go | 6 +- .../ccv2/security_group_test.go | 6 +- api/cloudcontroller/ccv2/service.go | 6 +- api/cloudcontroller/ccv2/service_binding.go | 6 +- .../ccv2/service_binding_test.go | 6 +- api/cloudcontroller/ccv2/service_broker.go | 6 +- .../ccv2/service_broker_test.go | 6 +- api/cloudcontroller/ccv2/service_instance.go | 8 +-- .../ccv2/service_instance_shared_from.go | 4 +- .../ccv2/service_instance_shared_from_test.go | 4 +- .../ccv2/service_instance_shared_to.go | 4 +- .../ccv2/service_instance_shared_to_test.go | 2 +- .../ccv2/service_instance_test.go | 8 +-- .../ccv2/service_instance_user_provided.go | 6 +- .../service_instance_user_provided_test.go | 6 +- api/cloudcontroller/ccv2/service_key.go | 4 +- api/cloudcontroller/ccv2/service_key_test.go | 4 +- api/cloudcontroller/ccv2/service_plan.go | 8 +-- api/cloudcontroller/ccv2/service_plan_test.go | 6 +- .../ccv2/service_plan_visibility.go | 6 +- .../ccv2/service_plan_visibility_test.go | 6 +- api/cloudcontroller/ccv2/service_test.go | 6 +- api/cloudcontroller/ccv2/space.go | 6 +- api/cloudcontroller/ccv2/space_quota.go | 6 +- api/cloudcontroller/ccv2/space_quota_test.go | 4 +- api/cloudcontroller/ccv2/space_summary.go | 4 +- .../ccv2/space_summary_test.go | 4 +- api/cloudcontroller/ccv2/space_test.go | 6 +- api/cloudcontroller/ccv2/stack.go | 6 +- api/cloudcontroller/ccv2/stack_test.go | 6 +- api/cloudcontroller/ccv2/target.go | 8 +-- api/cloudcontroller/ccv2/target_test.go | 4 +- api/cloudcontroller/ccv2/user.go | 4 +- api/cloudcontroller/ccv2/user_test.go | 4 +- 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 | 6 +- 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 | 6 +- .../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 | 2 +- api/cloudcontroller/ccv3/manifest_test.go | 8 +-- 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 | 6 +- .../ccv3/process_instance_test.go | 6 +- 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_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 +-- api/cloudcontroller/ccv3/service_instance.go | 4 +- .../ccv3/service_instance_test.go | 6 +- api/cloudcontroller/ccv3/service_offering.go | 6 +- .../ccv3/service_offering_test.go | 10 +-- api/cloudcontroller/ccv3/service_plan.go | 6 +- api/cloudcontroller/ccv3/service_plan_test.go | 6 +- .../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 | 8 +-- 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 +- 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/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/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/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/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 | 4 +- 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 | 54 ++++++++-------- 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 | 32 +++++----- 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 | 18 +++--- 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 | 6 +- 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/color_test.go | 2 +- command/flag/command.go | 2 +- command/flag/command_test.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/memory_with_unlimited.go | 2 +- command/flag/memory_with_unlimited_test.go | 2 +- command/flag/network_port_test.go | 2 +- command/flag/network_protocol_test.go | 2 +- command/flag/optional_string_test.go | 2 +- command/flag/org_role_test.go | 2 +- command/flag/path.go | 2 +- 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_test.go | 2 +- command/flag/timeout.go | 2 +- command/flag/timeout_test.go | 2 +- command/log_cache_client.go | 34 +++++----- 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 | 16 ++--- .../convert_to_translatable_error_test.go | 18 +++--- ...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/v6/bind_route_service_command.go | 6 +- command/v6/bind_service_command.go | 12 ++-- command/v6/bind_service_command_test.go | 20 +++--- command/v6/create_service_command.go | 16 ++--- command/v6/create_service_command_test.go | 22 +++---- command/v6/create_service_key_command.go | 12 ++-- command/v6/create_service_key_command_test.go | 18 +++--- .../create_user_provided_service_command.go | 6 +- command/v6/curl_command.go | 6 +- command/v6/delete_service_command.go | 6 +- command/v6/delete_service_key_command.go | 6 +- command/v6/purge_service_instance_command.go | 6 +- command/v6/rename_service_command.go | 6 +- command/v6/service_command.go | 14 ++-- command/v6/service_command_test.go | 20 +++--- command/v6/service_key_command.go | 6 +- command/v6/service_keys_command.go | 6 +- command/v6/services_command.go | 14 ++-- command/v6/services_command_test.go | 20 +++--- command/v6/share_service_command.go | 18 +++--- command/v6/share_service_command_test.go | 20 +++--- command/v6/shared/app_summary_displayer.go | 10 +-- .../app_summary_displayer_refactored.go | 8 +-- .../app_summary_displayer_refactored_test.go | 18 +++--- .../v6/shared/app_summary_displayer_test.go | 24 +++---- .../v6/shared/application_summary_actor.go | 2 +- command/v6/shared/get_application_changes.go | 4 +- .../v6/shared/get_application_changes_test.go | 12 ++-- command/v6/shared/new_clients.go | 16 ++--- command/v6/shared/new_clients_test.go | 10 +-- command/v6/shared/new_networking_client.go | 8 +-- .../v6/shared/new_networking_client_test.go | 10 +-- command/v6/shared/new_v3_based_clients.go | 12 ++-- .../v6/shared/new_v3_based_clients_test.go | 10 +-- command/v6/shared/noaa_client.go | 8 +-- command/v6/shared/noaa_client_test.go | 6 +- command/v6/shared/package_displayer.go | 2 +- command/v6/shared/poll_start.go | 10 +-- command/v6/shared/poll_start_test.go | 16 ++--- .../fake_application_summary_actor.go | 4 +- .../v6/shared/sharedfakes/fake_v2app_actor.go | 4 +- .../sharedfakes/fake_v3app_summary_actor.go | 4 +- command/v6/shared/v3_poll_stage.go | 6 +- command/v6/shared/v3_poll_stage_test.go | 8 +-- command/v6/unbind_route_service_command.go | 6 +- command/v6/unbind_service_command.go | 12 ++-- command/v6/unbind_service_command_test.go | 18 +++--- command/v6/unshare_service_command.go | 18 +++--- command/v6/unshare_service_command_test.go | 20 +++--- command/v6/update_service_command.go | 18 +++--- command/v6/update_service_command_test.go | 22 +++---- .../update_user_provided_service_command.go | 12 ++-- ...date_user_provided_service_command_test.go | 18 +++--- command/v6/v3_cancel_zdt_push_command.go | 10 +-- command/v6/v3_cancel_zdt_push_command_test.go | 16 ++--- command/v6/v3_zdt_restart_command.go | 12 ++-- command/v6/v3_zdt_restart_command_test.go | 24 +++---- command/v6/v6fakes/fake_bind_service_actor.go | 4 +- .../v6/v6fakes/fake_create_service_actor.go | 4 +- .../v6fakes/fake_create_service_key_actor.go | 4 +- command/v6/v6fakes/fake_service_actor.go | 4 +- .../v6fakes/fake_service_instances_actor.go | 4 +- .../v6/v6fakes/fake_share_service_actor.go | 4 +- .../v6/v6fakes/fake_unbind_service_actor.go | 4 +- .../v6/v6fakes/fake_unshare_service_actor.go | 4 +- .../v6/v6fakes/fake_update_service_actor.go | 4 +- ...fake_update_user_provided_service_actor.go | 4 +- .../v6fakes/fake_v3cancel_zdt_push_actor.go | 4 +- .../fake_v3zero_downtime_restart_actor.go | 4 +- command/v7/actor.go | 16 ++--- 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 | 12 ++-- 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 | 10 +-- command/v7/apply_manifest_command_test.go | 20 +++--- 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 | 16 ++--- command/v7/base_command.go | 12 ++-- .../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 +++---- .../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 | 20 +++--- 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/copy_source_command.go | 12 ++-- 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 | 6 +- .../v7/create_service_broker_command_test.go | 12 ++-- 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 +++--- 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_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 | 16 ++--- 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 | 14 ++-- command/v7/disallow_space_ssh_command.go | 4 +- command/v7/disallow_space_ssh_command_test.go | 12 ++-- 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 | 14 ++-- command/v7/enable_ssh_command.go | 2 +- command/v7/enable_ssh_command_test.go | 16 ++--- 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 | 8 +-- command/v7/label_updater_test.go | 22 +++---- command/v7/labels_command.go | 10 +-- command/v7/labels_command_test.go | 18 +++--- command/v7/login_command.go | 20 +++--- 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 | 10 +-- 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/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_offering_command.go | 4 +- .../v7/purge_service_offering_command_test.go | 12 ++-- command/v7/push_command.go | 28 ++++---- command/v7/push_command_test.go | 32 +++++----- 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_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 | 12 ++-- command/v7/restage_command_test.go | 22 +++---- command/v7/restart_app_instance_command.go | 2 +- .../v7/restart_app_instance_command_test.go | 16 ++--- command/v7/restart_command.go | 8 +-- command/v7/restart_command_test.go | 22 +++---- 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 | 12 ++-- command/v7/rollback_command_test.go | 24 +++---- 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 | 12 ++-- 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/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 | 18 +++--- 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/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/new_clients.go | 16 ++--- command/v7/shared/new_clients_test.go | 10 +-- command/v7/shared/new_networking_client.go | 8 +-- .../v7/shared/new_networking_client_test.go | 10 +-- command/v7/shared/package_displayer.go | 2 +- command/v7/shared/quota_displayer.go | 8 +-- .../v7/shared/sharedfakes/fake_app_stager.go | 8 +-- command/v7/shared/v3_poll_stage.go | 10 +-- command/v7/shared/v3_poll_stage_test.go | 12 ++-- 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 | 12 ++-- 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 | 10 +-- 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 | 10 +-- 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 +++--- .../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 ++--- .../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/update_buildpack_command.go | 20 +++--- command/v7/update_buildpack_command_test.go | 28 ++++---- 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 | 4 +- .../v7/update_service_broker_command_test.go | 18 +++--- command/v7/update_space_quota_command.go | 6 +- command/v7/update_space_quota_command_test.go | 20 +++--- command/v7/v7fakes/fake_actor.go | 18 +++--- command/v7/v7fakes/fake_actor_reloader.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 | 6 +- 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 + i18n/resources/README.md | 2 +- integration/README.md | 4 +- .../assets/configurable_plugin/test_plugin.go | 2 +- .../test_plugin_fails_uninstall.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 +- integration/helpers/client.go | 12 ++-- .../commonisolated/common_isolated_setup.go | 2 +- 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/service_binding.go | 4 +- integration/helpers/servicebrokerstub/api.go | 2 +- .../helpers/servicebrokerstub/app_config.go | 3 +- .../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 +- .../shared/isolated/auth_command_test.go | 6 +- 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 +- .../experimental/experimental_suite_test.go | 2 +- .../v3_apply_manifest_command_test.go | 2 +- .../v6/experimental/v3_apps_command_test.go | 2 +- .../experimental/v3_cancel_zdt_push_test.go | 2 +- .../v3_create_app_command_test.go | 2 +- .../v3_create_package_cfignore_test.go | 2 +- .../v3_create_package_command_test.go | 2 +- .../v6/experimental/v3_delete_command_test.go | 2 +- .../experimental/v3_droplets_command_test.go | 2 +- .../v6/experimental/v3_env_command_test.go | 2 +- .../v3_get_health_check_command_test.go | 2 +- .../experimental/v3_packages_command_test.go | 2 +- .../v6/experimental/v3_push_cfignore_test.go | 2 +- .../v6/experimental/v3_push_command_test.go | 2 +- .../v6/experimental/v3_push_no_start_test.go | 2 +- .../v3_restart_app_instance_command_test.go | 4 +- .../experimental/v3_restart_command_test.go | 2 +- .../v6/experimental/v3_scale_command_test.go | 2 +- .../v3_set_droplet_command_test.go | 2 +- .../experimental/v3_set_env_command_test.go | 2 +- .../v3_set_health_check_command_test.go | 2 +- .../v6/experimental/v3_ssh_command_test.go | 2 +- .../v6/experimental/v3_stage_command_test.go | 2 +- .../v6/experimental/v3_start_command_test.go | 2 +- .../v3_stop_application_command_test.go | 2 +- .../experimental/v3_unset_env_command_test.go | 2 +- .../experimental/v3_zdt_push_command_test.go | 2 +- .../v3_zdt_restart_command_test.go | 2 +- ...ind_staging_security_group_command_test.go | 4 +- .../v6/global/buildpacks_command_test.go | 2 +- .../global/create_buildpack_command_test.go | 2 +- .../global/delete_buildpack_command_test.go | 2 +- .../disable_feature_flags_command_test.go | 2 +- .../enable_feature_flags_command_test.go | 2 +- integration/v6/global/env_command_test.go | 2 +- .../v6/global/feature_flags_command_test.go | 2 +- integration/v6/global/global_suite_test.go | 2 +- integration/v6/global/quota_command_test.go | 2 +- integration/v6/global/quotas_command_test.go | 2 +- .../global/rename_buildpack_command_test.go | 4 +- .../v6/global/set_org_role_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../v6/global/set_space_role_command_test.go | 2 +- ...environment_variable_group_command_test.go | 2 +- .../global/update_buildpack_command_test.go | 2 +- .../add_network_policy_command_test.go | 2 +- integration/v6/isolated/api_command_test.go | 4 +- integration/v6/isolated/app_command_test.go | 2 +- .../bind_route_service_command_test.go | 4 +- ...ind_running_security_group_command_test.go | 4 +- .../bind_security_group_command_test.go | 4 +- .../v6/isolated/check_route_command_test.go | 2 +- .../v6/isolated/config_command_test.go | 2 +- .../v6/isolated/copy_source_command_test.go | 2 +- .../create_app_manifest_command_test.go | 4 +- .../create_isolation_segment_command_test.go | 2 +- .../v6/isolated/create_org_command_test.go | 2 +- .../v6/isolated/create_quota_command_test.go | 2 +- .../v6/isolated/create_route_command_test.go | 2 +- .../v6/isolated/create_shared_domain_test.go | 2 +- .../v6/isolated/create_space_command_test.go | 2 +- .../create_space_quota_command_test.go | 2 +- .../v6/isolated/create_user_command_test.go | 2 +- integration/v6/isolated/curl_command_test.go | 2 +- .../v6/isolated/delete_command_test.go | 2 +- .../delete_isolation_segment_command_test.go | 2 +- .../v6/isolated/delete_org_command_test.go | 2 +- .../delete_orphaned_routes_command_test.go | 2 +- .../v6/isolated/delete_quota_command_test.go | 2 +- .../delete_security_group_command_test.go | 2 +- .../v6/isolated/delete_space_command_test.go | 2 +- .../delete_space_quota_command_test.go | 2 +- .../v6/isolated/delete_user_command_test.go | 2 +- .../disable_feature_flag_command_test.go | 2 +- .../disable_org_isolation_command_test.go | 2 +- .../disable_service_access_command_test.go | 4 +- .../v6/isolated/disallow_ssh_command_test.go | 4 +- .../v6/isolated/domains_command_test.go | 2 +- .../enable_feature_flag_command_test.go | 2 +- .../enable_org_isolation_command_test.go | 2 +- .../enable_service_access_command_test.go | 4 +- .../v6/isolated/feature_flag_command_test.go | 2 +- .../v6/isolated/feature_flags_command_test.go | 2 +- .../isolated/get_health_check_command_test.go | 2 +- integration/v6/isolated/help_command_test.go | 2 +- .../v6/isolated/isolated_suite_test.go | 2 +- .../isolation_segments_command_test.go | 2 +- integration/v6/isolated/login_command_test.go | 12 ++-- .../v6/isolated/logout_command_test.go | 4 +- integration/v6/isolated/logs_command_test.go | 2 +- .../v6/isolated/marketplace_command_test.go | 4 +- .../isolated/network_policies_command_test.go | 2 +- integration/v6/isolated/oauth_client_test.go | 4 +- .../v6/isolated/oauth_token_command_test.go | 4 +- integration/v6/isolated/org_command_test.go | 2 +- .../v6/isolated/org_users_command_test.go | 2 +- integration/v6/isolated/orgs_command_test.go | 2 +- .../v6/isolated/proxy_connection_test.go | 2 +- .../purge_service_offering_command_test.go | 4 +- .../remove_network_policy_command_test.go | 2 +- .../rename_service_broker_command_test.go | 4 +- ..._default_isolation_segment_command_test.go | 2 +- .../reset_space_isolation_segment_test.go | 2 +- .../v6/isolated/restage_command_test.go | 2 +- .../v6/isolated/restart_command_test.go | 2 +- .../v6/isolated/run_task_command_test.go | 2 +- integration/v6/isolated/scale_command_test.go | 2 +- .../isolated/security_groups_command_test.go | 4 +- .../isolated/service_access_command_test.go | 4 +- .../isolated/service_brokers_command_test.go | 4 +- .../v6/isolated/set_env_command_test.go | 2 +- .../isolated/set_health_check_command_test.go | 2 +- ..._default_isolation_segment_command_test.go | 2 +- .../v6/isolated/set_org_role_command_test.go | 2 +- .../v6/isolated/set_quota_command_test.go | 4 +- ...et_space_isolation_segment_command_test.go | 2 +- .../isolated/set_space_quota_command_test.go | 6 +- .../isolated/set_space_role_command_test.go | 2 +- integration/v6/isolated/space_command_test.go | 4 +- .../v6/isolated/space_quotas_command_test.go | 2 +- .../space_ssh_allowed_command_test.go | 2 +- .../v6/isolated/space_users_command_test.go | 2 +- .../v6/isolated/spaces_command_test.go | 2 +- .../v6/isolated/ssh_code_command_test.go | 2 +- integration/v6/isolated/ssh_command_test.go | 2 +- .../v6/isolated/ssh_enabled_command_test.go | 4 +- integration/v6/isolated/start_command_test.go | 2 +- .../v6/isolated/table_alignment_test.go | 2 +- .../v6/isolated/target_command_test.go | 4 +- integration/v6/isolated/tasks_command_test.go | 2 +- .../isolated/terminate_task_command_test.go | 2 +- integration/v6/isolated/token_refresh_test.go | 4 +- ...ind_running_security_group_command_test.go | 4 +- .../unbind_security_group_command_test.go | 2 +- .../v6/isolated/unset_env_command_test.go | 2 +- .../unset_space_quota_command_test.go | 2 +- .../v6/isolated/update_quota_command_test.go | 2 +- .../update_security_group_command_test.go | 4 +- .../update_service_broker_command_test.go | 4 +- .../update_space_quota_command_test.go | 4 +- integration/v6/isolated/verbose_flag_test.go | 6 +- integration/v6/push/app_flags_test.go | 4 +- .../push/bind_to_services_in_manifest_test.go | 4 +- integration/v6/push/buildpack_test.go | 2 +- .../combination_manifest_and_flag_test.go | 2 +- .../v6/push/deprecated_route_flags_test.go | 2 +- integration/v6/push/docker_test.go | 2 +- integration/v6/push/domain_test.go | 2 +- integration/v6/push/droplet_test.go | 2 +- integration/v6/push/flag_error_test.go | 2 +- integration/v6/push/health_check_test.go | 2 +- integration/v6/push/help_test.go | 2 +- .../v6/push/hostname_only_routing_test.go | 2 +- integration/v6/push/http_random_route_test.go | 2 +- .../v6/push/http_routes_in_manifest_test.go | 2 +- integration/v6/push/ignore_app_files_test.go | 2 +- integration/v6/push/instances_test.go | 2 +- .../v6/push/interpolate_manifest_test.go | 2 +- .../v6/push/interpolate_manifest_unix_test.go | 2 +- .../v6/push/multiple_apps_in_manifest_test.go | 2 +- .../push/name_only_client_credentials_test.go | 2 +- integration/v6/push/name_only_test.go | 2 +- integration/v6/push/no_hostname_test.go | 2 +- integration/v6/push/no_route_test.go | 2 +- integration/v6/push/no_start_test.go | 2 +- integration/v6/push/path_only_routing_test.go | 2 +- integration/v6/push/path_test.go | 2 +- integration/v6/push/path_windows_test.go | 2 +- integration/v6/push/push_suite_test.go | 2 +- integration/v6/push/resource_matching_test.go | 2 +- .../select_app_to_push_from_manifest_test.go | 2 +- .../v6/push/simple_manifest_only_test.go | 2 +- integration/v6/push/start_command_test.go | 2 +- integration/v6/push/symlink_resources_test.go | 2 +- integration/v6/push/symlink_test.go | 2 +- integration/v6/push/target_check_test.go | 2 +- integration/v6/push/tcp_random_route_test.go | 2 +- .../v6/push/tcp_routes_in_manifest_test.go | 2 +- .../v6/push/trigger_legacy_push_test.go | 2 +- ...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 +- integration/v7/global/service_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 +- .../v7/global/share_service_command_test.go | 4 +- ...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 +- .../v7/global/unshare_service_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 | 2 +- .../v7/isolated/bind_service_command_test.go | 4 +- .../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/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 | 4 +- .../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 | 4 +- .../v7/isolated/create_shared_domain_test.go | 4 +- .../v7/isolated/create_space_command_test.go | 4 +- .../create_space_quota_command_test.go | 4 +- .../v7/isolated/create_user_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_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 | 6 +- .../v7/isolated/logout_command_test.go | 4 +- integration/v7/isolated/logs_command_test.go | 4 +- .../v7/isolated/map_route_command_test.go | 4 +- .../v7/isolated/marketplace_command_test.go | 8 +-- .../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_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 | 6 +- .../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 +- .../v7/isolated/router_groups_command_test.go | 2 +- .../v7/isolated/routes_command_test.go | 4 +- .../v7/isolated/run_task_command_test.go | 2 +- integration/v7/isolated/scale_command_test.go | 8 +-- .../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 | 10 +-- .../v7/isolated/service_key_command_test.go | 4 +- .../v7/isolated/services_command_test.go | 10 +-- .../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 +- 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 | 2 +- .../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 | 2 +- .../isolated/unbind_service_command_test.go | 4 +- .../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 +- .../isolated/update_org_quota_command_test.go | 2 +- .../update_service_broker_command_test.go | 4 +- .../isolated/update_service_command_test.go | 11 +--- .../update_space_quota_command_test.go | 2 +- ...date_user_provided_service_command_test.go | 2 +- 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/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 +- 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 +- 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/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_resource.go | 2 +- resources/security_group_resource_test.go | 2 +- resources/service_broker_resource_test.go | 4 +- resources/service_instance_resource_test.go | 2 +- resources/service_offering_resource_test.go | 4 +- resources/service_plan_resource_test.go | 4 +- .../service_plan_visibility_resource_test.go | 2 +- resources/sidecar_resource.go | 2 +- resources/task_resource.go | 2 +- scripts/fly-execute-windows-integration.sh | 2 +- types/filtered_interface_test.go | 2 +- types/filtered_string_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 +- 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 +- util/configv3/env_test.go | 2 +- util/configv3/json_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/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/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 | 6 +- util/plugin/plugin.go | 10 +-- 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/url_test.go | 2 +- util/utilfakes/fake_sha1checksum.go | 2 +- util/v6manifestparser/application_test.go | 2 +- util/v6manifestparser/locator_test.go | 2 +- util/v6manifestparser/parser_test.go | 4 +- version/version_test.go | 2 +- 2591 files changed, 10321 insertions(+), 10327 deletions(-) diff --git a/.github/license/CF_NOTICE b/.github/license/CF_NOTICE index 280be3690b2..f923bec85c3 100644 --- a/.github/license/CF_NOTICE +++ b/.github/license/CF_NOTICE @@ -14,11 +14,11 @@ Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved Copyright (c) 2014-2015 Pivotal Software, Inc. and is licensed under the Apache License, Version 2.0. -This product includes software from https://github.com/code.cloudfoundry.org/cli/tree/main/vendor/code.cloudfoundry.org/ykk that is: +This product includes software from https://github.com/code.cloudfoundry.org/cli/v7/tree/main/vendor/code.cloudfoundry.org/ykk that is: Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. and is licensed under the Apache License, Version 2.0. -This product includes software from https://github.com/code.cloudfoundry.org/cli/tree/main/vendor/code.cloudfoundry.org/cfnetworking-cli-api that is: +This product includes software from https://github.com/code.cloudfoundry.org/cli/v7/tree/main/vendor/code.cloudfoundry.org/cfnetworking-cli-api that is: Copyright (c) 2016-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. and is licensed under the Apache License, Version 2.0. diff --git a/.github/win/integrations/integration-tests.ps1 b/.github/win/integrations/integration-tests.ps1 index abf951e9e96..1be0a470568 100644 --- a/.github/win/integrations/integration-tests.ps1 +++ b/.github/win/integrations/integration-tests.ps1 @@ -64,9 +64,9 @@ $Env:CF_DIAL_TIMEOUT=15 Import-Certificate -Filepath "$pwd\$CF_INT_NAME.router.ca" -CertStoreLocation "cert:\LocalMachine\root" New-Item "go/src/code.cloudfoundry.org" -Type Directory -New-Item -ItemType SymbolicLink -Path "$pwd/go/src/code.cloudfoundry.org/cli" -Target "$pwd" +New-Item -ItemType SymbolicLink -Path "$pwd/go/src/code.cloudfoundry.org/cli/v7" -Target "$pwd" -cd go/src/code.cloudfoundry.org/cli +cd go/src/code.cloudfoundry.org/cli/v7 go install github.com/akavel/rsrc@v0.10.2 Get-Command make diff --git a/.github/workflows/release-update-repos.yml b/.github/workflows/release-update-repos.yml index 40db98ec335..74d668a4fea 100644 --- a/.github/workflows/release-update-repos.yml +++ b/.github/workflows/release-update-repos.yml @@ -143,7 +143,7 @@ jobs: cat < cf-cli@${VERSION_MAJOR}.rb class CfCliAT${VERSION_MAJOR} < Formula desc "Cloud Foundry CLI" - homepage "https://code.cloudfoundry.org/cli" + homepage "https://code.cloudfoundry.org/cli/v7" version "${VERSION_BUILD}" if OS.mac? diff --git a/Makefile b/Makefile index fdd2d96a4e6..c3912fe6eac 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/v7/version.binarySHA=$(CF_BUILD_SHA) \ + -X code.cloudfoundry.org/cli/v7/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/v7/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/*") diff --git a/actor/actionerror/duplicate_service_error_test.go b/actor/actionerror/duplicate_service_error_test.go index b20248eabf4..0a82c05bd49 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/v7/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 5064f30a299..5772c547df0 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/v7/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 d372f412210..16ae1c8eb36 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/v7/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 d579b5179e9..00338fd895e 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/v7/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 a6bef9120b2..fb64738b805 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/v7/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 9e24916afe9..b3b4d7adbbf 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/v7/actor/actionerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/security_group_not_bound_error.go b/actor/actionerror/security_group_not_bound_error.go index 3be7b2c95df..dcb233e9f7b 100644 --- a/actor/actionerror/security_group_not_bound_error.go +++ b/actor/actionerror/security_group_not_bound_error.go @@ -3,7 +3,7 @@ package actionerror import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) // SecurityGroupNotBoundError is returned when a requested security group is 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 7714874d621..5322af223c1 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/v7/api/cloudcontroller/ccv3/constant" ) // SecurityGroupNotBoundToSpaceError is returned when a requested security group is diff --git a/actor/actionerror/service_not_found_error_test.go b/actor/actionerror/service_not_found_error_test.go index 5062830a5c7..9107f17cc2a 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/v7/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 b7ec5351959..a69ba86b7b2 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/v7/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 d1965ac1dae..7a79b7e6557 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/v7/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 ad8647e8030..76b107edf1b 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/v7/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 57f50c8ee19..35b59a073bc 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/v7/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 f83e102f681..66adc82d0af 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/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) type FakeCloudControllerClient struct { diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_networking_client.go index ce5fc06a3e2..1c29a4d6798 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/v7/actor/cfnetworkingaction" ) type FakeNetworkingClient struct { diff --git a/actor/cfnetworkingaction/cloud_controller_client.go b/actor/cfnetworkingaction/cloud_controller_client.go index c5d6c48c91b..3fadb3d497a 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/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/cfnetworkingaction/policy.go b/actor/cfnetworkingaction/policy.go index f2e752e5cf5..d9f92bf4171 100644 --- a/actor/cfnetworkingaction/policy.go +++ b/actor/cfnetworkingaction/policy.go @@ -2,11 +2,11 @@ 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/batcher" ) type Policy struct { diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go index 539a7aab427..7cd57eeba8d 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/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/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 0d0a0f9e073..980041b46ee 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/v7/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 c3e4f0fdd82..60f0b4eabf9 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/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 74410faa41f..56f758cd526 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/v7/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 a1ad68e5758..5a82d0754f2 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/generic" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/actor/pluginaction/install_test.go b/actor/pluginaction/install_test.go index c1f2854af6b..977abd2af78 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 5f0fa9b6113..ff06e294618 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v7/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 b62c3da5d8e..05d7d1c422d 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/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 0ea20b8a87d..42f0674fd64 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/v7/actor/actionerror" "github.com/blang/semver/v4" ) diff --git a/actor/pluginaction/list_test.go b/actor/pluginaction/list_test.go index 55ba1158bb0..2fb013fa43d 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/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 b7cb8071711..ce81b82f14e 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/v7/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 8ca0133f286..bdd9cc742f0 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/generic" ) type PluginInfo struct { diff --git a/actor/pluginaction/plugin_info_test.go b/actor/pluginaction/plugin_info_test.go index 2ec6c6d3e15..be9d658225e 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/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 600ba67a91c..d3098cb1331 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 468e18ea737..8295ab38d27 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/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 8d72e434889..f1a29831233 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/v7/actor/pluginaction" ) type FakeCommandList struct { diff --git a/actor/pluginaction/pluginactionfakes/fake_config.go b/actor/pluginaction/pluginactionfakes/fake_config.go index 4d2581800e7..cccd4fd3f32 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type FakeConfig struct { diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_client.go b/actor/pluginaction/pluginactionfakes/fake_plugin_client.go index 4cd201cd615..18e4e7697a7 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/api/plugin" ) type FakePluginClient struct { diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go b/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go index 47d16dc403e..610d2a67cb7 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type FakePluginMetadata struct { diff --git a/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go b/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go index 060fa438753..fbce35bb711 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/v7/actor/pluginaction" ) type FakePluginUninstaller struct { diff --git a/actor/pluginaction/uninstall.go b/actor/pluginaction/uninstall.go index 485217256b9..3869cb4fc42 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/v7/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 944ee5c5075..fd28bd0700c 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/actor/pluginaction/pluginactionfakes" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/actor.go b/actor/pushaction/actor.go index 889feec72dd..9e648956a41 100644 --- a/actor/pushaction/actor.go +++ b/actor/pushaction/actor.go @@ -5,7 +5,7 @@ package pushaction import ( "regexp" - "code.cloudfoundry.org/cli/util/randomword" + "code.cloudfoundry.org/cli/v7/util/randomword" ) // Warnings is a list of warnings returned back from the cloud controller diff --git a/actor/pushaction/actualize.go b/actor/pushaction/actualize.go index 2d0d0b9b5f8..a9aaeb97025 100644 --- a/actor/pushaction/actualize.go +++ b/actor/pushaction/actualize.go @@ -3,8 +3,8 @@ package pushaction import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" log "github.com/sirupsen/logrus" ) diff --git a/actor/pushaction/actualize_test.go b/actor/pushaction/actualize_test.go index bcaf901e4c2..cfe03283e74 100644 --- a/actor/pushaction/actualize_test.go +++ b/actor/pushaction/actualize_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/application.go b/actor/pushaction/application.go index 227c1140993..37cb1de27a9 100644 --- a/actor/pushaction/application.go +++ b/actor/pushaction/application.go @@ -3,12 +3,12 @@ package pushaction import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/types" log "github.com/sirupsen/logrus" ) diff --git a/actor/pushaction/application_config.go b/actor/pushaction/application_config.go index afaa0fb7718..d16fe264f44 100644 --- a/actor/pushaction/application_config.go +++ b/actor/pushaction/application_config.go @@ -4,10 +4,10 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/util/manifest" log "github.com/sirupsen/logrus" ) diff --git a/actor/pushaction/application_config_test.go b/actor/pushaction/application_config_test.go index 665c3ce825e..4df493d3741 100644 --- a/actor/pushaction/application_config_test.go +++ b/actor/pushaction/application_config_test.go @@ -6,16 +6,16 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/pushaction/application_test.go b/actor/pushaction/application_test.go index 57fc6f11cf8..778c5b90731 100644 --- a/actor/pushaction/application_test.go +++ b/actor/pushaction/application_test.go @@ -3,14 +3,14 @@ package pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/apply.go b/actor/pushaction/apply.go index 8a03e835c1d..3fc3422f54a 100644 --- a/actor/pushaction/apply.go +++ b/actor/pushaction/apply.go @@ -3,8 +3,8 @@ package pushaction import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" log "github.com/sirupsen/logrus" ) diff --git a/actor/pushaction/apply_test.go b/actor/pushaction/apply_test.go index 86e663c3541..31c076a4a6a 100644 --- a/actor/pushaction/apply_test.go +++ b/actor/pushaction/apply_test.go @@ -4,12 +4,12 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/command_line_settings.go b/actor/pushaction/command_line_settings.go index 832241854a4..878d4cf5a08 100644 --- a/actor/pushaction/command_line_settings.go +++ b/actor/pushaction/command_line_settings.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifest" ) type CommandLineSettings struct { diff --git a/actor/pushaction/command_line_settings_test.go b/actor/pushaction/command_line_settings_test.go index 159384b49c9..d01ee269e08 100644 --- a/actor/pushaction/command_line_settings_test.go +++ b/actor/pushaction/command_line_settings_test.go @@ -1,9 +1,9 @@ package pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/command_line_settings_unix_test.go b/actor/pushaction/command_line_settings_unix_test.go index b18f964ccb7..975d9ac35d6 100644 --- a/actor/pushaction/command_line_settings_unix_test.go +++ b/actor/pushaction/command_line_settings_unix_test.go @@ -4,8 +4,8 @@ package pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/command_line_settings_windows_test.go b/actor/pushaction/command_line_settings_windows_test.go index 3def2082921..2eb2f1aee2e 100644 --- a/actor/pushaction/command_line_settings_windows_test.go +++ b/actor/pushaction/command_line_settings_windows_test.go @@ -4,8 +4,8 @@ package pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/domain.go b/actor/pushaction/domain.go index b1b47e968b9..426e5ed650d 100644 --- a/actor/pushaction/domain.go +++ b/actor/pushaction/domain.go @@ -1,8 +1,8 @@ package pushaction import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" log "github.com/sirupsen/logrus" ) diff --git a/actor/pushaction/domain_test.go b/actor/pushaction/domain_test.go index 1cf4307b6ed..d9431bdd1bd 100644 --- a/actor/pushaction/domain_test.go +++ b/actor/pushaction/domain_test.go @@ -3,10 +3,10 @@ package pushaction_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v2action" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/merge_and_validate_settings_and_manifest.go b/actor/pushaction/merge_and_validate_settings_and_manifest.go index 619d0fe117d..327489eb5e3 100644 --- a/actor/pushaction/merge_and_validate_settings_and_manifest.go +++ b/actor/pushaction/merge_and_validate_settings_and_manifest.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/util/manifest" log "github.com/sirupsen/logrus" ) diff --git a/actor/pushaction/merge_and_validate_settings_and_manifest_test.go b/actor/pushaction/merge_and_validate_settings_and_manifest_test.go index 3794e6489df..464036f4c8a 100644 --- a/actor/pushaction/merge_and_validate_settings_and_manifest_test.go +++ b/actor/pushaction/merge_and_validate_settings_and_manifest_test.go @@ -3,10 +3,10 @@ package pushaction_test import ( "os" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/merge_and_validate_settings_and_manifest_unix_test.go b/actor/pushaction/merge_and_validate_settings_and_manifest_unix_test.go index b0b5dbd7625..e43ce3c39be 100644 --- a/actor/pushaction/merge_and_validate_settings_and_manifest_unix_test.go +++ b/actor/pushaction/merge_and_validate_settings_and_manifest_unix_test.go @@ -4,9 +4,9 @@ package pushaction_test import ( - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/merge_and_validate_settings_and_manifest_windows_test.go b/actor/pushaction/merge_and_validate_settings_and_manifest_windows_test.go index 94f753d0290..3eefadfb9c7 100644 --- a/actor/pushaction/merge_and_validate_settings_and_manifest_windows_test.go +++ b/actor/pushaction/merge_and_validate_settings_and_manifest_windows_test.go @@ -6,9 +6,9 @@ package pushaction_test import ( "path/filepath" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/push_plan.go b/actor/pushaction/push_plan.go index f4d0c99a68e..a98007bcd1a 100644 --- a/actor/pushaction/push_plan.go +++ b/actor/pushaction/push_plan.go @@ -1,9 +1,9 @@ package pushaction import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" ) type PushPlan struct { diff --git a/actor/pushaction/push_plan_test.go b/actor/pushaction/push_plan_test.go index bec633ec4ff..a7e9a0f9479 100644 --- a/actor/pushaction/push_plan_test.go +++ b/actor/pushaction/push_plan_test.go @@ -4,11 +4,11 @@ import ( "errors" "os" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/pushaction_suite_test.go b/actor/pushaction/pushaction_suite_test.go index c78acfb29a0..4dfab5937a4 100644 --- a/actor/pushaction/pushaction_suite_test.go +++ b/actor/pushaction/pushaction_suite_test.go @@ -4,8 +4,8 @@ import ( "os" "time" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" diff --git a/actor/pushaction/pushactionfakes/fake_progress_bar.go b/actor/pushaction/pushactionfakes/fake_progress_bar.go index 0ed2bc7f8b3..feba810ab13 100644 --- a/actor/pushaction/pushactionfakes/fake_progress_bar.go +++ b/actor/pushaction/pushactionfakes/fake_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction" ) type FakeProgressBar struct { diff --git a/actor/pushaction/pushactionfakes/fake_random_word_generator.go b/actor/pushaction/pushactionfakes/fake_random_word_generator.go index f640c2f92d1..5f254f82d04 100644 --- a/actor/pushaction/pushactionfakes/fake_random_word_generator.go +++ b/actor/pushaction/pushactionfakes/fake_random_word_generator.go @@ -4,7 +4,7 @@ package pushactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction" ) type FakeRandomWordGenerator struct { diff --git a/actor/pushaction/pushactionfakes/fake_shared_actor.go b/actor/pushaction/pushactionfakes/fake_shared_actor.go index 10c9df4634f..1b8c5819905 100644 --- a/actor/pushaction/pushactionfakes/fake_shared_actor.go +++ b/actor/pushaction/pushactionfakes/fake_shared_actor.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" ) type FakeSharedActor struct { diff --git a/actor/pushaction/pushactionfakes/fake_v2actor.go b/actor/pushaction/pushactionfakes/fake_v2actor.go index 514ddd2fe99..0512f6b575b 100644 --- a/actor/pushaction/pushactionfakes/fake_v2actor.go +++ b/actor/pushaction/pushactionfakes/fake_v2actor.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" ) type FakeV2Actor struct { diff --git a/actor/pushaction/pushactionfakes/fake_v3actor.go b/actor/pushaction/pushactionfakes/fake_v3actor.go index 0f5739c4477..73312d78f78 100644 --- a/actor/pushaction/pushactionfakes/fake_v3actor.go +++ b/actor/pushaction/pushactionfakes/fake_v3actor.go @@ -5,9 +5,9 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" ) type FakeV3Actor struct { diff --git a/actor/pushaction/read_manifest.go b/actor/pushaction/read_manifest.go index bdfadb91810..ba617b9e3bd 100644 --- a/actor/pushaction/read_manifest.go +++ b/actor/pushaction/read_manifest.go @@ -1,7 +1,7 @@ package pushaction import ( - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/util/manifest" "github.com/cloudfoundry/bosh-cli/director/template" ) diff --git a/actor/pushaction/read_manifest_test.go b/actor/pushaction/read_manifest_test.go index d4b2dd4b929..c9980fe05cb 100644 --- a/actor/pushaction/read_manifest_test.go +++ b/actor/pushaction/read_manifest_test.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifest" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" diff --git a/actor/pushaction/resource.go b/actor/pushaction/resource.go index 43e94e1f45b..838f590579a 100644 --- a/actor/pushaction/resource.go +++ b/actor/pushaction/resource.go @@ -3,8 +3,8 @@ package pushaction import ( "os" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" log "github.com/sirupsen/logrus" ) @@ -15,7 +15,7 @@ func (actor Actor) CreateArchive(config ApplicationConfig) (string, error) { var archivePath string var err error - //change to look at unmatched + // change to look at unmatched if config.Archive { archivePath, err = actor.SharedActor.ZipArchiveResources(config.Path, actor.ConvertV2ResourcesToSharedResources(config.UnmatchedResources)) } else { diff --git a/actor/pushaction/resource_test.go b/actor/pushaction/resource_test.go index 4831a65e311..cb0c4b89871 100644 --- a/actor/pushaction/resource_test.go +++ b/actor/pushaction/resource_test.go @@ -6,9 +6,9 @@ import ( "os" "strings" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/v2action" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v2action" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/route.go b/actor/pushaction/route.go index 34c02821f0d..e1b11be5ac0 100644 --- a/actor/pushaction/route.go +++ b/actor/pushaction/route.go @@ -6,10 +6,10 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifest" log "github.com/sirupsen/logrus" ) diff --git a/actor/pushaction/route_test.go b/actor/pushaction/route_test.go index 6ebc9db7443..ab78b2587c5 100644 --- a/actor/pushaction/route_test.go +++ b/actor/pushaction/route_test.go @@ -4,12 +4,12 @@ import ( "errors" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/service_binding_test.go b/actor/pushaction/service_binding_test.go index 2223a67987f..ddaed876040 100644 --- a/actor/pushaction/service_binding_test.go +++ b/actor/pushaction/service_binding_test.go @@ -3,9 +3,9 @@ package pushaction_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - "code.cloudfoundry.org/cli/actor/v2action" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v2action" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/pushaction/shared_actor.go b/actor/pushaction/shared_actor.go index 889446e6dd6..da0844fd239 100644 --- a/actor/pushaction/shared_actor.go +++ b/actor/pushaction/shared_actor.go @@ -3,7 +3,7 @@ package pushaction import ( "io" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io.ReadCloser diff --git a/actor/pushaction/v2_actor.go b/actor/pushaction/v2_actor.go index 129bd4c6c8a..839c130f323 100644 --- a/actor/pushaction/v2_actor.go +++ b/actor/pushaction/v2_actor.go @@ -3,7 +3,7 @@ package pushaction import ( "io" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V2Actor diff --git a/actor/pushaction/v3_actor.go b/actor/pushaction/v3_actor.go index 22658940969..3bb4773f9c0 100644 --- a/actor/pushaction/v3_actor.go +++ b/actor/pushaction/v3_actor.go @@ -3,8 +3,8 @@ package pushaction import ( "io" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V3Actor diff --git a/actor/pushaction/version_test.go b/actor/pushaction/version_test.go index 8afd9bfd3b4..a713e98a7f9 100644 --- a/actor/pushaction/version_test.go +++ b/actor/pushaction/version_test.go @@ -1,8 +1,8 @@ package pushaction_test import ( - . "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" + . "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/pushaction/pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/check_target.go b/actor/sharedaction/check_target.go index 5621e845054..7f1108b4d73 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/v7/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 d59d7e0994d..a422f4b9a56 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 ad009775387..a1ff68f0689 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/util/sorting" ) const ( diff --git a/actor/sharedaction/help_test.go b/actor/sharedaction/help_test.go index 60bd52a4893..76840957029 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/sharedaction/is_logged_in_test.go b/actor/sharedaction/is_logged_in_test.go index c6a849c5807..23e6ee0be22 100644 --- a/actor/sharedaction/is_logged_in_test.go +++ b/actor/sharedaction/is_logged_in_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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 0006bcdd593..25cf55e61d6 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 981f0a992a7..38e1e3a9dc9 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 ad32d23f92c..a5ad4e08443 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 1a98ef16761..170c126291a 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/v7/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 107b564bc73..5f30c4ad876 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 1f717317f63..f8c711e3780 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 1bfadd2309e..42a8eca4495 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/v7/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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 1f19be1308f..725828bc67b 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 b29cf9858ca..f8edd8029db 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 af276009b0c..c73852c01e3 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/v7/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 a374545c5d1..c58fe25e73f 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/v7/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 c1ea84c096d..84ce92518a9 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/v7/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 a9fa609a871..909a661aeec 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/util/clissh" ) type FakeSecureShellClient struct { diff --git a/actor/sharedaction/ssh.go b/actor/sharedaction/ssh.go index 600d4cc3ec8..6c9ae018aff 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/v7/util/clissh" type TTYOption clissh.TTYRequest diff --git a/actor/sharedaction/ssh_test.go b/actor/sharedaction/ssh_test.go index 9a6519f9657..aae82156a4d 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v7/util/clissh" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/application.go b/actor/v2action/application.go index 8de03228ec5..346063aeab6 100644 --- a/actor/v2action/application.go +++ b/actor/v2action/application.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type ApplicationStateChange string diff --git a/actor/v2action/application_instance.go b/actor/v2action/application_instance.go index 82850b6199d..b5984bf5b1c 100644 --- a/actor/v2action/application_instance.go +++ b/actor/v2action/application_instance.go @@ -1,10 +1,10 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type ApplicationInstanceState constant.ApplicationInstanceState diff --git a/actor/v2action/application_instance_test.go b/actor/v2action/application_instance_test.go index fb92d5ee902..e4ad0f13502 100644 --- a/actor/v2action/application_instance_test.go +++ b/actor/v2action/application_instance_test.go @@ -3,12 +3,12 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/application_instance_with_stats.go b/actor/v2action/application_instance_with_stats.go index d0dccbc4437..26f64dc2ecd 100644 --- a/actor/v2action/application_instance_with_stats.go +++ b/actor/v2action/application_instance_with_stats.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) type ApplicationInstanceWithStats struct { diff --git a/actor/v2action/application_instance_with_stats_test.go b/actor/v2action/application_instance_with_stats_test.go index d4a58e1c487..f94d13aa84a 100644 --- a/actor/v2action/application_instance_with_stats_test.go +++ b/actor/v2action/application_instance_with_stats_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/application_summary.go b/actor/v2action/application_summary.go index f44277deabb..781d1e099bc 100644 --- a/actor/v2action/application_summary.go +++ b/actor/v2action/application_summary.go @@ -1,8 +1,8 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type ApplicationSummary struct { diff --git a/actor/v2action/application_summary_test.go b/actor/v2action/application_summary_test.go index 062d8d6df2a..81bd618adc0 100644 --- a/actor/v2action/application_summary_test.go +++ b/actor/v2action/application_summary_test.go @@ -3,12 +3,12 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/application_test.go b/actor/v2action/application_test.go index a457bb5b2ef..d8e4fabe4ff 100644 --- a/actor/v2action/application_test.go +++ b/actor/v2action/application_test.go @@ -4,13 +4,13 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/auth.go b/actor/v2action/auth.go index 8b3457ec7c5..ac3199a9aa2 100644 --- a/actor/v2action/auth.go +++ b/actor/v2action/auth.go @@ -3,8 +3,8 @@ package v2action import ( "fmt" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" ) // Authenticate authenticates the user in UAA and sets the returned tokens in diff --git a/actor/v2action/auth_test.go b/actor/v2action/auth_test.go index d3609d8cf99..f3be2bc7915 100644 --- a/actor/v2action/auth_test.go +++ b/actor/v2action/auth_test.go @@ -3,10 +3,10 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/buildpack.go b/actor/v2action/buildpack.go index 9741eb4ca6e..82a114e7d0c 100644 --- a/actor/v2action/buildpack.go +++ b/actor/v2action/buildpack.go @@ -7,13 +7,13 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util" - "code.cloudfoundry.org/cli/util/download" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util" + "code.cloudfoundry.org/cli/v7/util/download" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/actor/v2action/buildpack_test.go b/actor/v2action/buildpack_test.go index b3d206fd4c6..bb0a7d5fa44 100644 --- a/actor/v2action/buildpack_test.go +++ b/actor/v2action/buildpack_test.go @@ -10,13 +10,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" ) var _ = Describe("Buildpack", func() { @@ -851,7 +851,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/v2action/buildpack_unix_test.go b/actor/v2action/buildpack_unix_test.go index 29140ea9c8d..ecbe791dabe 100644 --- a/actor/v2action/buildpack_unix_test.go +++ b/actor/v2action/buildpack_unix_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v2action/buildpack_windows_test.go b/actor/v2action/buildpack_windows_test.go index c1d56bb8d76..d50dbf27d18 100644 --- a/actor/v2action/buildpack_windows_test.go +++ b/actor/v2action/buildpack_windows_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v2action/cloud_controller_client.go b/actor/v2action/cloud_controller_client.go index 1e16648b688..71cf2762349 100644 --- a/actor/v2action/cloud_controller_client.go +++ b/actor/v2action/cloud_controller_client.go @@ -3,7 +3,7 @@ package v2action import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/v2action/composite/compositefakes/fake_broker_actor.go b/actor/v2action/composite/compositefakes/fake_broker_actor.go index 08695bc137d..f630661ff74 100644 --- a/actor/v2action/composite/compositefakes/fake_broker_actor.go +++ b/actor/v2action/composite/compositefakes/fake_broker_actor.go @@ -4,8 +4,8 @@ package compositefakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" ) type FakeBrokerActor struct { diff --git a/actor/v2action/composite/compositefakes/fake_get_apiversion_actor.go b/actor/v2action/composite/compositefakes/fake_get_apiversion_actor.go index 26ae63f6e1b..2bdb0dffbc3 100644 --- a/actor/v2action/composite/compositefakes/fake_get_apiversion_actor.go +++ b/actor/v2action/composite/compositefakes/fake_get_apiversion_actor.go @@ -4,7 +4,7 @@ package compositefakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" ) type FakeGetAPIVersionActor struct { diff --git a/actor/v2action/composite/compositefakes/fake_get_service_instance_actor.go b/actor/v2action/composite/compositefakes/fake_get_service_instance_actor.go index 0c2085845ef..9b3a5c661bb 100644 --- a/actor/v2action/composite/compositefakes/fake_get_service_instance_actor.go +++ b/actor/v2action/composite/compositefakes/fake_get_service_instance_actor.go @@ -4,8 +4,8 @@ package compositefakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" ) type FakeGetServiceInstanceActor struct { diff --git a/actor/v2action/composite/compositefakes/fake_get_service_plan_actor.go b/actor/v2action/composite/compositefakes/fake_get_service_plan_actor.go index 2cb5dfb1d27..8909be8803a 100644 --- a/actor/v2action/composite/compositefakes/fake_get_service_plan_actor.go +++ b/actor/v2action/composite/compositefakes/fake_get_service_plan_actor.go @@ -4,8 +4,8 @@ package compositefakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" ) type FakeGetServicePlanActor struct { diff --git a/actor/v2action/composite/compositefakes/fake_organization_actor.go b/actor/v2action/composite/compositefakes/fake_organization_actor.go index a6ed2f8aab0..4c6863221b7 100644 --- a/actor/v2action/composite/compositefakes/fake_organization_actor.go +++ b/actor/v2action/composite/compositefakes/fake_organization_actor.go @@ -4,8 +4,8 @@ package compositefakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" ) type FakeOrganizationActor struct { diff --git a/actor/v2action/composite/compositefakes/fake_service_actor.go b/actor/v2action/composite/compositefakes/fake_service_actor.go index c6d34ba7b85..4bc1c668ba7 100644 --- a/actor/v2action/composite/compositefakes/fake_service_actor.go +++ b/actor/v2action/composite/compositefakes/fake_service_actor.go @@ -4,8 +4,8 @@ package compositefakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" ) type FakeServiceActor struct { diff --git a/actor/v2action/composite/compositefakes/fake_update_service_instance_maintenance_info_actor.go b/actor/v2action/composite/compositefakes/fake_update_service_instance_maintenance_info_actor.go index bc73a201b5c..57e4acfc1fd 100644 --- a/actor/v2action/composite/compositefakes/fake_update_service_instance_maintenance_info_actor.go +++ b/actor/v2action/composite/compositefakes/fake_update_service_instance_maintenance_info_actor.go @@ -4,8 +4,8 @@ package compositefakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" ) type FakeUpdateServiceInstanceMaintenanceInfoActor struct { diff --git a/actor/v2action/composite/compositefakes/fake_visibility_actor.go b/actor/v2action/composite/compositefakes/fake_visibility_actor.go index 7c4928fbafa..5282d2d7d4f 100644 --- a/actor/v2action/composite/compositefakes/fake_visibility_actor.go +++ b/actor/v2action/composite/compositefakes/fake_visibility_actor.go @@ -4,8 +4,8 @@ package compositefakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" ) type FakeVisibilityActor struct { diff --git a/actor/v2action/composite/service_broker_summary.go b/actor/v2action/composite/service_broker_summary.go index b59d17e5ec5..f57fcf68f15 100644 --- a/actor/v2action/composite/service_broker_summary.go +++ b/actor/v2action/composite/service_broker_summary.go @@ -1,9 +1,9 @@ package composite import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceActor diff --git a/actor/v2action/composite/service_broker_summary_test.go b/actor/v2action/composite/service_broker_summary_test.go index e7f05a270b5..edc77dc0238 100644 --- a/actor/v2action/composite/service_broker_summary_test.go +++ b/actor/v2action/composite/service_broker_summary_test.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - . "code.cloudfoundry.org/cli/actor/v2action/composite" - "code.cloudfoundry.org/cli/actor/v2action/composite/compositefakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + . "code.cloudfoundry.org/cli/v7/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite/compositefakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2action/composite/update_service_instance.go b/actor/v2action/composite/update_service_instance.go index d16aaabfa85..75926764a4d 100644 --- a/actor/v2action/composite/update_service_instance.go +++ b/actor/v2action/composite/update_service_instance.go @@ -1,8 +1,8 @@ package composite import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . GetServiceInstanceActor diff --git a/actor/v2action/composite/update_service_instance_test.go b/actor/v2action/composite/update_service_instance_test.go index 57e66e6e768..4daf71d91e9 100644 --- a/actor/v2action/composite/update_service_instance_test.go +++ b/actor/v2action/composite/update_service_instance_test.go @@ -3,11 +3,11 @@ package composite_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - . "code.cloudfoundry.org/cli/actor/v2action/composite" - "code.cloudfoundry.org/cli/actor/v2action/composite/compositefakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + . "code.cloudfoundry.org/cli/v7/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite/compositefakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/config.go b/actor/v2action/config.go index 124af1c91f0..b0092ae773b 100644 --- a/actor/v2action/config.go +++ b/actor/v2action/config.go @@ -3,7 +3,7 @@ package v2action import ( "time" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/v2action/domain.go b/actor/v2action/domain.go index c8fc7ba2ff3..1f3b90c7c1e 100644 --- a/actor/v2action/domain.go +++ b/actor/v2action/domain.go @@ -1,10 +1,10 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" log "github.com/sirupsen/logrus" ) diff --git a/actor/v2action/domain_test.go b/actor/v2action/domain_test.go index c787de28dc2..4d0d5a2616d 100644 --- a/actor/v2action/domain_test.go +++ b/actor/v2action/domain_test.go @@ -3,12 +3,12 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/feature_flag.go b/actor/v2action/feature_flag.go index c84e1d9e7d9..f4f53cfa4e0 100644 --- a/actor/v2action/feature_flag.go +++ b/actor/v2action/feature_flag.go @@ -1,6 +1,6 @@ package v2action -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" +import "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" type FeatureFlagState string diff --git a/actor/v2action/feature_flag_test.go b/actor/v2action/feature_flag_test.go index 26ffd1cc1f8..556ce040bd0 100644 --- a/actor/v2action/feature_flag_test.go +++ b/actor/v2action/feature_flag_test.go @@ -3,9 +3,9 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/job.go b/actor/v2action/job.go index 211d8e140aa..69736a8713a 100644 --- a/actor/v2action/job.go +++ b/actor/v2action/job.go @@ -3,7 +3,7 @@ package v2action import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) type Job ccv2.Job diff --git a/actor/v2action/job_test.go b/actor/v2action/job_test.go index 325a14b90c9..e917d3ce740 100644 --- a/actor/v2action/job_test.go +++ b/actor/v2action/job_test.go @@ -5,9 +5,9 @@ import ( "io" "strings" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/logging.go b/actor/v2action/logging.go index fc45232a404..f56c26d63bd 100644 --- a/actor/v2action/logging.go +++ b/actor/v2action/logging.go @@ -8,7 +8,7 @@ import ( "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" ) func (actor Actor) GetStreamingLogs(appGUID string, client sharedaction.LogCacheClient) (<-chan sharedaction.LogMessage, <-chan error, context.CancelFunc) { diff --git a/actor/v2action/logging_test.go b/actor/v2action/logging_test.go index 3b3f49f61b3..6bb967ea03a 100644 --- a/actor/v2action/logging_test.go +++ b/actor/v2action/logging_test.go @@ -5,13 +5,13 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/integration/helpers" 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/v2action/manifest.go b/actor/v2action/manifest.go index 6fb36f9055d..e845bdf593e 100644 --- a/actor/v2action/manifest.go +++ b/actor/v2action/manifest.go @@ -1,8 +1,8 @@ package v2action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/util/manifest" ) func (actor Actor) CreateApplicationManifestByNameAndSpace(appName string, spaceGUID string) (manifest.Application, Warnings, error) { diff --git a/actor/v2action/manifest_test.go b/actor/v2action/manifest_test.go index fd1230372e7..12dbb17e05c 100644 --- a/actor/v2action/manifest_test.go +++ b/actor/v2action/manifest_test.go @@ -3,12 +3,12 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifest" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v2action/organization.go b/actor/v2action/organization.go index 72c656a574d..54cc48ce44f 100644 --- a/actor/v2action/organization.go +++ b/actor/v2action/organization.go @@ -1,11 +1,11 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - uaaconst "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + uaaconst "code.cloudfoundry.org/cli/v7/api/uaa/constant" ) // Organization represents a CLI Organization. diff --git a/actor/v2action/organization_quota.go b/actor/v2action/organization_quota.go index b9f5a0480d9..27974faa114 100644 --- a/actor/v2action/organization_quota.go +++ b/actor/v2action/organization_quota.go @@ -1,10 +1,10 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type OrganizationQuota ccv2.OrganizationQuota diff --git a/actor/v2action/organization_quota_test.go b/actor/v2action/organization_quota_test.go index 341ad13b16d..9417c199701 100644 --- a/actor/v2action/organization_quota_test.go +++ b/actor/v2action/organization_quota_test.go @@ -3,12 +3,12 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/organization_summary_test.go b/actor/v2action/organization_summary_test.go index c48eef7de11..03fd3a10e78 100644 --- a/actor/v2action/organization_summary_test.go +++ b/actor/v2action/organization_summary_test.go @@ -3,9 +3,9 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/organization_test.go b/actor/v2action/organization_test.go index a6f3861713d..a84c55197a7 100644 --- a/actor/v2action/organization_test.go +++ b/actor/v2action/organization_test.go @@ -3,13 +3,13 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - uaaconst "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + uaaconst "code.cloudfoundry.org/cli/v7/api/uaa/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v2action/resource.go b/actor/v2action/resource.go index bd3bdf75127..6962e3d0793 100644 --- a/actor/v2action/resource.go +++ b/actor/v2action/resource.go @@ -1,7 +1,7 @@ package v2action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" log "github.com/sirupsen/logrus" ) diff --git a/actor/v2action/resource_test.go b/actor/v2action/resource_test.go index ea0825037a1..3aae43ed165 100644 --- a/actor/v2action/resource_test.go +++ b/actor/v2action/resource_test.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/route.go b/actor/v2action/route.go index 816ff4d75e6..bfb501c5bb4 100644 --- a/actor/v2action/route.go +++ b/actor/v2action/route.go @@ -5,11 +5,11 @@ import ( "path" "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" log "github.com/sirupsen/logrus" ) diff --git a/actor/v2action/route_test.go b/actor/v2action/route_test.go index 29f4bd3458d..b1049961e46 100644 --- a/actor/v2action/route_test.go +++ b/actor/v2action/route_test.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/router_client.go b/actor/v2action/router_client.go index 4cd3592d87e..368deb94f8b 100644 --- a/actor/v2action/router_client.go +++ b/actor/v2action/router_client.go @@ -1,6 +1,6 @@ package v2action -import "code.cloudfoundry.org/cli/api/router" +import "code.cloudfoundry.org/cli/v7/api/router" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . RouterClient diff --git a/actor/v2action/router_group.go b/actor/v2action/router_group.go index 111ba02b4c8..a7ac82b93b9 100644 --- a/actor/v2action/router_group.go +++ b/actor/v2action/router_group.go @@ -1,10 +1,10 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" - "code.cloudfoundry.org/cli/api/router" - "code.cloudfoundry.org/cli/api/router/routererror" + "code.cloudfoundry.org/cli/v7/api/router" + "code.cloudfoundry.org/cli/v7/api/router/routererror" ) type RouterGroup router.RouterGroup diff --git a/actor/v2action/router_group_test.go b/actor/v2action/router_group_test.go index 494f6971bda..0a906a6ec33 100644 --- a/actor/v2action/router_group_test.go +++ b/actor/v2action/router_group_test.go @@ -3,10 +3,10 @@ package v2action_test import ( "fmt" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/router" - routererror "code.cloudfoundry.org/cli/api/router/routererror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/router" + routererror "code.cloudfoundry.org/cli/v7/api/router/routererror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/security_group.go b/actor/v2action/security_group.go index c7973772cd4..7afffa4a2ed 100644 --- a/actor/v2action/security_group.go +++ b/actor/v2action/security_group.go @@ -3,10 +3,10 @@ package v2action import ( "sort" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) // SecurityGroup represents a CF SecurityGroup. diff --git a/actor/v2action/security_group_test.go b/actor/v2action/security_group_test.go index 8c346e84953..98b4f528f50 100644 --- a/actor/v2action/security_group_test.go +++ b/actor/v2action/security_group_test.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service.go b/actor/v2action/service.go index 32ccf4b71e8..cb7643cb209 100644 --- a/actor/v2action/service.go +++ b/actor/v2action/service.go @@ -1,9 +1,9 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) // Service is representation of a service offering. diff --git a/actor/v2action/service_access.go b/actor/v2action/service_access.go index 78dfcfbb8b9..5eea78361b3 100644 --- a/actor/v2action/service_access.go +++ b/actor/v2action/service_access.go @@ -3,10 +3,10 @@ package v2action import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) // EnableServiceForAllOrgs enables access for the given service in all orgs. diff --git a/actor/v2action/service_access_test.go b/actor/v2action/service_access_test.go index 98bbf89d370..3376cc0c91e 100644 --- a/actor/v2action/service_access_test.go +++ b/actor/v2action/service_access_test.go @@ -6,12 +6,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) var _ = Describe("Service Access", func() { diff --git a/actor/v2action/service_binding.go b/actor/v2action/service_binding.go index 7a0903511b3..f7ef9738aa1 100644 --- a/actor/v2action/service_binding.go +++ b/actor/v2action/service_binding.go @@ -1,9 +1,9 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) // ServiceBinding represents the link between a service instance and an diff --git a/actor/v2action/service_binding_test.go b/actor/v2action/service_binding_test.go index 4115ed20436..11d7ae2201f 100644 --- a/actor/v2action/service_binding_test.go +++ b/actor/v2action/service_binding_test.go @@ -3,11 +3,11 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2action/service_broker.go b/actor/v2action/service_broker.go index 01293d5ebb6..f7cf4be71fc 100644 --- a/actor/v2action/service_broker.go +++ b/actor/v2action/service_broker.go @@ -1,9 +1,9 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type ServiceBroker ccv2.ServiceBroker diff --git a/actor/v2action/service_broker_test.go b/actor/v2action/service_broker_test.go index edd32a10480..7ab0886dfaf 100644 --- a/actor/v2action/service_broker_test.go +++ b/actor/v2action/service_broker_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) var _ = Describe("Service Broker", func() { diff --git a/actor/v2action/service_instance.go b/actor/v2action/service_instance.go index 10da7c7097a..afd86b6889b 100644 --- a/actor/v2action/service_instance.go +++ b/actor/v2action/service_instance.go @@ -1,10 +1,10 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) // ServiceInstance represents an instance of a service. diff --git a/actor/v2action/service_instance_shared_from.go b/actor/v2action/service_instance_shared_from.go index 7746aecbf06..a8f677efc5e 100644 --- a/actor/v2action/service_instance_shared_from.go +++ b/actor/v2action/service_instance_shared_from.go @@ -1,6 +1,6 @@ package v2action -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" +import "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" type ServiceInstanceSharedFrom ccv2.ServiceInstanceSharedFrom diff --git a/actor/v2action/service_instance_shared_from_test.go b/actor/v2action/service_instance_shared_from_test.go index fa018b34c90..2c91e12bc31 100644 --- a/actor/v2action/service_instance_shared_from_test.go +++ b/actor/v2action/service_instance_shared_from_test.go @@ -3,9 +3,9 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_instance_shared_to.go b/actor/v2action/service_instance_shared_to.go index a545c614805..39d0d42fefb 100644 --- a/actor/v2action/service_instance_shared_to.go +++ b/actor/v2action/service_instance_shared_to.go @@ -1,6 +1,6 @@ package v2action -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" +import "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" type ServiceInstanceSharedTo ccv2.ServiceInstanceSharedTo diff --git a/actor/v2action/service_instance_shared_to_test.go b/actor/v2action/service_instance_shared_to_test.go index e2e60386008..a1b0194ab62 100644 --- a/actor/v2action/service_instance_shared_to_test.go +++ b/actor/v2action/service_instance_shared_to_test.go @@ -3,9 +3,9 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_instance_summary.go b/actor/v2action/service_instance_summary.go index 28f13ba213c..5601dd8495f 100644 --- a/actor/v2action/service_instance_summary.go +++ b/actor/v2action/service_instance_summary.go @@ -4,10 +4,10 @@ import ( "fmt" "sort" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/util/sorting" log "github.com/sirupsen/logrus" ) diff --git a/actor/v2action/service_instance_summary_test.go b/actor/v2action/service_instance_summary_test.go index f3653ffd7c6..5d7365992f1 100644 --- a/actor/v2action/service_instance_summary_test.go +++ b/actor/v2action/service_instance_summary_test.go @@ -3,11 +3,11 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2action/service_instance_test.go b/actor/v2action/service_instance_test.go index c8bb85613ac..e2bcb1c02d6 100644 --- a/actor/v2action/service_instance_test.go +++ b/actor/v2action/service_instance_test.go @@ -3,12 +3,12 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2action/service_instance_user_provided.go b/actor/v2action/service_instance_user_provided.go index 73900cd4dfa..c276c0571e6 100644 --- a/actor/v2action/service_instance_user_provided.go +++ b/actor/v2action/service_instance_user_provided.go @@ -1,7 +1,7 @@ package v2action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) // UserProvidedServiceInstance represents an instance of a user-provided service. diff --git a/actor/v2action/service_instance_user_provided_test.go b/actor/v2action/service_instance_user_provided_test.go index 60539464b62..7eee39c5832 100644 --- a/actor/v2action/service_instance_user_provided_test.go +++ b/actor/v2action/service_instance_user_provided_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2action/service_key.go b/actor/v2action/service_key.go index 1f9067d1ea1..0e1f311a6d1 100644 --- a/actor/v2action/service_key.go +++ b/actor/v2action/service_key.go @@ -1,7 +1,7 @@ package v2action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) // ServiceKey represents a set of credentials for a service instance. diff --git a/actor/v2action/service_key_test.go b/actor/v2action/service_key_test.go index 31b65444367..7ecee989567 100644 --- a/actor/v2action/service_key_test.go +++ b/actor/v2action/service_key_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) var _ = Describe("Service Key", func() { diff --git a/actor/v2action/service_plan.go b/actor/v2action/service_plan.go index 5ebba6a3810..989ca7732b1 100644 --- a/actor/v2action/service_plan.go +++ b/actor/v2action/service_plan.go @@ -1,9 +1,9 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type ServicePlan ccv2.ServicePlan diff --git a/actor/v2action/service_plan_test.go b/actor/v2action/service_plan_test.go index 16f9ed585e5..30ea9d823f9 100644 --- a/actor/v2action/service_plan_test.go +++ b/actor/v2action/service_plan_test.go @@ -3,10 +3,10 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_plan_visibility.go b/actor/v2action/service_plan_visibility.go index 0a205ee7bcf..12cdd568748 100644 --- a/actor/v2action/service_plan_visibility.go +++ b/actor/v2action/service_plan_visibility.go @@ -1,8 +1,8 @@ package v2action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type ServicePlanVisibility ccv2.ServicePlanVisibility diff --git a/actor/v2action/service_plan_visibility_test.go b/actor/v2action/service_plan_visibility_test.go index defa20526b3..33bbfe17fbf 100644 --- a/actor/v2action/service_plan_visibility_test.go +++ b/actor/v2action/service_plan_visibility_test.go @@ -3,10 +3,10 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_summary.go b/actor/v2action/service_summary.go index 653f11988c1..808b37823ed 100644 --- a/actor/v2action/service_summary.go +++ b/actor/v2action/service_summary.go @@ -1,9 +1,9 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type ServiceSummary struct { diff --git a/actor/v2action/service_summary_test.go b/actor/v2action/service_summary_test.go index f72ba0544fb..700c19f8aef 100644 --- a/actor/v2action/service_summary_test.go +++ b/actor/v2action/service_summary_test.go @@ -4,11 +4,11 @@ import ( "errors" "reflect" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_test.go b/actor/v2action/service_test.go index 75deca90421..ae91a57b4ac 100644 --- a/actor/v2action/service_test.go +++ b/actor/v2action/service_test.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/shared_domain_test.go b/actor/v2action/shared_domain_test.go index b7f2066f01c..b57724550ed 100644 --- a/actor/v2action/shared_domain_test.go +++ b/actor/v2action/shared_domain_test.go @@ -3,9 +3,9 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2action/space.go b/actor/v2action/space.go index 9500cf14338..7c04cc06008 100644 --- a/actor/v2action/space.go +++ b/actor/v2action/space.go @@ -1,11 +1,11 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - uaaconst "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + uaaconst "code.cloudfoundry.org/cli/v7/api/uaa/constant" ) // Space represents a CLI Space diff --git a/actor/v2action/space_quota.go b/actor/v2action/space_quota.go index 8ccc6953b48..326802da810 100644 --- a/actor/v2action/space_quota.go +++ b/actor/v2action/space_quota.go @@ -1,9 +1,9 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) type SpaceQuota ccv2.SpaceQuota diff --git a/actor/v2action/space_quota_test.go b/actor/v2action/space_quota_test.go index eabdfdeb100..8c0d7bb0b56 100644 --- a/actor/v2action/space_quota_test.go +++ b/actor/v2action/space_quota_test.go @@ -3,11 +3,11 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/space_summary.go b/actor/v2action/space_summary.go index c9fae5d0b92..2149b266afe 100644 --- a/actor/v2action/space_summary.go +++ b/actor/v2action/space_summary.go @@ -3,7 +3,7 @@ package v2action import ( "sort" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type SecurityGroupRule struct { diff --git a/actor/v2action/space_summary_test.go b/actor/v2action/space_summary_test.go index 2506ce63356..11c3da65162 100644 --- a/actor/v2action/space_summary_test.go +++ b/actor/v2action/space_summary_test.go @@ -3,10 +3,10 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/space_test.go b/actor/v2action/space_test.go index 92d4a1e8dfb..039548ed57a 100644 --- a/actor/v2action/space_test.go +++ b/actor/v2action/space_test.go @@ -3,13 +3,13 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - uaaconst "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + uaaconst "code.cloudfoundry.org/cli/v7/api/uaa/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/ssh_test.go b/actor/v2action/ssh_test.go index 2325768c86b..667a4fc455c 100644 --- a/actor/v2action/ssh_test.go +++ b/actor/v2action/ssh_test.go @@ -3,8 +3,8 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/stack.go b/actor/v2action/stack.go index d94ec951671..8489901f13c 100644 --- a/actor/v2action/stack.go +++ b/actor/v2action/stack.go @@ -1,10 +1,10 @@ package v2action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) type Stack ccv2.Stack diff --git a/actor/v2action/stack_test.go b/actor/v2action/stack_test.go index 2ac32283f55..613c4639365 100644 --- a/actor/v2action/stack_test.go +++ b/actor/v2action/stack_test.go @@ -3,12 +3,12 @@ package v2action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/target.go b/actor/v2action/target.go index 37110ce74c6..df93f232f82 100644 --- a/actor/v2action/target.go +++ b/actor/v2action/target.go @@ -1,9 +1,9 @@ package v2action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type TargetSettings ccv2.TargetSettings diff --git a/actor/v2action/target_test.go b/actor/v2action/target_test.go index 3e91d9680ad..3a9516575bb 100644 --- a/actor/v2action/target_test.go +++ b/actor/v2action/target_test.go @@ -1,8 +1,8 @@ package v2action_test import ( - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2action/token_test.go b/actor/v2action/token_test.go index 47b9d8780b2..2d1b241a0df 100644 --- a/actor/v2action/token_test.go +++ b/actor/v2action/token_test.go @@ -3,9 +3,9 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/uaa" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/uaa_client.go b/actor/v2action/uaa_client.go index 5798bcca451..185d3c9d4b9 100644 --- a/actor/v2action/uaa_client.go +++ b/actor/v2action/uaa_client.go @@ -1,8 +1,8 @@ package v2action import ( - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/actor/v2action/user.go b/actor/v2action/user.go index 9600f4a9d38..def8b85c863 100644 --- a/actor/v2action/user.go +++ b/actor/v2action/user.go @@ -1,6 +1,6 @@ package v2action -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" +import "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" // User represents a CLI user. type User ccv2.User diff --git a/actor/v2action/user_test.go b/actor/v2action/user_test.go index aec90ebe785..4abc3e7f60d 100644 --- a/actor/v2action/user_test.go +++ b/actor/v2action/user_test.go @@ -3,10 +3,10 @@ package v2action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/uaa" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/v2action_suite_test.go b/actor/v2action/v2action_suite_test.go index 33dabe3396f..d8c294807cb 100644 --- a/actor/v2action/v2action_suite_test.go +++ b/actor/v2action/v2action_suite_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/actor/v2action/v2actionfakes/fake_cloud_controller_client.go b/actor/v2action/v2actionfakes/fake_cloud_controller_client.go index 6d692efc31d..93c91cb7dd9 100644 --- a/actor/v2action/v2actionfakes/fake_cloud_controller_client.go +++ b/actor/v2action/v2actionfakes/fake_cloud_controller_client.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) type FakeCloudControllerClient struct { diff --git a/actor/v2action/v2actionfakes/fake_config.go b/actor/v2action/v2actionfakes/fake_config.go index 4dad37c80e9..9190ae0043d 100644 --- a/actor/v2action/v2actionfakes/fake_config.go +++ b/actor/v2action/v2actionfakes/fake_config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type FakeConfig struct { diff --git a/actor/v2action/v2actionfakes/fake_downloader.go b/actor/v2action/v2actionfakes/fake_downloader.go index 701a7efeaab..29ec4761a5f 100644 --- a/actor/v2action/v2actionfakes/fake_downloader.go +++ b/actor/v2action/v2actionfakes/fake_downloader.go @@ -4,7 +4,7 @@ package v2actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action" ) type FakeDownloader struct { diff --git a/actor/v2action/v2actionfakes/fake_noaaclient.go b/actor/v2action/v2actionfakes/fake_noaaclient.go index 57a31557fcd..93eb88895f4 100644 --- a/actor/v2action/v2actionfakes/fake_noaaclient.go +++ b/actor/v2action/v2actionfakes/fake_noaaclient.go @@ -4,7 +4,7 @@ package v2actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action" "github.com/cloudfoundry/sonde-go/events" ) diff --git a/actor/v2action/v2actionfakes/fake_router_client.go b/actor/v2action/v2actionfakes/fake_router_client.go index d5779074a4e..ec15c3e56d7 100644 --- a/actor/v2action/v2actionfakes/fake_router_client.go +++ b/actor/v2action/v2actionfakes/fake_router_client.go @@ -4,8 +4,8 @@ package v2actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/router" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/router" ) type FakeRouterClient struct { diff --git a/actor/v2action/v2actionfakes/fake_simple_progress_bar.go b/actor/v2action/v2actionfakes/fake_simple_progress_bar.go index 25072949900..926ca8ff62e 100644 --- a/actor/v2action/v2actionfakes/fake_simple_progress_bar.go +++ b/actor/v2action/v2actionfakes/fake_simple_progress_bar.go @@ -5,7 +5,7 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action" ) type FakeSimpleProgressBar struct { diff --git a/actor/v2action/v2actionfakes/fake_uaaclient.go b/actor/v2action/v2actionfakes/fake_uaaclient.go index 5335a9cec5a..b70282ff169 100644 --- a/actor/v2action/v2actionfakes/fake_uaaclient.go +++ b/actor/v2action/v2actionfakes/fake_uaaclient.go @@ -4,9 +4,9 @@ package v2actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" ) type FakeUAAClient struct { diff --git a/actor/v2action/version_test.go b/actor/v2action/version_test.go index 81345880f4b..a07d8bd197a 100644 --- a/actor/v2action/version_test.go +++ b/actor/v2action/version_test.go @@ -1,8 +1,8 @@ package v2action_test import ( - . "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/v2actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2v3action/application_summary.go b/actor/v2v3action/application_summary.go index 00c73f3abe2..a539df98769 100644 --- a/actor/v2v3action/application_summary.go +++ b/actor/v2v3action/application_summary.go @@ -1,11 +1,11 @@ package v2v3action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" ) type ApplicationSummary struct { diff --git a/actor/v2v3action/application_summary_test.go b/actor/v2v3action/application_summary_test.go index 67be073f08c..2b096f97676 100644 --- a/actor/v2v3action/application_summary_test.go +++ b/actor/v2v3action/application_summary_test.go @@ -3,14 +3,14 @@ package v2v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - . "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v2v3action/v2v3actionfakes" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + . "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v2v3action/v2v3actionfakes" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2v3action/manifest.go b/actor/v2v3action/manifest.go index 98d88eaf600..7a50ed12ecf 100644 --- a/actor/v2v3action/manifest.go +++ b/actor/v2v3action/manifest.go @@ -1,9 +1,9 @@ package v2v3action import ( - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/util/manifest" ) type ManifestV2Actor interface { diff --git a/actor/v2v3action/manifest_test.go b/actor/v2v3action/manifest_test.go index 0914e5f2c13..3af78e7f8fc 100644 --- a/actor/v2v3action/manifest_test.go +++ b/actor/v2v3action/manifest_test.go @@ -7,12 +7,12 @@ import ( . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" - "code.cloudfoundry.org/cli/actor/v2action" - . "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v2v3action/v2v3actionfakes" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/v2action" + . "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v2v3action/v2v3actionfakes" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifest" ) var _ = Describe("Manifest", func() { diff --git a/actor/v2v3action/service_instance.go b/actor/v2v3action/service_instance.go index 271ad4fdaf3..9a2b499072b 100644 --- a/actor/v2v3action/service_instance.go +++ b/actor/v2v3action/service_instance.go @@ -3,9 +3,9 @@ package v2v3action import ( "strings" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) func (actor Actor) ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationName(shareToSpaceName string, serviceInstanceName string, sourceSpaceGUID string, shareToOrgName string) (Warnings, error) { diff --git a/actor/v2v3action/service_instance_test.go b/actor/v2v3action/service_instance_test.go index 6a177357ca3..49beffa11aa 100644 --- a/actor/v2v3action/service_instance_test.go +++ b/actor/v2v3action/service_instance_test.go @@ -3,14 +3,14 @@ package v2v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - . "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v2v3action/v2v3actionfakes" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + . "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v2v3action/v2v3actionfakes" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v2v3action/v2_actor.go b/actor/v2v3action/v2_actor.go index e76c0b0c707..b42c5a1a947 100644 --- a/actor/v2v3action/v2_actor.go +++ b/actor/v2v3action/v2_actor.go @@ -1,6 +1,6 @@ package v2v3action -import "code.cloudfoundry.org/cli/actor/v2action" +import "code.cloudfoundry.org/cli/v7/actor/v2action" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V2Actor diff --git a/actor/v2v3action/v2v3actionfakes/fake_v2actor.go b/actor/v2v3action/v2v3actionfakes/fake_v2actor.go index 6af77db401b..7a1f92ebac1 100644 --- a/actor/v2v3action/v2v3actionfakes/fake_v2actor.go +++ b/actor/v2v3action/v2v3actionfakes/fake_v2actor.go @@ -4,9 +4,9 @@ package v2v3actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/util/manifest" ) type FakeV2Actor struct { diff --git a/actor/v2v3action/v2v3actionfakes/fake_v3actor.go b/actor/v2v3action/v2v3actionfakes/fake_v3actor.go index 5b6cc2f7aad..a66e776b674 100644 --- a/actor/v2v3action/v2v3actionfakes/fake_v3actor.go +++ b/actor/v2v3action/v2v3actionfakes/fake_v3actor.go @@ -4,9 +4,9 @@ package v2v3actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/resources" ) type FakeV3Actor struct { diff --git a/actor/v2v3action/v3_actor.go b/actor/v2v3action/v3_actor.go index 54d027d909c..5babbe48abe 100644 --- a/actor/v2v3action/v3_actor.go +++ b/actor/v2v3action/v3_actor.go @@ -1,8 +1,8 @@ package v2v3action import ( - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V3Actor diff --git a/actor/v2v3action/version_test.go b/actor/v2v3action/version_test.go index a1553cf1a92..bcdc94fdce2 100644 --- a/actor/v2v3action/version_test.go +++ b/actor/v2v3action/version_test.go @@ -1,8 +1,8 @@ package v2v3action_test import ( - . "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v2v3action/v2v3actionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v2v3action/v2v3actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/application.go b/actor/v3action/application.go index 55e9f8d8797..82a3e8ff24f 100644 --- a/actor/v3action/application.go +++ b/actor/v3action/application.go @@ -3,10 +3,10 @@ package v3action import ( "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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) // Application represents a V3 actor application. diff --git a/actor/v3action/application_manifest.go b/actor/v3action/application_manifest.go index d06dbff805d..182a6588414 100644 --- a/actor/v3action/application_manifest.go +++ b/actor/v3action/application_manifest.go @@ -1,8 +1,8 @@ package v3action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ManifestParser diff --git a/actor/v3action/application_manifest_test.go b/actor/v3action/application_manifest_test.go index 68e3c8363ba..8d8276ae560 100644 --- a/actor/v3action/application_manifest_test.go +++ b/actor/v3action/application_manifest_test.go @@ -3,12 +3,12 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/application_summary.go b/actor/v3action/application_summary.go index b6ef9f38235..e402bdb6564 100644 --- a/actor/v3action/application_summary.go +++ b/actor/v3action/application_summary.go @@ -1,6 +1,6 @@ package v3action -import "code.cloudfoundry.org/cli/actor/actionerror" +import "code.cloudfoundry.org/cli/v7/actor/actionerror" // ApplicationSummary represents an application with its processes and droplet. type ApplicationSummary struct { diff --git a/actor/v3action/application_summary_test.go b/actor/v3action/application_summary_test.go index 9909bdb33ff..709278fe053 100644 --- a/actor/v3action/application_summary_test.go +++ b/actor/v3action/application_summary_test.go @@ -3,13 +3,13 @@ package v3action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "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/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/application_test.go b/actor/v3action/application_test.go index c41a3bb1a44..125c3146a75 100644 --- a/actor/v3action/application_test.go +++ b/actor/v3action/application_test.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/application_with_process_summary.go b/actor/v3action/application_with_process_summary.go index e919e408c3c..dc300a7f50e 100644 --- a/actor/v3action/application_with_process_summary.go +++ b/actor/v3action/application_with_process_summary.go @@ -1,7 +1,7 @@ package v3action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" ) type ApplicationWithProcessSummary struct { diff --git a/actor/v3action/application_with_process_summary_test.go b/actor/v3action/application_with_process_summary_test.go index 92b3113d507..fe6aada65c5 100644 --- a/actor/v3action/application_with_process_summary_test.go +++ b/actor/v3action/application_with_process_summary_test.go @@ -3,11 +3,11 @@ package v3action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/auth.go b/actor/v3action/auth.go index c847a09d3c9..4de985e89ed 100644 --- a/actor/v3action/auth.go +++ b/actor/v3action/auth.go @@ -3,9 +3,9 @@ package v3action import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" ) func (actor Actor) Authenticate(credentials map[string]string, origin string, grantType constant.GrantType) error { diff --git a/actor/v3action/auth_test.go b/actor/v3action/auth_test.go index 486c2f845f9..2fac5e97157 100644 --- a/actor/v3action/auth_test.go +++ b/actor/v3action/auth_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/uaa/constant" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" ) var _ = Describe("Auth Actions", func() { diff --git a/actor/v3action/build.go b/actor/v3action/build.go index 730abed6177..cee1d1c5f77 100644 --- a/actor/v3action/build.go +++ b/actor/v3action/build.go @@ -4,10 +4,10 @@ import ( "errors" "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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" log "github.com/sirupsen/logrus" ) @@ -54,7 +54,7 @@ func (actor Actor) StagePackage(packageGUID string, appName string) (<-chan Drop time.Sleep(actor.Config.PollingInterval()) default: - //TODO: uncomment after #150569020 + // TODO: uncomment after #150569020 // ccv3Droplet, warnings, err := actor.CloudControllerClient.GetDroplet(build.DropletGUID) // warningsStream <- Warnings(warnings) // if err != nil { diff --git a/actor/v3action/build_test.go b/actor/v3action/build_test.go index cd8b08c8898..35bdb386b42 100644 --- a/actor/v3action/build_test.go +++ b/actor/v3action/build_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -61,7 +61,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/v3action/cloud_controller_client.go b/actor/v3action/cloud_controller_client.go index 6e1415102ee..d49e11a933e 100644 --- a/actor/v3action/cloud_controller_client.go +++ b/actor/v3action/cloud_controller_client.go @@ -3,8 +3,8 @@ package v3action import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/v3action/config.go b/actor/v3action/config.go index 562a6af70e7..9a85b77d637 100644 --- a/actor/v3action/config.go +++ b/actor/v3action/config.go @@ -3,7 +3,7 @@ package v3action import ( "time" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/v3action/droplet.go b/actor/v3action/droplet.go index ec6de177704..3cd8efd4a75 100644 --- a/actor/v3action/droplet.go +++ b/actor/v3action/droplet.go @@ -1,11 +1,11 @@ package v3action 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) // Droplet represents a Cloud Controller droplet. diff --git a/actor/v3action/droplet_test.go b/actor/v3action/droplet_test.go index e22a40d567a..04a50e8a2aa 100644 --- a/actor/v3action/droplet_test.go +++ b/actor/v3action/droplet_test.go @@ -3,13 +3,13 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/environment_variable.go b/actor/v3action/environment_variable.go index 669e38b1cf7..bf247a82aba 100644 --- a/actor/v3action/environment_variable.go +++ b/actor/v3action/environment_variable.go @@ -1,9 +1,9 @@ package v3action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) // EnvironmentVariableGroups represents all environment variables for application diff --git a/actor/v3action/environment_variable_test.go b/actor/v3action/environment_variable_test.go index b80907bfba2..2bbd232b8fe 100644 --- a/actor/v3action/environment_variable_test.go +++ b/actor/v3action/environment_variable_test.go @@ -3,11 +3,11 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/isolation_segment.go b/actor/v3action/isolation_segment.go index 6158d1f6a9d..1c48e9d721b 100644 --- a/actor/v3action/isolation_segment.go +++ b/actor/v3action/isolation_segment.go @@ -1,10 +1,10 @@ package v3action 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) type IsolationSegmentSummary struct { diff --git a/actor/v3action/isolation_segment_test.go b/actor/v3action/isolation_segment_test.go index 9b8e8065520..0776537f975 100644 --- a/actor/v3action/isolation_segment_test.go +++ b/actor/v3action/isolation_segment_test.go @@ -3,12 +3,12 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/logcache_test.go b/actor/v3action/logcache_test.go index 2539003945e..e81af0b552e 100644 --- a/actor/v3action/logcache_test.go +++ b/actor/v3action/logcache_test.go @@ -3,11 +3,11 @@ package v3action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/logging.go b/actor/v3action/logging.go index 0bac4f352ad..33bfddf7354 100644 --- a/actor/v3action/logging.go +++ b/actor/v3action/logging.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" noaaErrors "github.com/cloudfoundry/noaa/v2/errors" "github.com/cloudfoundry/sonde-go/events" log "github.com/sirupsen/logrus" diff --git a/actor/v3action/logging_test.go b/actor/v3action/logging_test.go index 2b936d1669e..0337b210939 100644 --- a/actor/v3action/logging_test.go +++ b/actor/v3action/logging_test.go @@ -4,11 +4,11 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" noaaErrors "github.com/cloudfoundry/noaa/v2/errors" "github.com/cloudfoundry/sonde-go/events" . "github.com/onsi/ginkgo/v2" diff --git a/actor/v3action/organization.go b/actor/v3action/organization.go index 77ee9703b8b..bfa99961f69 100644 --- a/actor/v3action/organization.go +++ b/actor/v3action/organization.go @@ -1,9 +1,9 @@ package v3action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) // Organization represents a V3 actor organization. diff --git a/actor/v3action/organization_test.go b/actor/v3action/organization_test.go index e8ee48e2b47..76281b562c5 100644 --- a/actor/v3action/organization_test.go +++ b/actor/v3action/organization_test.go @@ -3,12 +3,12 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/organization_test.go.txt b/actor/v3action/organization_test.go.txt index d09484b65da..0f70b49a020 100644 --- a/actor/v3action/organization_test.go.txt +++ b/actor/v3action/organization_test.go.txt @@ -3,10 +3,10 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/package.go b/actor/v3action/package.go index aa794c809ca..37c2b4285c9 100644 --- a/actor/v3action/package.go +++ b/actor/v3action/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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v3action/package_test.go b/actor/v3action/package_test.go index 1db677adc5b..e4790af404f 100644 --- a/actor/v3action/package_test.go +++ b/actor/v3action/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/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/process.go b/actor/v3action/process.go index f7fdd1fb2de..aaa78cf280f 100644 --- a/actor/v3action/process.go +++ b/actor/v3action/process.go @@ -1,9 +1,9 @@ package v3action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/resources" ) func (actor Actor) ScaleProcessByApplication(appGUID string, process resources.Process) (Warnings, error) { diff --git a/actor/v3action/process_health_check.go b/actor/v3action/process_health_check.go index 509e17c485e..ff4e704717e 100644 --- a/actor/v3action/process_health_check.go +++ b/actor/v3action/process_health_check.go @@ -3,10 +3,10 @@ package v3action 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) type ProcessHealthCheck struct { diff --git a/actor/v3action/process_health_check_test.go b/actor/v3action/process_health_check_test.go index ffcd48c4aaa..3894cb329cb 100644 --- a/actor/v3action/process_health_check_test.go +++ b/actor/v3action/process_health_check_test.go @@ -3,13 +3,13 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/process_instance.go b/actor/v3action/process_instance.go index da2812f55a5..1601d2f004c 100644 --- a/actor/v3action/process_instance.go +++ b/actor/v3action/process_instance.go @@ -3,10 +3,10 @@ package v3action import ( "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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" ) type ProcessInstance ccv3.ProcessInstance diff --git a/actor/v3action/process_instance_test.go b/actor/v3action/process_instance_test.go index 62fdaba00b6..2f11c62d507 100644 --- a/actor/v3action/process_instance_test.go +++ b/actor/v3action/process_instance_test.go @@ -4,12 +4,12 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/process_summary.go b/actor/v3action/process_summary.go index 8f2e0ff883b..1ab6b852132 100644 --- a/actor/v3action/process_summary.go +++ b/actor/v3action/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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v3action/process_summary_test.go b/actor/v3action/process_summary_test.go index 067536f4b93..768cd1c6b08 100644 --- a/actor/v3action/process_summary_test.go +++ b/actor/v3action/process_summary_test.go @@ -1,9 +1,9 @@ package v3action_test import ( - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/process_test.go b/actor/v3action/process_test.go index e72a6460fb2..9f97314b32a 100644 --- a/actor/v3action/process_test.go +++ b/actor/v3action/process_test.go @@ -3,14 +3,14 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/relationship_list.go b/actor/v3action/relationship_list.go index 7ece479deb8..53d240b9825 100644 --- a/actor/v3action/relationship_list.go +++ b/actor/v3action/relationship_list.go @@ -1,6 +1,6 @@ package v3action -import "code.cloudfoundry.org/cli/resources" +import "code.cloudfoundry.org/cli/v7/resources" func (actor Actor) ShareServiceInstanceToSpaces(serviceInstanceGUID string, spaceGUIDs []string) (resources.RelationshipList, Warnings, error) { relationshipList, warnings, err := actor.CloudControllerClient.ShareServiceInstanceToSpaces(serviceInstanceGUID, spaceGUIDs) diff --git a/actor/v3action/relationship_list_test.go b/actor/v3action/relationship_list_test.go index 6dc7d8df41a..40f47c64c8f 100644 --- a/actor/v3action/relationship_list_test.go +++ b/actor/v3action/relationship_list_test.go @@ -3,10 +3,10 @@ package v3action_test import ( "errors" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/service_instance.go b/actor/v3action/service_instance.go index 8343b8034db..7f10b9a234d 100644 --- a/actor/v3action/service_instance.go +++ b/actor/v3action/service_instance.go @@ -1,9 +1,9 @@ package v3action import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) func (actor Actor) GetServiceInstanceByNameAndSpace(serviceInstanceName string, spaceGUID string) (resources.ServiceInstance, Warnings, error) { @@ -20,7 +20,7 @@ func (actor Actor) GetServiceInstanceByNameAndSpace(serviceInstanceName string, return resources.ServiceInstance{}, Warnings(warnings), actionerror.ServiceInstanceNotFoundError{Name: serviceInstanceName} } - //Handle multiple serviceInstances being returned as GetServiceInstances arnt filtered by space + // Handle multiple serviceInstances being returned as GetServiceInstances arnt filtered by space return serviceInstances[0], Warnings(warnings), nil } diff --git a/actor/v3action/service_instance_test.go b/actor/v3action/service_instance_test.go index 983224680bf..b45599ef669 100644 --- a/actor/v3action/service_instance_test.go +++ b/actor/v3action/service_instance_test.go @@ -3,11 +3,11 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/shared_actor.go b/actor/v3action/shared_actor.go index 4d31066a5d2..9a1c41d5221 100644 --- a/actor/v3action/shared_actor.go +++ b/actor/v3action/shared_actor.go @@ -1,6 +1,6 @@ package v3action -import "code.cloudfoundry.org/cli/actor/sharedaction" +import "code.cloudfoundry.org/cli/v7/actor/sharedaction" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SharedActor diff --git a/actor/v3action/space.go b/actor/v3action/space.go index fc6ac4783d9..b7e983ce061 100644 --- a/actor/v3action/space.go +++ b/actor/v3action/space.go @@ -1,10 +1,10 @@ package v3action 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) type Space struct { diff --git a/actor/v3action/space_test.go b/actor/v3action/space_test.go index 5ebf86a6a26..79126a73b97 100644 --- a/actor/v3action/space_test.go +++ b/actor/v3action/space_test.go @@ -3,12 +3,12 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/ssh.go b/actor/v3action/ssh.go index 99bdf534fa0..fb3c94325e9 100644 --- a/actor/v3action/ssh.go +++ b/actor/v3action/ssh.go @@ -3,7 +3,7 @@ package v3action import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" ) type SSHAuthentication struct { diff --git a/actor/v3action/ssh_actor.go b/actor/v3action/ssh_actor.go index c1fc219c70b..43602c30d47 100644 --- a/actor/v3action/ssh_actor.go +++ b/actor/v3action/ssh_actor.go @@ -1,6 +1,6 @@ package v3action -import "code.cloudfoundry.org/cli/actor/sharedaction" +import "code.cloudfoundry.org/cli/v7/actor/sharedaction" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SSHActor diff --git a/actor/v3action/ssh_test.go b/actor/v3action/ssh_test.go index 00581624e1a..71f918081cc 100644 --- a/actor/v3action/ssh_test.go +++ b/actor/v3action/ssh_test.go @@ -3,12 +3,12 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/target.go b/actor/v3action/target.go index ea05c733901..f4b5baeddce 100644 --- a/actor/v3action/target.go +++ b/actor/v3action/target.go @@ -3,8 +3,8 @@ package v3action import ( "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type TargetSettings ccv3.TargetSettings @@ -20,8 +20,8 @@ func (actor Actor) SetTarget(settings TargetSettings) (Warnings, error) { if err != nil { return Warnings(warnings), err } - //TODO Remove this condition when earliest supportest CAPI is 1.87.0 - //We have to do this because the current legacy supported CAPI version as of 2020 does not display the log cache url, this will break if a foundation on legacy CAPI have non-standard logcache urls + // TODO Remove this condition when earliest supportest CAPI is 1.87.0 + // We have to do this because the current legacy supported CAPI version as of 2020 does not display the log cache url, this will break if a foundation on legacy CAPI have non-standard logcache urls logCacheUrl := info.LogCache() if logCacheUrl == "" { diff --git a/actor/v3action/target_test.go b/actor/v3action/target_test.go index 590083c7a6c..edc450da08c 100644 --- a/actor/v3action/target_test.go +++ b/actor/v3action/target_test.go @@ -1,10 +1,10 @@ package v3action_test import ( - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v3action/task.go b/actor/v3action/task.go index cd40b884de6..edaa891fbba 100644 --- a/actor/v3action/task.go +++ b/actor/v3action/task.go @@ -5,10 +5,10 @@ import ( "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/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) // RunTask runs the provided command in the application environment associated diff --git a/actor/v3action/task_test.go b/actor/v3action/task_test.go index 994146d3f83..07952ad96ae 100644 --- a/actor/v3action/task_test.go +++ b/actor/v3action/task_test.go @@ -3,13 +3,13 @@ package v3action_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/uaa_client.go b/actor/v3action/uaa_client.go index b748da188e8..b5828c4e15d 100644 --- a/actor/v3action/uaa_client.go +++ b/actor/v3action/uaa_client.go @@ -1,6 +1,6 @@ package v3action -import "code.cloudfoundry.org/cli/api/uaa/constant" +import "code.cloudfoundry.org/cli/v7/api/uaa/constant" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UAAClient diff --git a/actor/v3action/v3action_suite_test.go b/actor/v3action/v3action_suite_test.go index 7fca82d054c..2eef09c4503 100644 --- a/actor/v3action/v3action_suite_test.go +++ b/actor/v3action/v3action_suite_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/actor/v3action/v3actionfakes/fake_cloud_controller_client.go b/actor/v3action/v3actionfakes/fake_cloud_controller_client.go index 0ba9ffb0ab6..bc1d681cc20 100644 --- a/actor/v3action/v3actionfakes/fake_cloud_controller_client.go +++ b/actor/v3action/v3actionfakes/fake_cloud_controller_client.go @@ -5,9 +5,9 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) type FakeCloudControllerClient struct { diff --git a/actor/v3action/v3actionfakes/fake_config.go b/actor/v3action/v3actionfakes/fake_config.go index 523eba1e03b..63e48844212 100644 --- a/actor/v3action/v3actionfakes/fake_config.go +++ b/actor/v3action/v3actionfakes/fake_config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type FakeConfig struct { diff --git a/actor/v3action/v3actionfakes/fake_manifest_parser.go b/actor/v3action/v3actionfakes/fake_manifest_parser.go index fad09ec1e5d..9873012dced 100644 --- a/actor/v3action/v3actionfakes/fake_manifest_parser.go +++ b/actor/v3action/v3actionfakes/fake_manifest_parser.go @@ -4,7 +4,7 @@ package v3actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action" ) type FakeManifestParser struct { diff --git a/actor/v3action/v3actionfakes/fake_noaaclient.go b/actor/v3action/v3actionfakes/fake_noaaclient.go index ae3021e34bb..59894af317d 100644 --- a/actor/v3action/v3actionfakes/fake_noaaclient.go +++ b/actor/v3action/v3actionfakes/fake_noaaclient.go @@ -4,7 +4,7 @@ package v3actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action" "github.com/cloudfoundry/sonde-go/events" ) diff --git a/actor/v3action/v3actionfakes/fake_shared_actor.go b/actor/v3action/v3actionfakes/fake_shared_actor.go index fc37b34508e..38f7915b524 100644 --- a/actor/v3action/v3actionfakes/fake_shared_actor.go +++ b/actor/v3action/v3actionfakes/fake_shared_actor.go @@ -4,8 +4,8 @@ package v3actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" ) type FakeSharedActor struct { diff --git a/actor/v3action/v3actionfakes/fake_sshactor.go b/actor/v3action/v3actionfakes/fake_sshactor.go index a2bd336b89e..b51bf2c4fc7 100644 --- a/actor/v3action/v3actionfakes/fake_sshactor.go +++ b/actor/v3action/v3actionfakes/fake_sshactor.go @@ -4,8 +4,8 @@ package v3actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" ) type FakeSSHActor struct { diff --git a/actor/v3action/v3actionfakes/fake_uaaclient.go b/actor/v3action/v3actionfakes/fake_uaaclient.go index 7996eb9aff9..6539cf256fc 100644 --- a/actor/v3action/v3actionfakes/fake_uaaclient.go +++ b/actor/v3action/v3actionfakes/fake_uaaclient.go @@ -4,8 +4,8 @@ package v3actionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" ) type FakeUAAClient struct { diff --git a/actor/v3action/version_test.go b/actor/v3action/version_test.go index e5e27457878..c15180ee526 100644 --- a/actor/v3action/version_test.go +++ b/actor/v3action/version_test.go @@ -1,8 +1,8 @@ package v3action_test import ( - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/zdt.go b/actor/v3action/zdt.go index 00b1f76c622..a848ff5ad99 100644 --- a/actor/v3action/zdt.go +++ b/actor/v3action/zdt.go @@ -5,10 +5,10 @@ import ( "regexp" "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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) func (actor Actor) CancelDeploymentByAppNameAndSpace(appName string, spaceGUID string) (Warnings, error) { diff --git a/actor/v3action/zdt_test.go b/actor/v3action/zdt_test.go index 81c0df2ed4a..58352a3f55e 100644 --- a/actor/v3action/zdt_test.go +++ b/actor/v3action/zdt_test.go @@ -5,13 +5,13 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" - . "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action/v3actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/application.go b/actor/v7action/application.go index 3108bbdc391..99fd06056a3 100644 --- a/actor/v7action/application.go +++ b/actor/v7action/application.go @@ -5,12 +5,12 @@ 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/batcher" ) func (actor Actor) DeleteApplicationByNameAndSpace(name, spaceGUID string, deleteRoutes bool) (Warnings, error) { @@ -379,7 +379,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 24c00e7e0d3..5508927388f 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/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 24990daeada..aa8fc9f7edf 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 9e23a1ee87e..b4fd21eb391 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 a6c3d1da16c..b32d7720a2e 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 42776cf493e..87e7a262563 100644 --- a/actor/v7action/application_summary.go +++ b/actor/v7action/application_summary.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/batcher" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/batcher" ) type ApplicationSummary struct { diff --git a/actor/v7action/application_summary_test.go b/actor/v7action/application_summary_test.go index b306e1a02db..bdb7a825389 100644 --- a/actor/v7action/application_summary_test.go +++ b/actor/v7action/application_summary_test.go @@ -4,17 +4,17 @@ import ( "errors" "fmt" - "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/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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" "code.cloudfoundry.org/clock" - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 61cfc51956b..1a741a6d7a0 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/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 eb95edf2f2b..a3980d0109d 100644 --- a/actor/v7action/auth.go +++ b/actor/v7action/auth.go @@ -6,9 +6,9 @@ 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" ) func (actor Actor) Authenticate(credentials map[string]string, origin string, grantType constant.GrantType) error { diff --git a/actor/v7action/auth_test.go b/actor/v7action/auth_test.go index 309ff2e27bf..e2fb4375ecb 100644 --- a/actor/v7action/auth_test.go +++ b/actor/v7action/auth_test.go @@ -3,10 +3,10 @@ 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/build.go b/actor/v7action/build.go index a6aeda49b3e..9a967416ba2 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" log "github.com/sirupsen/logrus" ) @@ -87,7 +87,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 d874528e375..e7640ab9b5b 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 0fc3eab27cd..9aae8f08084 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util" ) type JobURL ccv3.JobURL diff --git a/actor/v7action/buildpack_test.go b/actor/v7action/buildpack_test.go index 8af4b5078e2..5fadd7d6c86 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 96e2bc52f10..43ecb6b4a13 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v7action/buildpack_windows_test.go b/actor/v7action/buildpack_windows_test.go index 7c28ae42803..3e73a1cd2ab 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/ykk" ) diff --git a/actor/v7action/cloud_controller_client.go b/actor/v7action/cloud_controller_client.go index 0e3dbf018c7..3e1481a4104 100644 --- a/actor/v7action/cloud_controller_client.go +++ b/actor/v7action/cloud_controller_client.go @@ -3,9 +3,9 @@ package v7action import ( "io" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CloudControllerClient diff --git a/actor/v7action/config.go b/actor/v7action/config.go index b1eaafee9f2..ea63e896289 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/v7/util/configv3" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Config diff --git a/actor/v7action/deployment.go b/actor/v7action/deployment.go index c532df85398..3f7409e8567 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) func (actor Actor) CreateDeploymentByApplicationAndDroplet(appGUID string, dropletGUID string) (string, Warnings, error) { diff --git a/actor/v7action/deployment_test.go b/actor/v7action/deployment_test.go index 9527d7b3cad..d7c211baa01 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/domain.go b/actor/v7action/domain.go index f242c02c4e8..4996f5af0f6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" ) type SharedOrgs ccv3.SharedOrgs diff --git a/actor/v7action/domain_test.go b/actor/v7action/domain_test.go index 3e142b0f28f..cfe6a9038e0 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/router" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/droplet.go b/actor/v7action/droplet.go index e9ec7935c44..10af1a9a154 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 ae21ef84e75..f2bc3397bb9 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 a5588b5a5d5..8d07b9bcb18 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 c83493c4d22..b7813eb0103 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/event.go b/actor/v7action/event.go index 36b1726f694..9434f0156b8 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/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/util/generic" ) type Event struct { diff --git a/actor/v7action/event_test.go b/actor/v7action/event_test.go index 96e58ad3204..5cb7a3a55ed 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 fa11273f76b..80b8cc0506a 100644 --- a/actor/v7action/feature_flag.go +++ b/actor/v7action/feature_flag.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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 9bee3c3f219..8cacb6aeaa8 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/info_test.go b/actor/v7action/info_test.go index afff422b029..6d4af631724 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 1ca9e7671a9..c2be445fc76 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) type IsolationSegmentSummary struct { diff --git a/actor/v7action/isolation_segment_test.go b/actor/v7action/isolation_segment_test.go index 54567453834..102522e08f6 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/job.go b/actor/v7action/job.go index d9c1fac96b1..67590c4a633 100644 --- a/actor/v7action/job.go +++ b/actor/v7action/job.go @@ -1,7 +1,7 @@ package v7action import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" ) func (actor Actor) PollUploadBuildpackJob(jobURL ccv3.JobURL) (Warnings, error) { diff --git a/actor/v7action/job_test.go b/actor/v7action/job_test.go index 6ee0ac3430b..191bce2253c 100644 --- a/actor/v7action/job_test.go +++ b/actor/v7action/job_test.go @@ -1,10 +1,10 @@ package v7action_test import ( - . "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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/label.go b/actor/v7action/label.go index e22df43a8ea..bd90cc29988 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 1100b904784..f73e16c6bf3 100644 --- a/actor/v7action/label_test.go +++ b/actor/v7action/label_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/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/logging.go b/actor/v7action/logging.go index 5c77b2d1595..fbdceb3575a 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/v7/actor/sharedaction" "github.com/SermoDigital/jose/jws" ) diff --git a/actor/v7action/logging_test.go b/actor/v7action/logging_test.go index 2ce49da8f4e..d81d6e6636d 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 ea0d3496d3c..16cdc5fbc98 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/v7/api/cloudcontroller/ccv3" ) type ServiceOfferingWithPlans ccv3.ServiceOfferingWithPlans diff --git a/actor/v7action/marketplace_test.go b/actor/v7action/marketplace_test.go index 7849db851a3..67adfcaa43f 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization.go b/actor/v7action/organization.go index dbe432ef645..91020036476 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 1352d43dc46..193e2a65e6c 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" ) type QuotaLimits struct { diff --git a/actor/v7action/organization_quota_test.go b/actor/v7action/organization_quota_test.go index a5153e700f5..494a450201b 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 2fdc28c4a01..fd0849fd0d6 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/v7/resources" ) type OrganizationSummary struct { diff --git a/actor/v7action/organization_summary_test.go b/actor/v7action/organization_summary_test.go index 9ee72781a08..1c4a722b6e8 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 e6ea5311d62..1974bdc152b 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/package.go b/actor/v7action/package.go index 38f080da08b..6a01214e929 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/package_test.go b/actor/v7action/package_test.go index c538b899339..36e6556aa75 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/process.go b/actor/v7action/process.go index c25884e94c8..cd556fecd71 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 51f2edb57fe..3393fb587de 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/v7/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 3ba1df8deb6..b5cf59025ad 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 53938990a2c..5375592db25 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 f884c2a33c2..247cde36168 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 72f1e9aa66a..f638b7adbd6 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/process_summary_test.go b/actor/v7action/process_summary_test.go index f34a5ec2811..b48c6703d09 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 256dbf33a2b..0bb05f21d2b 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v7action/relationship_list.go b/actor/v7action/relationship_list.go index 735e2458c62..c3b253a63d5 100644 --- a/actor/v7action/relationship_list.go +++ b/actor/v7action/relationship_list.go @@ -1,7 +1,7 @@ package v7action import ( - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/resources" ) func (actor Actor) ShareServiceInstanceToSpaces(serviceInstanceGUID string, spaceGUIDs []string) (resources.RelationshipList, Warnings, error) { diff --git a/actor/v7action/relationship_list_test.go b/actor/v7action/relationship_list_test.go index f3991c15082..163e2badf22 100644 --- a/actor/v7action/relationship_list_test.go +++ b/actor/v7action/relationship_list_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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/resource_match.go b/actor/v7action/resource_match.go index dc5db1c3429..b8991e32d13 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 688cf387901..ad25ec6fb1d 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/v7/actor/sharedaction" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/revisions.go b/actor/v7action/revisions.go index 47b79205db6..b694a0f25ac 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/versioncheck" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) const MinimumCCAPIVersionForDeployable = "3.86.0" diff --git a/actor/v7action/revisions_test.go b/actor/v7action/revisions_test.go index be162daab86..d647e87b5fb 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/role.go b/actor/v7action/role.go index 437d3242a94..96a9c5b56ca 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 55959cd0119..015a65bc553 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/route.go b/actor/v7action/route.go index bfff3fcaeb5..061c7a22b6c 100644 --- a/actor/v7action/route.go +++ b/actor/v7action/route.go @@ -5,13 +5,13 @@ 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/sorting" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/batcher" + "code.cloudfoundry.org/cli/v7/util/sorting" ) type RouteSummary struct { diff --git a/actor/v7action/route_test.go b/actor/v7action/route_test.go index d59157a6055..9b6b0c4bbcb 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 2be81f31aef..bda2cb51a83 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/router" + "code.cloudfoundry.org/cli/v7/api/router/routererror" ) type RouterGroup router.RouterGroup diff --git a/actor/v7action/router_group_test.go b/actor/v7action/router_group_test.go index 6892bad5b7e..606d5c47e1b 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/router" + "code.cloudfoundry.org/cli/v7/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 29229591612..883e4a222e4 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/v7/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 531ba984de3..08f6aac9c41 100644 --- a/actor/v7action/security_group.go +++ b/actor/v7action/security_group.go @@ -5,12 +5,12 @@ 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/batcher" ) type SecurityGroupSummary struct { diff --git a/actor/v7action/security_group_test.go b/actor/v7action/security_group_test.go index c5d0ee241f1..5c20512243f 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 7f32b7736c9..35b3cbf8d94 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) type ServicePlanWithSpaceAndOrganization ccv3.ServicePlanWithSpaceAndOrganization diff --git a/actor/v7action/service_access_test.go b/actor/v7action/service_access_test.go index c3f11c00902..6ce1d772807 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_broker.go b/actor/v7action/service_broker.go index bd959c011a2..4f599fc68e3 100644 --- a/actor/v7action/service_broker.go +++ b/actor/v7action/service_broker.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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) 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 90b2692a60b..4256ead7593 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 8a7def97e64..96ee944882d 100644 --- a/actor/v7action/service_instance.go +++ b/actor/v7action/service_instance.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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" ) func (actor Actor) GetServiceInstanceByNameAndSpace(serviceInstanceName string, spaceGUID string) (resources.ServiceInstance, Warnings, error) { @@ -20,7 +20,7 @@ func (actor Actor) GetServiceInstanceByNameAndSpace(serviceInstanceName string, return resources.ServiceInstance{}, Warnings(warnings), actionerror.ServiceInstanceNotFoundError{Name: serviceInstanceName} } - //Handle multiple serviceInstances being returned as GetServiceInstances arnt filtered by space + // Handle multiple serviceInstances being returned as GetServiceInstances arnt filtered by space return serviceInstances[0], Warnings(warnings), nil } diff --git a/actor/v7action/service_instance_test.go b/actor/v7action/service_instance_test.go index 9fb614be4fb..9f177071325 100644 --- a/actor/v7action/service_instance_test.go +++ b/actor/v7action/service_instance_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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_offering.go b/actor/v7action/service_offering.go index 648d1e4db2f..cee8a1affab 100644 --- a/actor/v7action/service_offering.go +++ b/actor/v7action/service_offering.go @@ -1,7 +1,7 @@ package v7action import ( - "code.cloudfoundry.org/cli/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" ) 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 add0f64e302..38fe6b187d4 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 03e2e5dc518..1ca2c8f084d 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 079995803a0..01b44074d0a 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 95dab5aea24..95ea775300e 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/v7/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 5d7a27222b7..47a987380c3 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) type SpaceSummary struct { diff --git a/actor/v7action/space_feature.go b/actor/v7action/space_feature.go index d60a8d8a103..ee43b812f67 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/v7/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 be7a64a925a..da70653140d 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/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 5a8acf85a48..b0eea033db1 100644 --- a/actor/v7action/space_manifest.go +++ b/actor/v7action/space_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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" ) func (actor Actor) SetSpaceManifest(spaceGUID string, rawManifest []byte) (Warnings, error) { diff --git a/actor/v7action/space_manifest_test.go b/actor/v7action/space_manifest_test.go index 5f6d1f06697..f4f16c1445a 100644 --- a/actor/v7action/space_manifest_test.go +++ b/actor/v7action/space_manifest_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/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/space_quota.go b/actor/v7action/space_quota.go index 78f5acc38c6..b825eb44ca7 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 6705bd1d374..d72449940f5 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 bbf52188305..04218a60d68 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/ssh.go b/actor/v7action/ssh.go index e8ac2b00248..0b4c6c73dfa 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/resources" ) type SSHAuthentication struct { diff --git a/actor/v7action/ssh_actor.go b/actor/v7action/ssh_actor.go index 84fd26091ef..16ffe8fc060 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/v7/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 134e329418e..e24bb148b7e 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/stack.go b/actor/v7action/stack.go index 29ed49727df..509d0b25618 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 28cd6f0ed25..09943f9a728 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/target.go b/actor/v7action/target.go index c18d23bf285..cf9f96235a1 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/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type TargetSettings ccv3.TargetSettings diff --git a/actor/v7action/target_test.go b/actor/v7action/target_test.go index a8a09ea71b2..d6ac4f89c42 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7action/task.go b/actor/v7action/task.go index 34d6126e82a..68d339a446d 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7action/task_test.go b/actor/v7action/task_test.go index a8df6f2ebad..ecb150fe42d 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 22dc83a0553..883153067a4 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/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 9f9627065db..3d1fbee8b28 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/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 ceee43a9d92..338ac1253c5 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 9e1aebec339..81fcabc40bc 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7action/v7actionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/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 d7f95d2d11b..5582793ce4c 100644 --- a/actor/v7action/v7action_suite_test.go +++ b/actor/v7action/v7action_suite_test.go @@ -8,8 +8,8 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/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 398d0173be6..1f6a3c8c871 100644 --- a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go +++ b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go @@ -5,10 +5,10 @@ import ( "io" "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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" ) type FakeCloudControllerClient struct { diff --git a/actor/v7action/v7actionfakes/fake_config.go b/actor/v7action/v7actionfakes/fake_config.go index d9e05fd823d..16015f1a295 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type FakeConfig struct { diff --git a/actor/v7action/v7actionfakes/fake_downloader.go b/actor/v7action/v7actionfakes/fake_downloader.go index f0cb1f7590e..f37fc9b1488 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/v7/actor/v7action" ) type FakeDownloader struct { diff --git a/actor/v7action/v7actionfakes/fake_manifest_parser.go b/actor/v7action/v7actionfakes/fake_manifest_parser.go index 6f0275be7b1..9efc1e439b0 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/v7/actor/v7action" ) type FakeManifestParser struct { diff --git a/actor/v7action/v7actionfakes/fake_routing_client.go b/actor/v7action/v7actionfakes/fake_routing_client.go index 873d4834a35..d1bd7332569 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/router" ) type FakeRoutingClient struct { diff --git a/actor/v7action/v7actionfakes/fake_shared_actor.go b/actor/v7action/v7actionfakes/fake_shared_actor.go index 5a2ff877ab6..5a0cc5bd6a7 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 41cf5a49c6c..ce8c98f5ac7 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/v7/actor/v7action" ) type FakeSimpleProgressBar struct { diff --git a/actor/v7action/v7actionfakes/fake_sshactor.go b/actor/v7action/v7actionfakes/fake_sshactor.go index c3179aa0a07..bb806afab1e 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" ) type FakeSSHActor struct { diff --git a/actor/v7action/v7actionfakes/fake_uaaclient.go b/actor/v7action/v7actionfakes/fake_uaaclient.go index a72b89ee32c..cf4533a2b71 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" ) type FakeUAAClient struct { diff --git a/actor/v7action/version_test.go b/actor/v7action/version_test.go index 633f9f5b795..548740dbed1 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/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 d3ebc799729..37495dd53d4 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/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/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 b1e91a08c43..fe523dfa903 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/v7/actor/sharedaction" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/application.go b/actor/v7pushaction/application.go index 877d3737336..6b1ef6891fa 100644 --- a/actor/v7pushaction/application.go +++ b/actor/v7pushaction/application.go @@ -3,7 +3,7 @@ package v7pushaction import ( "fmt" - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action" ) type Application struct { diff --git a/actor/v7pushaction/application_test.go b/actor/v7pushaction/application_test.go index 63af101199f..079e44819e4 100644 --- a/actor/v7pushaction/application_test.go +++ b/actor/v7pushaction/application_test.go @@ -1,9 +1,9 @@ package v7pushaction_test import ( - "code.cloudfoundry.org/cli/actor/v2action" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/actor/v2action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/types" . "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 bc40f05f58a..57ccc9a2265 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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 40e96523c44..acbe60979e6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_deployment_for_push_plan_test.go b/actor/v7pushaction/create_deployment_for_push_plan_test.go index 126eb5dc094..9af7f1b2547 100644 --- a/actor/v7pushaction/create_deployment_for_push_plan_test.go +++ b/actor/v7pushaction/create_deployment_for_push_plan_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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/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 29c8674573c..be02551030c 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 705d8227cc3..b4df4fa645c 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/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 c13603276ab..7141dc44e34 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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 0b9efcf2af2..48a1a046534 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 871026c3adb..ae117ed038b 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 329a3129347..402215d6b4f 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/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 8d58871ce30..75a1277333a 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 c10ace982d8..288fe985f1d 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 ea84ec231c6..65f3c5592b4 100644 --- a/actor/v7pushaction/handle_app_path_override_test.go +++ b/actor/v7pushaction/handle_app_path_override_test.go @@ -4,10 +4,10 @@ import ( "os" "path/filepath" - . "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/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 669d04ab016..5ad59ea1af3 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 49c6bc6569d..9d4b61c5e53 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" . "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 fb664ea0c38..0f3822c190b 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/v7/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 cc94e9ad9f1..dc50e2bb26f 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/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 47adb500fd4..fcc265eef91 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 3b139bd0728..1479753ac31 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 9190bca816d..6b06dbad434 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 9c7c2310539..1a24f5e1970 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 b9c31ad3e59..b6b3406271a 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 0dd9a1cd388..c0d8e226f86 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 8a5e97e8a7d..e4ef4c7122c 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 2c0dfdf5e1c..1b58f53a329 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/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 dc382117c9a..00c85e7de60 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/v7/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 0b140d98b76..97afdcb3263 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/v7/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 a50450b004f..4f1b91f6b6c 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/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/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 ab9659ac7dd..f276f67de12 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 c3cbac2ed78..b12b72a24de 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 b4c6f977182..d46dc244943 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 18fe4c52eaa..ea249678866 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 e9f0d4091c8..46763e166b1 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 695f06b6f86..49c6351d671 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 018ab02e8a4..4cb3f175150 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 4b662ce7cfe..9a0bb285fef 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 82944bba6eb..2874ea1d9c0 100644 --- a/actor/v7pushaction/handle_memory_override.go +++ b/actor/v7pushaction/handle_memory_override.go @@ -1,9 +1,9 @@ package v7pushaction import ( - //"code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + // "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 d301981543c..01810bd99c4 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 10d5c170cda..77f4672e5ec 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 36b547901c0..71f5d1476cf 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 ba18805c21e..8b5d4191532 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 566ee226f9a..5c4f7860c05 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 3087e67ccee..4d103bf8d23 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 a7dd434f7be..a347c603287 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 45dbe8838b4..10908614ab9 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 93df0fa065c..83a0a051a80 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 7501a024278..6cb81acc565 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 476636d234c..c131d63458d 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/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 6d369d8b828..7b0530fce4a 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 88700852f05..5c47221ad27 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 19d4a32d298..b058d587be1 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" "github.com/cloudfoundry/bosh-cli/director/template" ) diff --git a/actor/v7pushaction/resource_match.go b/actor/v7pushaction/resource_match.go index dcfb1ebafd2..ee893d6b690 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/v7/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 e35c7618298..5f870e8565f 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/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 217ebbbc324..2d4da038082 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/sequence.go b/actor/v7pushaction/sequence.go index b8e4608fe70..0938b40e5e3 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/v7/api/cloudcontroller/ccv3/constant" ) func ShouldCreateBitsPackage(plan PushPlan) bool { diff --git a/actor/v7pushaction/sequence_test.go b/actor/v7pushaction/sequence_test.go index 158725f66c5..25e5796461c 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 03ca77503c1..84c3bc9eb6a 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/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 9b543b34cb8..e550fd42d18 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/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 e58b9ed5461..e4c38380fef 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 cb991961c19..ac9d8b9afbd 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/actor/v7pushaction" - "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/actor/v7pushaction/setup_deployment_strategy_for_push_plan_test.go b/actor/v7pushaction/setup_deployment_strategy_for_push_plan_test.go index 5d0d8df0aba..a179071ae49 100644 --- a/actor/v7pushaction/setup_deployment_strategy_for_push_plan_test.go +++ b/actor/v7pushaction/setup_deployment_strategy_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/v7/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/actor/v7pushaction" + . "code.cloudfoundry.org/cli/v7/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 f06eeb6d76c..de06f4ca47a 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/v7/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 fa24192cc6d..66179bc37ba 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/v7/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 3e89800bb1c..25a23c6e10a 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/v7/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 17a1bd3ab69..0f45d7145a1 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/v7/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 cd4efca31b5..f6d60f5e022 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/v7/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 cfe6a90051e..a7b29a00c25 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/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 b6865a2f16c..e24445f9207 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/v7/actor/v7action" log "github.com/sirupsen/logrus" ) diff --git a/actor/v7pushaction/stop_application_test.go b/actor/v7pushaction/stop_application_test.go index 04287023c20..459e3f0e069 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction/v7pushactionfakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/v2_actor.go b/actor/v7pushaction/v2_actor.go index 972990ef2ef..a9cf890a65f 100644 --- a/actor/v7pushaction/v2_actor.go +++ b/actor/v7pushaction/v2_actor.go @@ -1,7 +1,7 @@ package v7pushaction import ( - "code.cloudfoundry.org/cli/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V2Actor diff --git a/actor/v7pushaction/v7_actor.go b/actor/v7pushaction/v7_actor.go index abe25d5466c..8cbc7e0f75c 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/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 2a68dddff26..84a7ba7efe7 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/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/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 9b0a3aa81cd..493c949e30b 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/v7/actor/v7pushaction" ) type FakeProgressBar struct { diff --git a/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go b/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go index 63ba72df441..afa5619c02c 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction" ) type FakeSharedActor struct { diff --git a/actor/v7pushaction/v7pushactionfakes/fake_v2actor.go b/actor/v7pushaction/v7pushactionfakes/fake_v2actor.go index b0c46eeefaf..03488f9d9f5 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_v2actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_v2actor.go @@ -4,8 +4,8 @@ package v7pushactionfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction" ) type FakeV2Actor struct { diff --git a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go index 6e491f764a6..5d6780f4faa 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/resources" ) type FakeV7Actor struct { diff --git a/actor/versioncheck/minimum_version_check_test.go b/actor/versioncheck/minimum_version_check_test.go index 89015dbe129..ab823ce89bf 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/v7/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 8b78993bda4..e54f167dc7d 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/v7/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 1bcfe10cc7a..52f8b7764c0 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/v7/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 161c2c0bf9e..28dc2431f5f 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/v7/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 1ed3c3ee6c7..c5a9c1d0d96 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/v7/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 024d896fe13..98dd6ed8eae 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/v7/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 aac4025f081..6c71a585e85 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/v7/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 0a265e85f33..abc269b664a 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/v7/api/cloudcontroller/ccerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv2/application.go b/api/cloudcontroller/ccv2/application.go index f81c6e90726..d4ec485c709 100644 --- a/api/cloudcontroller/ccv2/application.go +++ b/api/cloudcontroller/ccv2/application.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/types" ) // Application represents a Cloud Controller Application. diff --git a/api/cloudcontroller/ccv2/application_instance.go b/api/cloudcontroller/ccv2/application_instance.go index 71678b0e00e..5e56eebda94 100644 --- a/api/cloudcontroller/ccv2/application_instance.go +++ b/api/cloudcontroller/ccv2/application_instance.go @@ -3,9 +3,9 @@ package ccv2 import ( "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ApplicationInstance represents a Cloud Controller Application Instance. diff --git a/api/cloudcontroller/ccv2/application_instance_status.go b/api/cloudcontroller/ccv2/application_instance_status.go index 3091220528e..033df7dbeaa 100644 --- a/api/cloudcontroller/ccv2/application_instance_status.go +++ b/api/cloudcontroller/ccv2/application_instance_status.go @@ -3,9 +3,9 @@ package ccv2 import ( "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ApplicationInstanceStatus represents a Cloud Controller Application Instance. diff --git a/api/cloudcontroller/ccv2/application_instance_status_test.go b/api/cloudcontroller/ccv2/application_instance_status_test.go index 27253cf1df1..892d82ef60b 100644 --- a/api/cloudcontroller/ccv2/application_instance_status_test.go +++ b/api/cloudcontroller/ccv2/application_instance_status_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/application_instance_test.go b/api/cloudcontroller/ccv2/application_instance_test.go index a22c62e82da..d1d065a9d63 100644 --- a/api/cloudcontroller/ccv2/application_instance_test.go +++ b/api/cloudcontroller/ccv2/application_instance_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/application_test.go b/api/cloudcontroller/ccv2/application_test.go index f5048b8505a..233976ce5bf 100644 --- a/api/cloudcontroller/ccv2/application_test.go +++ b/api/cloudcontroller/ccv2/application_test.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" @@ -524,7 +524,7 @@ var _ = Describe("Application", func() { Describe("UpdateApplication", func() { When("the update is successful", func() { - When("updating all fields", func() { //are we encoding everything correctly? + When("updating all fields", func() { // are we encoding everything correctly? BeforeEach(func() { response1 := `{ "metadata": { diff --git a/api/cloudcontroller/ccv2/buildpack.go b/api/cloudcontroller/ccv2/buildpack.go index ce7c544e66b..b8c0cb91e4e 100644 --- a/api/cloudcontroller/ccv2/buildpack.go +++ b/api/cloudcontroller/ccv2/buildpack.go @@ -5,11 +5,11 @@ import ( "encoding/json" "io" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" - "code.cloudfoundry.org/cli/api/cloudcontroller/uploads" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v7/types" ) // Buildpack represents a Cloud Controller Buildpack. diff --git a/api/cloudcontroller/ccv2/buildpack_test.go b/api/cloudcontroller/ccv2/buildpack_test.go index 28d41c9efb1..82398df2c25 100644 --- a/api/cloudcontroller/ccv2/buildpack_test.go +++ b/api/cloudcontroller/ccv2/buildpack_test.go @@ -7,13 +7,13 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/ccv2fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/ccv2fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/ccv2fakes/fake_connection_wrapper.go b/api/cloudcontroller/ccv2/ccv2fakes/fake_connection_wrapper.go index 989bb3a9d37..573b3dc9fb5 100644 --- a/api/cloudcontroller/ccv2/ccv2fakes/fake_connection_wrapper.go +++ b/api/cloudcontroller/ccv2/ccv2fakes/fake_connection_wrapper.go @@ -4,8 +4,8 @@ package ccv2fakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) type FakeConnectionWrapper struct { diff --git a/api/cloudcontroller/ccv2/ccv2fakes/fake_reader.go b/api/cloudcontroller/ccv2/ccv2fakes/fake_reader.go index 49747aee2db..20c59db08ec 100644 --- a/api/cloudcontroller/ccv2/ccv2fakes/fake_reader.go +++ b/api/cloudcontroller/ccv2/ccv2fakes/fake_reader.go @@ -4,7 +4,7 @@ package ccv2fakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) type FakeReader struct { diff --git a/api/cloudcontroller/ccv2/client.go b/api/cloudcontroller/ccv2/client.go index 2e9eba6eb8b..9de7b25c878 100644 --- a/api/cloudcontroller/ccv2/client.go +++ b/api/cloudcontroller/ccv2/client.go @@ -92,7 +92,7 @@ import ( "runtime" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" "github.com/tedsuo/rata" ) diff --git a/api/cloudcontroller/ccv2/client_test.go b/api/cloudcontroller/ccv2/client_test.go index 61efc77d463..3eadf826b1a 100644 --- a/api/cloudcontroller/ccv2/client_test.go +++ b/api/cloudcontroller/ccv2/client_test.go @@ -5,8 +5,8 @@ import ( "net/http" "runtime" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/ccv2fakes" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/ccv2fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv2/cloudcontrollerv2_suite_test.go b/api/cloudcontroller/ccv2/cloudcontrollerv2_suite_test.go index b05299a60c8..2839867e21b 100644 --- a/api/cloudcontroller/ccv2/cloudcontrollerv2_suite_test.go +++ b/api/cloudcontroller/ccv2/cloudcontrollerv2_suite_test.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv2/connection_wrapper.go b/api/cloudcontroller/ccv2/connection_wrapper.go index ac8e84c0842..a4dde7905d4 100644 --- a/api/cloudcontroller/ccv2/connection_wrapper.go +++ b/api/cloudcontroller/ccv2/connection_wrapper.go @@ -1,6 +1,6 @@ package ccv2 -import "code.cloudfoundry.org/cli/api/cloudcontroller" +import "code.cloudfoundry.org/cli/v7/api/cloudcontroller" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ConnectionWrapper diff --git a/api/cloudcontroller/ccv2/domain.go b/api/cloudcontroller/ccv2/domain.go index 085ed5f5688..18762e33109 100644 --- a/api/cloudcontroller/ccv2/domain.go +++ b/api/cloudcontroller/ccv2/domain.go @@ -4,10 +4,10 @@ import ( "bytes" "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // Domain represents a Cloud Controller Domain. diff --git a/api/cloudcontroller/ccv2/domain_test.go b/api/cloudcontroller/ccv2/domain_test.go index ed31140e4e2..766d0196c33 100644 --- a/api/cloudcontroller/ccv2/domain_test.go +++ b/api/cloudcontroller/ccv2/domain_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/errors.go b/api/cloudcontroller/ccv2/errors.go index 88f2cfda185..286fd8c543a 100644 --- a/api/cloudcontroller/ccv2/errors.go +++ b/api/cloudcontroller/ccv2/errors.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" ) // errorWrapper is the wrapper that converts responses with 4xx and 5xx status diff --git a/api/cloudcontroller/ccv2/errors_test.go b/api/cloudcontroller/ccv2/errors_test.go index 1cde849fc30..87562057f58 100644 --- a/api/cloudcontroller/ccv2/errors_test.go +++ b/api/cloudcontroller/ccv2/errors_test.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv2/event.go b/api/cloudcontroller/ccv2/event.go index 36468f3d6fc..161b10815a4 100644 --- a/api/cloudcontroller/ccv2/event.go +++ b/api/cloudcontroller/ccv2/event.go @@ -3,10 +3,10 @@ package ccv2 import ( "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // Event represents a Cloud Controller Event diff --git a/api/cloudcontroller/ccv2/event_test.go b/api/cloudcontroller/ccv2/event_test.go index 43d9d16a6d6..18c423c40a4 100644 --- a/api/cloudcontroller/ccv2/event_test.go +++ b/api/cloudcontroller/ccv2/event_test.go @@ -4,9 +4,9 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/feature_flag.go b/api/cloudcontroller/ccv2/feature_flag.go index 0bca6785485..5e911f62365 100644 --- a/api/cloudcontroller/ccv2/feature_flag.go +++ b/api/cloudcontroller/ccv2/feature_flag.go @@ -1,8 +1,8 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // FeatureFlag represents a Cloud Controller feature flag. diff --git a/api/cloudcontroller/ccv2/feature_flag_test.go b/api/cloudcontroller/ccv2/feature_flag_test.go index 389c56b1bb7..525dbc402ad 100644 --- a/api/cloudcontroller/ccv2/feature_flag_test.go +++ b/api/cloudcontroller/ccv2/feature_flag_test.go @@ -3,8 +3,8 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/filter.go b/api/cloudcontroller/ccv2/filter.go index 9053c07b14e..73741982500 100644 --- a/api/cloudcontroller/ccv2/filter.go +++ b/api/cloudcontroller/ccv2/filter.go @@ -5,7 +5,7 @@ import ( "net/url" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" ) // Filter is a type of filter that can be passed to specific request to narrow diff --git a/api/cloudcontroller/ccv2/info.go b/api/cloudcontroller/ccv2/info.go index acb29ae2104..4b6e771e7bc 100644 --- a/api/cloudcontroller/ccv2/info.go +++ b/api/cloudcontroller/ccv2/info.go @@ -3,9 +3,9 @@ package ccv2 import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // APIInformation represents the information returned back from /v2/info diff --git a/api/cloudcontroller/ccv2/info_test.go b/api/cloudcontroller/ccv2/info_test.go index 0345675f61a..f7e95dbb454 100644 --- a/api/cloudcontroller/ccv2/info_test.go +++ b/api/cloudcontroller/ccv2/info_test.go @@ -4,8 +4,8 @@ import ( "net/http" "strings" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv2/job.go b/api/cloudcontroller/ccv2/job.go index 11485364c12..6e0b2f73392 100644 --- a/api/cloudcontroller/ccv2/job.go +++ b/api/cloudcontroller/ccv2/job.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Reader diff --git a/api/cloudcontroller/ccv2/job_test.go b/api/cloudcontroller/ccv2/job_test.go index c753f30f944..11597e59cb4 100644 --- a/api/cloudcontroller/ccv2/job_test.go +++ b/api/cloudcontroller/ccv2/job_test.go @@ -11,12 +11,12 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/ccv2fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/ccv2fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/last_operation.go b/api/cloudcontroller/ccv2/last_operation.go index a8f85bc18af..547706ca294 100644 --- a/api/cloudcontroller/ccv2/last_operation.go +++ b/api/cloudcontroller/ccv2/last_operation.go @@ -1,6 +1,6 @@ package ccv2 -import "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" +import "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" // LastOperation is the status of the last operation requested on a service // instance. diff --git a/api/cloudcontroller/ccv2/organization.go b/api/cloudcontroller/ccv2/organization.go index 59b6afd9ee5..5abed4a3699 100644 --- a/api/cloudcontroller/ccv2/organization.go +++ b/api/cloudcontroller/ccv2/organization.go @@ -5,9 +5,9 @@ import ( "encoding/json" "net/url" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // Organization represents a Cloud Controller Organization. diff --git a/api/cloudcontroller/ccv2/organization_quota.go b/api/cloudcontroller/ccv2/organization_quota.go index 67686a26c89..5875c350fa5 100644 --- a/api/cloudcontroller/ccv2/organization_quota.go +++ b/api/cloudcontroller/ccv2/organization_quota.go @@ -1,9 +1,9 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // OrganizationQuota is the definition of a quota for an organization. diff --git a/api/cloudcontroller/ccv2/organization_quota_test.go b/api/cloudcontroller/ccv2/organization_quota_test.go index eb5a72d970c..55832749afc 100644 --- a/api/cloudcontroller/ccv2/organization_quota_test.go +++ b/api/cloudcontroller/ccv2/organization_quota_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/organization_test.go b/api/cloudcontroller/ccv2/organization_test.go index 02f3974f37f..171ca815e14 100644 --- a/api/cloudcontroller/ccv2/organization_test.go +++ b/api/cloudcontroller/ccv2/organization_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/paginated_resources.go b/api/cloudcontroller/ccv2/paginated_resources.go index 77ac5fdde67..7270548b106 100644 --- a/api/cloudcontroller/ccv2/paginated_resources.go +++ b/api/cloudcontroller/ccv2/paginated_resources.go @@ -5,7 +5,7 @@ import ( "net/http" "reflect" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" ) // PaginatedResources represents a page of resources returned by the Cloud diff --git a/api/cloudcontroller/ccv2/paginated_resources_test.go b/api/cloudcontroller/ccv2/paginated_resources_test.go index cc887fc0303..185c7abfaf5 100644 --- a/api/cloudcontroller/ccv2/paginated_resources_test.go +++ b/api/cloudcontroller/ccv2/paginated_resources_test.go @@ -3,8 +3,8 @@ package ccv2_test import ( "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv2/request.go b/api/cloudcontroller/ccv2/request.go index 241e2c3a5ce..8c0bbe01cb1 100644 --- a/api/cloudcontroller/ccv2/request.go +++ b/api/cloudcontroller/ccv2/request.go @@ -5,7 +5,7 @@ import ( "net/http" "net/url" - "code.cloudfoundry.org/cli/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" ) // Params represents URI parameters for a request. diff --git a/api/cloudcontroller/ccv2/resource.go b/api/cloudcontroller/ccv2/resource.go index 99ccd5e24d3..b57a2ecb7bc 100644 --- a/api/cloudcontroller/ccv2/resource.go +++ b/api/cloudcontroller/ccv2/resource.go @@ -6,8 +6,8 @@ import ( "os" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // Resource represents a Cloud Controller Resource. diff --git a/api/cloudcontroller/ccv2/resource_test.go b/api/cloudcontroller/ccv2/resource_test.go index b495e59a163..d9d5dab8c32 100644 --- a/api/cloudcontroller/ccv2/resource_test.go +++ b/api/cloudcontroller/ccv2/resource_test.go @@ -3,8 +3,8 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/route.go b/api/cloudcontroller/ccv2/route.go index b87966363b3..7ed2aa55bd9 100644 --- a/api/cloudcontroller/ccv2/route.go +++ b/api/cloudcontroller/ccv2/route.go @@ -7,10 +7,10 @@ import ( "net/http" "net/url" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/types" ) // Route represents a Cloud Controller Route. diff --git a/api/cloudcontroller/ccv2/route_mapping.go b/api/cloudcontroller/ccv2/route_mapping.go index 5d136b45c1c..2a0ae6f4d04 100644 --- a/api/cloudcontroller/ccv2/route_mapping.go +++ b/api/cloudcontroller/ccv2/route_mapping.go @@ -1,9 +1,9 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // RouteMapping represents a Cloud Controller map between an application and route. diff --git a/api/cloudcontroller/ccv2/route_mapping_test.go b/api/cloudcontroller/ccv2/route_mapping_test.go index e41abb23df4..3cdb8cfe0ca 100644 --- a/api/cloudcontroller/ccv2/route_mapping_test.go +++ b/api/cloudcontroller/ccv2/route_mapping_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/route_test.go b/api/cloudcontroller/ccv2/route_test.go index ca4db49bc0f..ce12a4e2921 100644 --- a/api/cloudcontroller/ccv2/route_test.go +++ b/api/cloudcontroller/ccv2/route_test.go @@ -3,10 +3,10 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/security_group.go b/api/cloudcontroller/ccv2/security_group.go index 12f866ce3ba..e4b0a754505 100644 --- a/api/cloudcontroller/ccv2/security_group.go +++ b/api/cloudcontroller/ccv2/security_group.go @@ -1,9 +1,9 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // SecurityGroup represents a Cloud Controller Security Group. diff --git a/api/cloudcontroller/ccv2/security_group_test.go b/api/cloudcontroller/ccv2/security_group_test.go index b597bf9162a..f8a8934441e 100644 --- a/api/cloudcontroller/ccv2/security_group_test.go +++ b/api/cloudcontroller/ccv2/security_group_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service.go b/api/cloudcontroller/ccv2/service.go index e6cbca420e6..df80d6ea3d0 100644 --- a/api/cloudcontroller/ccv2/service.go +++ b/api/cloudcontroller/ccv2/service.go @@ -5,9 +5,9 @@ import ( "net/url" "strconv" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // Service represents a Cloud Controller Service. diff --git a/api/cloudcontroller/ccv2/service_binding.go b/api/cloudcontroller/ccv2/service_binding.go index 65002a0167c..8a534cdcf97 100644 --- a/api/cloudcontroller/ccv2/service_binding.go +++ b/api/cloudcontroller/ccv2/service_binding.go @@ -6,9 +6,9 @@ import ( "fmt" "net/url" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ServiceBinding represents a Cloud Controller Service Binding. diff --git a/api/cloudcontroller/ccv2/service_binding_test.go b/api/cloudcontroller/ccv2/service_binding_test.go index 0af871faeec..7a6684744a7 100644 --- a/api/cloudcontroller/ccv2/service_binding_test.go +++ b/api/cloudcontroller/ccv2/service_binding_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_broker.go b/api/cloudcontroller/ccv2/service_broker.go index 0298e18bcd8..bb41cde5d43 100644 --- a/api/cloudcontroller/ccv2/service_broker.go +++ b/api/cloudcontroller/ccv2/service_broker.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ServiceBroker represents a Cloud Controller Service Broker. diff --git a/api/cloudcontroller/ccv2/service_broker_test.go b/api/cloudcontroller/ccv2/service_broker_test.go index c2f45e9612f..0bb0c0b290f 100644 --- a/api/cloudcontroller/ccv2/service_broker_test.go +++ b/api/cloudcontroller/ccv2/service_broker_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_instance.go b/api/cloudcontroller/ccv2/service_instance.go index b828b934488..9bce8b968fa 100644 --- a/api/cloudcontroller/ccv2/service_instance.go +++ b/api/cloudcontroller/ccv2/service_instance.go @@ -5,10 +5,10 @@ import ( "encoding/json" "net/url" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ServiceInstance represents a Cloud Controller Service Instance. diff --git a/api/cloudcontroller/ccv2/service_instance_shared_from.go b/api/cloudcontroller/ccv2/service_instance_shared_from.go index f7269e7271d..450a5c70bc2 100644 --- a/api/cloudcontroller/ccv2/service_instance_shared_from.go +++ b/api/cloudcontroller/ccv2/service_instance_shared_from.go @@ -1,8 +1,8 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ServiceInstanceSharedFrom represents a Cloud Controller relationship object diff --git a/api/cloudcontroller/ccv2/service_instance_shared_from_test.go b/api/cloudcontroller/ccv2/service_instance_shared_from_test.go index 3ed5f0bd3be..182fbac8ace 100644 --- a/api/cloudcontroller/ccv2/service_instance_shared_from_test.go +++ b/api/cloudcontroller/ccv2/service_instance_shared_from_test.go @@ -3,8 +3,8 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_instance_shared_to.go b/api/cloudcontroller/ccv2/service_instance_shared_to.go index 405968aaafd..ea794620204 100644 --- a/api/cloudcontroller/ccv2/service_instance_shared_to.go +++ b/api/cloudcontroller/ccv2/service_instance_shared_to.go @@ -1,8 +1,8 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ServiceInstanceSharedTo represents a Cloud Controller relationship object diff --git a/api/cloudcontroller/ccv2/service_instance_shared_to_test.go b/api/cloudcontroller/ccv2/service_instance_shared_to_test.go index f11eb8c8ba1..eeddd0e6842 100644 --- a/api/cloudcontroller/ccv2/service_instance_shared_to_test.go +++ b/api/cloudcontroller/ccv2/service_instance_shared_to_test.go @@ -3,7 +3,7 @@ package ccv2_test import ( "net/http" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_instance_test.go b/api/cloudcontroller/ccv2/service_instance_test.go index 2c331871c72..52a92c5b0ed 100644 --- a/api/cloudcontroller/ccv2/service_instance_test.go +++ b/api/cloudcontroller/ccv2/service_instance_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_instance_user_provided.go b/api/cloudcontroller/ccv2/service_instance_user_provided.go index 6cf82d2df42..382236ef33b 100644 --- a/api/cloudcontroller/ccv2/service_instance_user_provided.go +++ b/api/cloudcontroller/ccv2/service_instance_user_provided.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // GetUserProvidedServiceInstances returns back a list of *user provided* Service Instances based diff --git a/api/cloudcontroller/ccv2/service_instance_user_provided_test.go b/api/cloudcontroller/ccv2/service_instance_user_provided_test.go index 0183078d053..c66009b1243 100644 --- a/api/cloudcontroller/ccv2/service_instance_user_provided_test.go +++ b/api/cloudcontroller/ccv2/service_instance_user_provided_test.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_key.go b/api/cloudcontroller/ccv2/service_key.go index aef9a05c499..0a6cd1597c6 100644 --- a/api/cloudcontroller/ccv2/service_key.go +++ b/api/cloudcontroller/ccv2/service_key.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ServiceKey represents a Cloud Controller Service Key. diff --git a/api/cloudcontroller/ccv2/service_key_test.go b/api/cloudcontroller/ccv2/service_key_test.go index fcffe2240fd..c7f356b268a 100644 --- a/api/cloudcontroller/ccv2/service_key_test.go +++ b/api/cloudcontroller/ccv2/service_key_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" ) var _ = Describe("Service Key", func() { diff --git a/api/cloudcontroller/ccv2/service_plan.go b/api/cloudcontroller/ccv2/service_plan.go index 57e1f06c862..31d684b7440 100644 --- a/api/cloudcontroller/ccv2/service_plan.go +++ b/api/cloudcontroller/ccv2/service_plan.go @@ -4,15 +4,15 @@ import ( "bytes" "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ServicePlan represents a predefined set of configurations for a Cloud // Controller service object. type ServicePlan struct { - //GUID is the unique identifier of the service plan. + // GUID is the unique identifier of the service plan. GUID string // Name is the name of the service plan. diff --git a/api/cloudcontroller/ccv2/service_plan_test.go b/api/cloudcontroller/ccv2/service_plan_test.go index 32470b56f9b..22223f0248b 100644 --- a/api/cloudcontroller/ccv2/service_plan_test.go +++ b/api/cloudcontroller/ccv2/service_plan_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_plan_visibility.go b/api/cloudcontroller/ccv2/service_plan_visibility.go index 9e71e393f7c..3d93a0ce85c 100644 --- a/api/cloudcontroller/ccv2/service_plan_visibility.go +++ b/api/cloudcontroller/ccv2/service_plan_visibility.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // ServicePlanVisibility represents a Cloud Controller Service Plan Visibility. diff --git a/api/cloudcontroller/ccv2/service_plan_visibility_test.go b/api/cloudcontroller/ccv2/service_plan_visibility_test.go index c214c6d512d..48a0bf31f2d 100644 --- a/api/cloudcontroller/ccv2/service_plan_visibility_test.go +++ b/api/cloudcontroller/ccv2/service_plan_visibility_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_test.go b/api/cloudcontroller/ccv2/service_test.go index fd858736f5d..2794c73c5d8 100644 --- a/api/cloudcontroller/ccv2/service_test.go +++ b/api/cloudcontroller/ccv2/service_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/space.go b/api/cloudcontroller/ccv2/space.go index e7ef697a7c8..b11fb8d2323 100644 --- a/api/cloudcontroller/ccv2/space.go +++ b/api/cloudcontroller/ccv2/space.go @@ -5,9 +5,9 @@ import ( "encoding/json" "net/url" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // Space represents a Cloud Controller Space. diff --git a/api/cloudcontroller/ccv2/space_quota.go b/api/cloudcontroller/ccv2/space_quota.go index 33e4f8b851d..9953d472a4d 100644 --- a/api/cloudcontroller/ccv2/space_quota.go +++ b/api/cloudcontroller/ccv2/space_quota.go @@ -1,9 +1,9 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // SpaceQuota represents the Cloud Controller configured quota assigned to the diff --git a/api/cloudcontroller/ccv2/space_quota_test.go b/api/cloudcontroller/ccv2/space_quota_test.go index d0b178b3ad8..07debee483c 100644 --- a/api/cloudcontroller/ccv2/space_quota_test.go +++ b/api/cloudcontroller/ccv2/space_quota_test.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/space_summary.go b/api/cloudcontroller/ccv2/space_summary.go index 5470f30b69b..42ac4efdea1 100644 --- a/api/cloudcontroller/ccv2/space_summary.go +++ b/api/cloudcontroller/ccv2/space_summary.go @@ -1,8 +1,8 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // SpaceSummaryApplication represents an application inside a space diff --git a/api/cloudcontroller/ccv2/space_summary_test.go b/api/cloudcontroller/ccv2/space_summary_test.go index 9aa2436c494..7f4546b6608 100644 --- a/api/cloudcontroller/ccv2/space_summary_test.go +++ b/api/cloudcontroller/ccv2/space_summary_test.go @@ -3,8 +3,8 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/space_test.go b/api/cloudcontroller/ccv2/space_test.go index 36943074466..883b478171b 100644 --- a/api/cloudcontroller/ccv2/space_test.go +++ b/api/cloudcontroller/ccv2/space_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/stack.go b/api/cloudcontroller/ccv2/stack.go index fb53586c90d..2b55dbc6b12 100644 --- a/api/cloudcontroller/ccv2/stack.go +++ b/api/cloudcontroller/ccv2/stack.go @@ -1,9 +1,9 @@ package ccv2 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // Stack represents a Cloud Controller Stack. diff --git a/api/cloudcontroller/ccv2/stack_test.go b/api/cloudcontroller/ccv2/stack_test.go index 32dc0e45fe3..af070774e94 100644 --- a/api/cloudcontroller/ccv2/stack_test.go +++ b/api/cloudcontroller/ccv2/stack_test.go @@ -3,9 +3,9 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/target.go b/api/cloudcontroller/ccv2/target.go index 674e149101c..f06728bb18d 100644 --- a/api/cloudcontroller/ccv2/target.go +++ b/api/cloudcontroller/ccv2/target.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" "github.com/tedsuo/rata" ) @@ -57,8 +57,8 @@ func (client *Client) TargetCF(settings TargetSettings) (Warnings, error) { client.authorizationEndpoint = info.AuthorizationEndpoint client.cloudControllerAPIVersion = info.APIVersion client.dopplerEndpoint = info.DopplerEndpoint - //TODO Remove this condition when earliest supportest CAPI is 1.87.0 - //We have to do this because the current legacy supported CAPI version as of 2020 does not display the log cache url, this will break if a foundation on legacy CAPI have non-standard logcache urls + // TODO Remove this condition when earliest supportest CAPI is 1.87.0 + // We have to do this because the current legacy supported CAPI version as of 2020 does not display the log cache url, this will break if a foundation on legacy CAPI have non-standard logcache urls if rootInfo.Links.LogCache.HREF != "" { client.logCacheEndpoint = rootInfo.Links.LogCache.HREF } else { diff --git a/api/cloudcontroller/ccv2/target_test.go b/api/cloudcontroller/ccv2/target_test.go index e3f34dc112a..625d3f121c9 100644 --- a/api/cloudcontroller/ccv2/target_test.go +++ b/api/cloudcontroller/ccv2/target_test.go @@ -4,8 +4,8 @@ import ( "net/http" "strings" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/ccv2fakes" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/ccv2fakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/api/cloudcontroller/ccv2/user.go b/api/cloudcontroller/ccv2/user.go index 23d187abdc3..116c78f561c 100644 --- a/api/cloudcontroller/ccv2/user.go +++ b/api/cloudcontroller/ccv2/user.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/json" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/internal" ) // User represents a Cloud Controller User. diff --git a/api/cloudcontroller/ccv2/user_test.go b/api/cloudcontroller/ccv2/user_test.go index f3524c1392d..69bcc7c8624 100644 --- a/api/cloudcontroller/ccv2/user_test.go +++ b/api/cloudcontroller/ccv2/user_test.go @@ -3,8 +3,8 @@ package ccv2_test import ( "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/application.go b/api/cloudcontroller/ccv3/application.go index d4e7d56e0e2..9884ee8f10a 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 ee07cc6cf56..692f45438e0 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) type SSHEnabled struct { diff --git a/api/cloudcontroller/ccv3/application_feature_test.go b/api/cloudcontroller/ccv3/application_feature_test.go index 2b0567169ec..9e1e75344f4 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 97426b92f26..8cd551b3b28 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 2c671892184..d3829b15445 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 c1f9cd0a70d..b94d66c4a77 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 7846d58952e..b06fb79d8bc 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v7/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 9ef09c56dc9..42e85a22b84 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v7/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 6073e04d7ce..f5d5363756c 100644 --- a/api/cloudcontroller/ccv3/ccv3_suite_test.go +++ b/api/cloudcontroller/ccv3/ccv3_suite_test.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 5c41fa00cda..c689055a8e2 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/v7/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 46d95f6f2f3..6abc1ea0b32 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/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 7288a48e1fb..21a0fd801c1 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go @@ -5,8 +5,8 @@ import ( "io" "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" ) type FakeRequester struct { diff --git a/api/cloudcontroller/ccv3/client.go b/api/cloudcontroller/ccv3/client.go index 94cddc0ba18..f97d519acce 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/v7/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 31a0d2e8da8..5dc59b316fb 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/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 376891caddc..7cf8a83a24f 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/v7/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 a4dc7da040f..7fab39fe899 100644 --- a/api/cloudcontroller/ccv3/deployment.go +++ b/api/cloudcontroller/ccv3/deployment.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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) func (client *Client) CancelDeployment(deploymentGUID string) (Warnings, error) { diff --git a/api/cloudcontroller/ccv3/deployment_test.go b/api/cloudcontroller/ccv3/deployment_test.go index 56f336b1437..be827124bc0 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v7/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 6b0aae2141c..2935cc42c23 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) type SharedOrgs struct { diff --git a/api/cloudcontroller/ccv3/domain_test.go b/api/cloudcontroller/ccv3/domain_test.go index df3dbf5b599..1cf1dc88443 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v7/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 7d9bfe5e703..2cf75b5a326 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/uploads" + "code.cloudfoundry.org/cli/v7/resources" ) type DropletCreateRequest struct { diff --git a/api/cloudcontroller/ccv3/droplet_test.go b/api/cloudcontroller/ccv3/droplet_test.go index 2e8f9eed293..49f1c2cc567 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/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 45af18d5bbe..749963eb971 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/v7/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 14b8462218d..883057a97ab 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/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 22c50d8f97c..c96d7f9107d 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 f2ce0794bd5..cdcec11621b 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 7c6fd0baa8a..90bdf5ffe65 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" ) const taskWorkersUnavailable = "CF-TaskWorkersUnavailable" @@ -138,7 +138,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 48f2b9ca9b5..21704b842d7 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/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 bedc56faf8c..e3adaacc86a 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" ) type Event struct { diff --git a/api/cloudcontroller/ccv3/event_test.go b/api/cloudcontroller/ccv3/event_test.go index b584bba228d..1a9ba603bde 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/v7/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v7/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 80f775acc8e..79cf5d26836 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 ceeb15cf222..c2417d0ba14 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 2d5325e7160..06e23a5e3ec 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/v7/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 30d0ed0d23c..b030616b88e 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/resources" ) type InfoLinks struct { diff --git a/api/cloudcontroller/ccv3/info_test.go b/api/cloudcontroller/ccv3/info_test.go index 6247074ef80..59958945f97 100644 --- a/api/cloudcontroller/ccv3/info_test.go +++ b/api/cloudcontroller/ccv3/info_test.go @@ -5,9 +5,9 @@ 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/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" . "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 3c42922d81d..f36bb548f68 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/v7/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 16dbd4ec174..71af3154675 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 a52e3d1344c..6320bccfcc4 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 fd833f78f2c..837099f5230 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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 8047b7cf4fc..fc09bb28ce9 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/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 f49a965789f..63a50c3f59c 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/v7/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 3c6d3bd6219..ecd8b95ee6b 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/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 7d5bb8ea03b..aac57700d9a 100644 --- a/api/cloudcontroller/ccv3/manifest.go +++ b/api/cloudcontroller/ccv3/manifest.go @@ -1,7 +1,7 @@ package ccv3 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" ) // 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 56c1382a40f..a6451200144 100644 --- a/api/cloudcontroller/ccv3/manifest_test.go +++ b/api/cloudcontroller/ccv3/manifest_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/ccv3fakes" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/metadata.go b/api/cloudcontroller/ccv3/metadata.go index 0bad6498ab7..5d2b3b7616c 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 a5f624fe4a1..83ca9c33a70 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/v7/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/types" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + . "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 b75cad50e9a..ce415f5cceb 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 8812493a565..fecd764c5b6 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 ea3ad72ca36..825e816d7fb 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 b5b9150b47d..a6037504c52 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + . "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 0dcdfcaaaf2..e0a4d24b8c4 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 5cc627d2903..08616c459e5 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/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 6b5a3b12fc0..b11e29e59d3 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/v7/api/cloudcontroller" ) func (requester RealRequester) paginate(request *cloudcontroller.Request, obj interface{}, appendToExternalList func(interface{}) error) (IncludedResources, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/paginated_resources_test.go b/api/cloudcontroller/ccv3/paginated_resources_test.go index debe0ad1626..3b2b6b55ac3 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/v7/api/cloudcontroller" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + . "code.cloudfoundry.org/cli/v7/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 d03f2885fb9..e0368d288ec 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 572ce04b8e3..a6ed5a9fe46 100644 --- a/api/cloudcontroller/ccv3/process_instance.go +++ b/api/cloudcontroller/ccv3/process_instance.go @@ -5,9 +5,9 @@ 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" ) // 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 5eee667fdad..faa8061c0a0 100644 --- a/api/cloudcontroller/ccv3/process_instance_test.go +++ b/api/cloudcontroller/ccv3/process_instance_test.go @@ -4,9 +4,9 @@ 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" . "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 140b621b1c0..e422479b9d7 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 e614d4c8195..99a01ad65cb 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/v7/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 c121c3c859f..6450eeea2ec 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) // DeleteIsolationSegmentOrganization will delete the relationship between diff --git a/api/cloudcontroller/ccv3/relationship_list.go b/api/cloudcontroller/ccv3/relationship_list.go index 6a927b529c2..7f934dceffb 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 ebb5c22b283..d64dcf2a807 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 c0d432a1c50..c676a42ab38 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 366d533abc8..03408cc53b4 100644 --- a/api/cloudcontroller/ccv3/request.go +++ b/api/cloudcontroller/ccv3/request.go @@ -4,8 +4,8 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/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 ef4838d9c1d..6a1499589d0 100644 --- a/api/cloudcontroller/ccv3/requester.go +++ b/api/cloudcontroller/ccv3/requester.go @@ -7,8 +7,8 @@ import ( "io" "runtime" - "code.cloudfoundry.org/cli/api/cloudcontroller" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/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 bb4d4f4910c..bd3a03882e9 100644 --- a/api/cloudcontroller/ccv3/requester_test.go +++ b/api/cloudcontroller/ccv3/requester_test.go @@ -7,13 +7,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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" + . "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 cb8d778c37f..9fe57dfbc42 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" ) type Checksum struct { diff --git a/api/cloudcontroller/ccv3/resource_test.go b/api/cloudcontroller/ccv3/resource_test.go index 0b47d31fb0a..39ef04350c4 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/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 67b14a0fc53..1a50f902850 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 fe3ac699ea2..33e41c99c7b 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 7e12f96dc8b..b6bacdf2af3 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 50a226da1b8..b299b2045f3 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 c0643d5eb87..7aff2c38bee 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) func (client Client) CreateRoute(route resources.Route) (resources.Route, Warnings, error) { diff --git a/api/cloudcontroller/ccv3/route_test.go b/api/cloudcontroller/ccv3/route_test.go index 041ad870d1f..97dc63f1a51 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 1880769ceff..27878ddf95a 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 b2a1e915aea..177941a4e2a 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/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 c61b0d9fa23..b9836ae3812 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 ab4ea030bdd..985317459f1 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_instance.go b/api/cloudcontroller/ccv3/service_instance.go index de87f47212a..7bc173ec8d6 100644 --- a/api/cloudcontroller/ccv3/service_instance.go +++ b/api/cloudcontroller/ccv3/service_instance.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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) // GetServiceInstances lists service instances with optional filters. diff --git a/api/cloudcontroller/ccv3/service_instance_test.go b/api/cloudcontroller/ccv3/service_instance_test.go index 1b1e1f4f827..61e9b4aebe1 100644 --- a/api/cloudcontroller/ccv3/service_instance_test.go +++ b/api/cloudcontroller/ccv3/service_instance_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/resources" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/service_offering.go b/api/cloudcontroller/ccv3/service_offering.go index 8e1fddbfa42..8dd5470da81 100644 --- a/api/cloudcontroller/ccv3/service_offering.go +++ b/api/cloudcontroller/ccv3/service_offering.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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) // 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 0e3d898951a..1a87ebaa63d 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/ccv3fakes" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 20d5d8cc9d5..9aeb1018f7b 100644 --- a/api/cloudcontroller/ccv3/service_plan.go +++ b/api/cloudcontroller/ccv3/service_plan.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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) // GetServicePlans lists service plan with optional filters. diff --git a/api/cloudcontroller/ccv3/service_plan_test.go b/api/cloudcontroller/ccv3/service_plan_test.go index c8db9f1cab2..0b61d7bff2c 100644 --- a/api/cloudcontroller/ccv3/service_plan_test.go +++ b/api/cloudcontroller/ccv3/service_plan_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/resources" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" . "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 89fb79b21f7..d1db8bb2f8f 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 d5d0c7a136d..4d5b368412e 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 f9e59c92a25..f0962f23906 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 744bb8db77e..f5b6fe84ec5 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 cad31730bcb..47c08654efd 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 462295bc4e3..c78f70f8f5a 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 d3aea454d72..0f200a65cf3 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/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 b8fb01a176f..5ef4fb84362 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 92a91e238b0..339e5f2be12 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 2f5313e1f69..bc71cda7476 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + . "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 e1704a3c39a..7ca3fa01d2d 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/resources" ) // GetStacks lists stacks with optional filters. diff --git a/api/cloudcontroller/ccv3/stack_test.go b/api/cloudcontroller/ccv3/stack_test.go index 8ad2225db6e..6c3a6f3cf81 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 7038e8170bf..1b9f54fcfe2 100644 --- a/api/cloudcontroller/ccv3/target_test.go +++ b/api/cloudcontroller/ccv3/target_test.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 359ee9277a4..e03489ce3fa 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 c45c4d4b7a3..7812c38f4fd 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/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 88412343e84..968468bc406 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/v7/api/cloudcontroller/ccv3/internal" + "code.cloudfoundry.org/cli/v7/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 5edc364d1e2..e882689b20a 100644 --- a/api/cloudcontroller/ccv3/user_test.go +++ b/api/cloudcontroller/ccv3/user_test.go @@ -5,9 +5,9 @@ import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/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 2107a905a9d..ead507639dc 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/v7/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 6f4083b5041..46600365aef 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/v7/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 b5601a86ccd..2fb03d9952b 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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 b32124f5ce7..2842b090978 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/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 068ea8e1a50..7c78f21725b 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/v7/api/cloudcontroller" ) type FakeConnection struct { diff --git a/api/cloudcontroller/pipebomb.go b/api/cloudcontroller/pipebomb.go index 29ac6b0fe17..230baad66f4 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/v7/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 fa69b97a9ad..ff2235eb4d0 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/v7/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 dc6b38af746..54e02225997 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/v7/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/request_logger.go b/api/cloudcontroller/wrapper/request_logger.go index abebb85108c..df51a451af1 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/v7/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 f105321c9a9..b90a6008c80 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/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 cf9e7f6cd6b..8df51d6774e 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/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 118d285ae2a..029d29efe4f 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v7/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 98708f9e5d7..4b23b043b39 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/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 d7e066ed6ba..491a0442b68 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/v7/api/uaa" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/cloudcontrollerfakes" + . "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v7/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 1ef43d68900..e9c365bfc7c 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/v7/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 fc1158cfa33..a313e5d722f 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/v7/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 b328b1d7c81..99455bab0ad 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/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/api/uaa" ) type FakeUAAClient struct { diff --git a/api/plugin/client_test.go b/api/plugin/client_test.go index 4a3275201ee..1b0f3832aa3 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/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/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 5261eba3b6d..078fbbe106a 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/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/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 465be1bacd3..4aeeb0149e0 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/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/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 ac1a8b36f56..c1cbcbd7444 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/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/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 d929b9a2a9d..d4afeefb371 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/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/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 fb573421058..421d023a8d4 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/v7/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 7c0c8374cf4..4d7dddf8be9 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/v7/api/plugin" ) type FakeConnection struct { diff --git a/api/plugin/pluginfakes/fake_connection_wrapper.go b/api/plugin/pluginfakes/fake_connection_wrapper.go index 02121dbbc4d..3f28d830967 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/v7/api/plugin" ) type FakeConnectionWrapper struct { diff --git a/api/plugin/pluginfakes/fake_proxy_reader.go b/api/plugin/pluginfakes/fake_proxy_reader.go index bb9729e831c..139e7a944a3 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/v7/api/plugin" ) type FakeProxyReader struct { diff --git a/api/plugin/wrapper/request_logger.go b/api/plugin/wrapper/request_logger.go index 8903969fd09..aa23b24c7e5 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/v7/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 2b6a5fe1e4e..270411df69a 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/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v7/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v7/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 0af18b74dba..7374ee36010 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/v7/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 151c32b5a03..bc035e64e77 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/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginfakes" + . "code.cloudfoundry.org/cli/v7/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 5f0b28bfaaa..96d51fefdb1 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/v7/api/plugin/wrapper" ) type FakeRequestLoggerOutput struct { diff --git a/api/router/client.go b/api/router/client.go index b6ceeefe46f..686c79e2f3b 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/v7/api/router/internal" "github.com/tedsuo/rata" ) diff --git a/api/router/router_connection.go b/api/router/router_connection.go index c5e8ebbc4bd..90bfe6c9649 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/router/routererror" + "code.cloudfoundry.org/cli/v7/util" ) // ConnectionConfig is for configuring the RouterConnection diff --git a/api/router/router_group.go b/api/router/router_group.go index de67d5cf6f2..fb70d3f6930 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/v7/api/router/internal" + "code.cloudfoundry.org/cli/v7/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 461d183cf54..29bab6a0ede 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/v7/api/router" + "code.cloudfoundry.org/cli/v7/api/router/routererror" + "code.cloudfoundry.org/cli/v7/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 483f3bbb725..76395c245f9 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/v7/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 5185d53c75f..685d51ef9e6 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/v7/api/router" ) type FakeConnection struct { diff --git a/api/router/routerfakes/fake_connection_wrapper.go b/api/router/routerfakes/fake_connection_wrapper.go index d890a183eb8..cc7ebb16e82 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/v7/api/router" ) type FakeConnectionWrapper struct { diff --git a/api/router/wrapper/error_wrapper.go b/api/router/wrapper/error_wrapper.go index 07579b90951..9b1122a0aaf 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/v7/api/router" + "code.cloudfoundry.org/cli/v7/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 e5b57115d18..9e20d7ff11b 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/v7/api/router" + "code.cloudfoundry.org/cli/v7/api/router/routererror" + "code.cloudfoundry.org/cli/v7/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v7/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 9f7b4206ea9..25a1d3f6a30 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/v7/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 ac025e02d7c..ae0b21f079f 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/v7/api/router" + "code.cloudfoundry.org/cli/v7/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v7/api/router/wrapper" + "code.cloudfoundry.org/cli/v7/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 6fca8a07d8b..7548a9c97f3 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/v7/api/router" + "code.cloudfoundry.org/cli/v7/api/router/routererror" + "code.cloudfoundry.org/cli/v7/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 73320125a9d..7d7b1de6623 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/v7/api/router" + "code.cloudfoundry.org/cli/v7/api/router/routererror" + "code.cloudfoundry.org/cli/v7/api/router/routerfakes" + . "code.cloudfoundry.org/cli/v7/api/router/wrapper" + "code.cloudfoundry.org/cli/v7/api/router/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/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 665f9441df8..7f7f2a0738a 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/v7/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 780d388a0bd..2beb2a8e51e 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/v7/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 e534f49ba47..99050df08b6 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/v7/api/router/wrapper" + "code.cloudfoundry.org/cli/v7/api/uaa" ) type FakeUAAClient struct { diff --git a/api/uaa/auth.go b/api/uaa/auth.go index 29af4cf357e..c3ca178bf6a 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/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/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 16d3d28bae4..34e3ae0e4a5 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/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 a8ccd54e4f9..94e651d96c3 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/v7/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 e9186242ac5..9e99b256879 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/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 a3fb6596904..183b63b8792 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/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 2741bb22682..139484e6923 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/v7/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 e808296c04a..fa0cf09d79e 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/v7/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 d905db448bd..858de4735e2 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/v7/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 21ec9048164..aecd368f4fb 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/noaabridge" ) type FakeUAAClient struct { diff --git a/api/uaa/noaabridge/token_refresher.go b/api/uaa/noaabridge/token_refresher.go index 1c5278618ba..1ab419bdda0 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/v7/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 b7bdf5fcee2..b73433e4b7d 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/v7/api/uaa" + . "code.cloudfoundry.org/cli/v7/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v7/api/uaa/noaabridge/noaabridgefakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/refresh_token.go b/api/uaa/refresh_token.go index fba19e211ea..deb1ac44a96 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/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/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 9ad26e3d093..39b587aae13 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/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 a49df595b4d..8fd1f6ca155 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/v7/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 92a88999a9d..2faddee09e9 100644 --- a/api/uaa/resources.go +++ b/api/uaa/resources.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "code.cloudfoundry.org/cli/api/uaa/internal" + "code.cloudfoundry.org/cli/v7/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 c08b2917976..41f1015aa39 100644 --- a/api/uaa/resources_test.go +++ b/api/uaa/resources_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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/ssh.go b/api/uaa/ssh.go index 01cff5eeaa9..1dab5539615 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/v7/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 94ff8071092..00eee614600 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/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 69c6be93fd2..3de841ece78 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/v7/util" ) // UAAConnection represents the connection to UAA diff --git a/api/uaa/uaa_connection_test.go b/api/uaa/uaa_connection_test.go index 25009795a4f..d21df706e96 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/v7/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 8383cb20f92..20565d08660 100644 --- a/api/uaa/uaa_suite_test.go +++ b/api/uaa/uaa_suite_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - . "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/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 02dc7f5e992..96726f24176 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/v7/api/uaa" ) type FakeConfig struct { diff --git a/api/uaa/uaafakes/fake_connection.go b/api/uaa/uaafakes/fake_connection.go index b9013ee19d7..0548db919cb 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/v7/api/uaa" ) type FakeConnection struct { diff --git a/api/uaa/uaafakes/fake_connection_wrapper.go b/api/uaa/uaafakes/fake_connection_wrapper.go index 98ef73893ff..c2e67bb1e11 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/v7/api/uaa" ) type FakeConnectionWrapper struct { diff --git a/api/uaa/user.go b/api/uaa/user.go index 0ca5fa9d39e..c7daee718b0 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/uaa/internal" ) // User represents an UAA user account. diff --git a/api/uaa/user_test.go b/api/uaa/user_test.go index e86ade3a0cc..f84abfa6ea8 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/v7/actor/actionerror" + . "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/uaafakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/uaa/wrapper/request_logger.go b/api/uaa/wrapper/request_logger.go index 8e034252114..b3fca2eb6bc 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/v7/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 b7b0f036faa..b0d0a4669ed 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v7/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v7/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 fa5c1103533..4f4382454fc 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/v7/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 7c0270dec97..687a609bbb8 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v7/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 96bc7e64d03..589c8117f4c 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/v7/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 055dac1f799..eeb874c7ca0 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/uaafakes" + . "code.cloudfoundry.org/cli/v7/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v7/api/uaa/wrapper/util" + "code.cloudfoundry.org/cli/v7/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 4d6ba759ad9..efe17ad55aa 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/v7/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 b1516a14ad4..909b56123aa 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/v7/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 57836aafcd7..49de2c12717 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/wrapper" ) type FakeUAAClient struct { diff --git a/cf/actors/actors_suite_test.go b/cf/actors/actors_suite_test.go index d40c9f87f64..8d537540842 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 caa013a6867..0cf315225bd 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakePushActor struct { diff --git a/cf/actors/actorsfakes/fake_route_actor.go b/cf/actors/actorsfakes/fake_route_actor.go index 795612f4250..1f413e1bbed 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeRouteActor struct { diff --git a/cf/actors/actorsfakes/fake_service_actor.go b/cf/actors/actorsfakes/fake_service_actor.go index 292c15a4dae..e0140beea35 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/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 35cd597e588..f7b0c72a677 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/v7/cf/actors" ) type FakeServicePlanActor struct { diff --git a/cf/actors/brokerbuilder/broker_builder.go b/cf/actors/brokerbuilder/broker_builder.go index e46d9501f5c..21ae0fb941d 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/v7/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 8d009927325..84e2173c4ed 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/v7/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/models" - "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v7/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 8afcd08a52a..a9ca5673735 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/v7/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeBrokerBuilder struct { diff --git a/cf/actors/planbuilder/plan_builder.go b/cf/actors/planbuilder/plan_builder.go index 871f450a4ed..eccaf9bb3c6 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/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 f49c1b6a1fa..43151a1c1ba 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/v7/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/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 73e44142c00..15f4b9c167f 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/v7/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakePlanBuilder struct { diff --git a/cf/actors/plugininstaller/plugin_downloader.go b/cf/actors/plugininstaller/plugin_downloader.go index b431d11d445..27b0c39212d 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/util/downloader" ) type PluginDownloader struct { diff --git a/cf/actors/plugininstaller/plugin_installer.go b/cf/actors/plugininstaller/plugin_installer.go index d7b8724f178..5e65e883590 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/v7/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/util/downloader" + "code.cloudfoundry.org/cli/v7/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 50845ff4a27..135f60e77cf 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/v7/cf/actors/pluginrepo" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/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 7cf0bf97038..0cceb4a8d72 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 fd496df7119..ec86945ed08 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/v7/cf/actors/plugininstaller" ) type FakePluginInstaller struct { diff --git a/cf/actors/pluginrepo/plugin_repo.go b/cf/actors/pluginrepo/plugin_repo.go index e7ac7ef6be9..e4817b34f69 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/v7/cf/models" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/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 cbb56b8b877..808876e2d73 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 3247dd2800c..98bdbccf1a6 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/v7/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/models" + . "code.cloudfoundry.org/cli/v7/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 8971d8783c6..dc1735d38a1 100644 --- a/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go +++ b/cf/actors/pluginrepo/pluginrepofakes/fake_plugin_repo.go @@ -5,8 +5,8 @@ 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/v7/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakePluginRepo struct { diff --git a/cf/actors/push.go b/cf/actors/push.go index 182e2b2f308..21401fc1ae8 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/v7/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/appfiles" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/actors/push_test.go b/cf/actors/push_test.go index 205850e52cd..bf49e53da51 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/applicationbits/applicationbitsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/appfiles" + "code.cloudfoundry.org/cli/v7/cf/appfiles/appfilesfakes" + "code.cloudfoundry.org/cli/v7/cf/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/routes.go b/cf/actors/routes.go index 0b360480504..18b0d7556f5 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/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 95176a5042e..621a6adcdcc 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + cferrors "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/errors/errorsfakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 c91f07a7b18..5611c1b9fc5 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/v7/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 380fcbb9b7d..041b2265d15 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/v7/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v7/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v7/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 2a05297cc3b..bf7d3feecc0 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/v7/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeServiceBuilder struct { diff --git a/cf/actors/services.go b/cf/actors/services.go index c776e317a30..df5574ac585 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/v7/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v7/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/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 47bc690aff9..4dd1906e3d6 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/v7/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/v7/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v7/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 ebd27048be2..086bef368d2 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/v7/cf/errors" + + "code.cloudfoundry.org/cli/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v7/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/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 16e5891b340..5bf247d5f63 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/actors/brokerbuilder/brokerbuilderfakes" + "code.cloudfoundry.org/cli/v7/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/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 a5e4f2aab66..91d8ed4467a 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/plugin/models" ) type pluginPrinter struct { diff --git a/cf/actors/userprint/ui.go b/cf/actors/userprint/ui.go index e75ad01ea08..301084b5307 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 006670f0b36..6c9b9dc02c8 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/v7/cf/actors/userprint" ) type FakeUserPrinter struct { diff --git a/cf/api/api_suite_test.go b/cf/api/api_suite_test.go index 063a28603b2..a7391497d1b 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 57f5838b1a1..f33d8f7c3f2 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 abe72109754..86092e24cd7 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeBuildpackBitsRepository struct { diff --git a/cf/api/apifakes/fake_buildpack_repository.go b/cf/api/apifakes/fake_buildpack_repository.go index 305e43965bb..a86749209c3 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeBuildpackRepository struct { diff --git a/cf/api/apifakes/fake_client_repository.go b/cf/api/apifakes/fake_client_repository.go index f470961a958..6d73610fc50 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/v7/cf/api" ) type FakeClientRepository struct { diff --git a/cf/api/apifakes/fake_curl_repository.go b/cf/api/apifakes/fake_curl_repository.go index 5be62978a63..50ef89eafda 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/v7/cf/api" ) type FakeCurlRepository struct { diff --git a/cf/api/apifakes/fake_domain_repository.go b/cf/api/apifakes/fake_domain_repository.go index d87faffe6d5..4e377144c45 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeDomainRepository struct { diff --git a/cf/api/apifakes/fake_route_repository.go b/cf/api/apifakes/fake_route_repository.go index 1400d7ee04a..f6a5b8ffb3a 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 2c93527c84a..37f35d576d6 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/v7/cf/api" ) type FakeRouteServiceBindingRepository struct { diff --git a/cf/api/apifakes/fake_routing_apirepository.go b/cf/api/apifakes/fake_routing_apirepository.go index e821850e54c..227743fbcfa 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 d68f7817ff0..86cb49e2006 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 265da6a06a8..686859f14d6 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 90f1206df36..a7272a87a0d 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 d919c306d8a..8fecd7a56b8 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 e650477f616..f08bfca11fd 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 dcf0e32cba8..0f04dfbadf3 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeServicePlanVisibilityRepository struct { diff --git a/cf/api/apifakes/fake_service_repository.go b/cf/api/apifakes/fake_service_repository.go index 752834cfad2..75319f3d53c 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/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 f2ca2905245..c0e95c56848 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 175e18d2bfc..5b3481e70bb 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeUserProvidedServiceInstanceRepository struct { diff --git a/cf/api/apifakes/fake_user_repository.go b/cf/api/apifakes/fake_user_repository.go index 04fa96b9652..6615a0fb5ec 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 25c6de49828..f209a53c9c2 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/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/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 4fb3576bad4..f00b140e1e6 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/v7/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 b82b3a0e6d6..33da9985512 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/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/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 1b361d6e7f6..555edaccb3a 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/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/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 0b64b79c80d..8ac1b8b4e70 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/v7/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 53798334cdf..136dc5a5f36 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/v7/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 fcc19904e9e..3fb0c246142 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/v7/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 832b2f0c3c4..62e7fbb0885 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/v7/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 fed622ff3cb..372d4294b4b 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/v7/cf/models" type OldFakeServiceSummaryRepo struct { GetSummariesInCurrentSpaceInstances []models.ServiceInstance diff --git a/cf/api/app_summary.go b/cf/api/app_summary.go index 15a9b2387ad..fc05ed78cc2 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" ) type ApplicationSummaries struct { diff --git a/cf/api/app_summary_test.go b/cf/api/app_summary_test.go index 36f0b0e0d76..efd159052c5 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v7/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 a1bc966c830..2cb363fab18 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 72faadddf92..4e4455a7581 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 3edf21f9783..80760714b7b 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/v7/cf/api/appevents" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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 601be0df596..d14287ca8b9 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/v7/cf/api/appevents" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeAppEventsRepository struct { diff --git a/cf/api/appevents/appeventsfakes/fake_repository.go b/cf/api/appevents/appeventsfakes/fake_repository.go index 1c62f9dde9d..738d6b74fa2 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/v7/cf/api/appevents" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeRepository struct { diff --git a/cf/api/appfiles/app_files.go b/cf/api/appfiles/app_files.go index 473b27e1226..a6d54c8516b 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/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 f1e204e4e19..fc69fca7a62 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 62f6484f2e0..1cf49fcfaba 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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/v7/cf/api/appfiles" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 f3d46847d71..46803718a0a 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/v7/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 38b0d22db35..f2b29f05f2c 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/v7/cf/api/appfiles" ) type FakeRepository struct { diff --git a/cf/api/appinstances/app_instances.go b/cf/api/appinstances/app_instances.go index 6a3ea086002..05397cad104 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 dc833a081ce..3e0e7838474 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 625a905edaf..cedcc76d056 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api/appinstances" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 efd79f324e4..25ae13fd557 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/v7/cf/api/appinstances" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeAppInstancesRepository struct { diff --git a/cf/api/appinstances/appinstancesfakes/fake_repository.go b/cf/api/appinstances/appinstancesfakes/fake_repository.go index 74baf569a43..99f0e0d9789 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/v7/cf/api/appinstances" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeRepository struct { diff --git a/cf/api/applicationbits/application_bits.go b/cf/api/applicationbits/application_bits.go index 1b16ae9d3cd..4c03fb117cc 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 80506752f90..9acfec38df4 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 0ee4183737d..17eed2c512d 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v7/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 9c69ac9fdc9..a7d3e6106d4 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/v7/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v7/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 fd56c911702..8de0fe9e350 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/v7/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v7/cf/api/resources" ) type FakeRepository struct { diff --git a/cf/api/applications/applications.go b/cf/api/applications/applications.go index 32058b5ba0f..4bcf12ea71c 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/v7/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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 4fc00bc02a7..0c2aaab31bb 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 125da3522a9..fe2c511bfd0 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 0d7974f80d5..cbfb478d10b 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeRepository struct { diff --git a/cf/api/authentication/authentication.go b/cf/api/authentication/authentication.go index 5e0fc670c64..8d7807dfd96 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/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 1469b4e91b5..5a362ce7f5d 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 a00143c9ee1..7a873c879ca 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 fc59759766a..5867242939c 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/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/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 7df7aadfc84..90629148e28 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/v7/cf/api/authentication" ) type FakeTokenRefresher struct { diff --git a/cf/api/buildpack_bits.go b/cf/api/buildpack_bits.go index da6efd357eb..7893892edf0 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/v7/cf/appfiles" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/util" "code.cloudfoundry.org/gofileutils/fileutils" ) diff --git a/cf/api/buildpack_bits_test.go b/cf/api/buildpack_bits_test.go index ae480e1fbba..b21095cf148 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/v7/cf/appfiles" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 abb6206eafb..d76f52ebb99 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 0cebb449ef7..2aa27087248 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v7/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 d1d9476252e..94900e398d8 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 0749a849131..a431fc63d75 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/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 06e6486cdc8..e7ddff7a0f2 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/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 e32ffea0f3e..166a24cbd6b 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 fa2b3139b95..ee855ad7c66 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/v7/cf/api/apifakes" + . "code.cloudfoundry.org/cli/v7/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + "code.cloudfoundry.org/cli/v7/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 3e4eb5f0137..49f70b66163 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/v7/cf/api/copyapplicationsource" ) type FakeRepository struct { diff --git a/cf/api/curl.go b/cf/api/curl.go index dd09950d009..149675ca09a 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 34fcd62e4d1..9dfe56b9df9 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 cb56fd65cb5..c441e059a73 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/v7/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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 54925d15bdb..f99bceec106 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 ce3e085ba8b..0514b92ab8c 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" ) type RemoteInfoRepository struct { diff --git a/cf/api/endpoints_test.go b/cf/api/endpoints_test.go index 3892bba24ed..9b68cf44abd 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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 296553615c1..a4ca0587475 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 5725fb98667..a9eb8f0343e 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 48a3724aebc..e6fdd4ea04c 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/v7/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v7/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 6bd8cefec96..d152bb79428 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/v7/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeRepository struct { diff --git a/cf/api/featureflags/feature_flags.go b/cf/api/featureflags/feature_flags.go index e9a038236cc..c71c54061aa 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 26e7da8db51..229286b8a6e 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 6c0cf5f925b..a60b087ea45 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 a68aa95f6b9..14a23a6ba39 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/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeFeatureFlagRepository struct { diff --git a/cf/api/logs/log_cache_message.go b/cf/api/logs/log_cache_message.go index 798b1653d3c..24ff44665de 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/v7/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 ee73874b72e..65908f5c51b 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/cf/api/logs" + "code.cloudfoundry.org/cli/v7/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 e6c39836903..d090508a21c 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 a3c48c45a77..9ec655673dc 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v7/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 74720c02748..5603817d0c8 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/v7/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 a89a655a1f7..628032628b3 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/v7/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 58c98a08a72..7c4a5775774 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/v7/cf/api/logs" ) type FakeRepository struct { diff --git a/cf/api/organizations/organizations.go b/cf/api/organizations/organizations.go index d376547ed76..a3a7a5290f3 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 3c75cf6d186..eee69705564 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 8819e5fe40d..e3c2f80c9b6 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 316d80c421b..e921d1e4568 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/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeOrganizationRepository struct { diff --git a/cf/api/password/password.go b/cf/api/password/password.go index 639248f2b97..4a785158361 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 9c8d685ba89..599c27e0a0a 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 b1b22d29c14..ed589ea5de0 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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/v7/cf/api/password" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 2ba9b6b5e18..18e1556675c 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/v7/cf/api/password" ) type FakeRepository struct { diff --git a/cf/api/quotas/quotas.go b/cf/api/quotas/quotas.go index 3781151ec11..feeae97dcc4 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 04d290d00bd..7d0e730ffd8 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 bfc056e5afa..3bf12f7a595 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/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" "encoding/json" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v7/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 cd31317b515..51dd5c05a24 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/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeQuotaRepository struct { diff --git a/cf/api/repository_locator.go b/cf/api/repository_locator.go index ef80f3d7cc7..8350a6f6fb4 100644 --- a/cf/api/repository_locator.go +++ b/cf/api/repository_locator.go @@ -1,33 +1,33 @@ package api import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "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/command" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/cf/api/appevents" + api_appfiles "code.cloudfoundry.org/cli/v7/cf/api/appfiles" + "code.cloudfoundry.org/cli/v7/cf/api/appinstances" + "code.cloudfoundry.org/cli/v7/cf/api/applicationbits" + "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v7/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/api/logs" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/password" + "code.cloudfoundry.org/cli/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/defaults/staging" + securitygroupspaces "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/api/stacks" + "code.cloudfoundry.org/cli/v7/cf/appfiles" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/trace" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type RepositoryLocator struct { diff --git a/cf/api/resources/applications.go b/cf/api/resources/applications.go index 16e8e1a11b6..fed50d6de02 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/v7/cf/models" ) type PaginatedApplicationResources struct { diff --git a/cf/api/resources/applications_test.go b/cf/api/resources/applications_test.go index e2ad37d376b..d4d371d2d68 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/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 e39dd918f19..e260b45d953 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/v7/cf/models" type PaginatedAuthTokenResources struct { Resources []AuthTokenResource diff --git a/cf/api/resources/buildpacks.go b/cf/api/resources/buildpacks.go index 12db203a222..285f0262941 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/v7/cf/models" type BuildpackResource struct { Resource diff --git a/cf/api/resources/domains.go b/cf/api/resources/domains.go index 4a0488ae7c8..b35a8efc90a 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/v7/cf/models" type DomainResource struct { Resource diff --git a/cf/api/resources/events.go b/cf/api/resources/events.go index a94d520589e..7f76f548ec8 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/util/generic" ) type EventResource interface { diff --git a/cf/api/resources/events_test.go b/cf/api/resources/events_test.go index 46cf9df9ec0..66a62f04e6d 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/v7/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 c800c492072..2a7bedb97c8 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/v7/cf/models" type FeatureFlagResource struct { Entity models.FeatureFlag diff --git a/cf/api/resources/organizations.go b/cf/api/resources/organizations.go index de7677b6f7e..27c36e864c9 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/v7/cf/models" type OrganizationResource struct { Resource diff --git a/cf/api/resources/quotas.go b/cf/api/resources/quotas.go index be3234992b7..9249091dc8e 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/v7/cf/models" type PaginatedQuotaResources struct { Resources []QuotaResource diff --git a/cf/api/resources/quotas_test.go b/cf/api/resources/quotas_test.go index a79e1712866..1b20d7b7afe 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/v7/cf/api/resources" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v7/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 1e1735288d2..4b659cda7f3 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 55e8ac47497..066ab3a653f 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/v7/cf/models" type RouteResource struct { Resource diff --git a/cf/api/resources/security_groups.go b/cf/api/resources/security_groups.go index 5b4a58f3c20..c00230d0969 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/v7/cf/models" type PaginatedSecurityGroupResources struct { Resources []SecurityGroupResource diff --git a/cf/api/resources/service_bindings.go b/cf/api/resources/service_bindings.go index df28cd11f6b..2989379bf47 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/v7/cf/models" type ServiceBindingResource struct { Resource diff --git a/cf/api/resources/service_brokers.go b/cf/api/resources/service_brokers.go index ad37ad9ce43..5b321b7a315 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/v7/cf/models" type ServiceBrokerResource struct { Resource diff --git a/cf/api/resources/service_instances.go b/cf/api/resources/service_instances.go index a8315a66308..909cebbe0a6 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/v7/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 1b88be8a86c..5c4d9dfe985 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/v7/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 6727fe33101..f2c55495306 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/v7/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 a74423b1cdb..5074ba477b2 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/v7/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 5cc8cc26752..58a6f54b71d 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/v7/cf/models" ) type PaginatedServiceOfferingResources struct { diff --git a/cf/api/resources/service_plan_visibility.go b/cf/api/resources/service_plan_visibility.go index 939bb16c8a8..0a625f74a45 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/v7/cf/models" type ServicePlanVisibilityResource struct { Resource diff --git a/cf/api/resources/service_plans.go b/cf/api/resources/service_plans.go index 1e310d00211..cb131ed586a 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/v7/cf/models" ) type ServicePlanResource struct { diff --git a/cf/api/resources/space_quotas.go b/cf/api/resources/space_quotas.go index 8a3d8658a43..ec552365020 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/v7/cf/models" type PaginatedSpaceQuotaResources struct { Resources []SpaceQuotaResource diff --git a/cf/api/resources/spaces.go b/cf/api/resources/spaces.go index e081c3fed6c..b967e655e32 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/v7/cf/models" type SpaceResource struct { Resource diff --git a/cf/api/resources/stacks.go b/cf/api/resources/stacks.go index fd114673cde..a6886d27d18 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/v7/cf/models" type PaginatedStackResources struct { Resources []StackResource diff --git a/cf/api/resources/users.go b/cf/api/resources/users.go index 61cbd23e463..c1a355f0f7a 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/v7/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 85215a48b17..53b04ea26fb 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/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 47a8409de76..a793850690d 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" "github.com/onsi/gomega/ghttp" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v7/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 0fc4f405cf8..81988647f85 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" "github.com/google/go-querystring/query" ) diff --git a/cf/api/routes_test.go b/cf/api/routes_test.go index e1862374acf..0e273437d2d 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + . "code.cloudfoundry.org/cli/v7/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 08cf6fd970c..b574f1f0e7c 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" ) type routingAPIRepository struct { diff --git a/cf/api/routing_api_test.go b/cf/api/routing_api_test.go index 37d874bb92e..19108e9c2c2 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/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 57e0e08d5d3..6982dbd56b9 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" ) type DefaultSecurityGroupsRepoBase struct { diff --git a/cf/api/securitygroups/defaults/running/running.go b/cf/api/securitygroups/defaults/running/running.go index 879669a72f6..0730f27ebbf 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults" + . "code.cloudfoundry.org/cli/v7/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 beeaf9853e2..79129d3c5a5 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 340d0b329fd..74db0b3d265 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 22b51815f6d..d0dd7538925 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/v7/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeSecurityGroupsRepo struct { diff --git a/cf/api/securitygroups/defaults/staging/staging.go b/cf/api/securitygroups/defaults/staging/staging.go index d75143f1653..895a04596a7 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" - . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults" + . "code.cloudfoundry.org/cli/v7/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 0e39b6127ab..02c9a94a491 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 6d805551bb2..b30cb25b35a 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/v7/cf/api/apifakes" + . "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + "code.cloudfoundry.org/cli/v7/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 5b4f8a39bfd..39c16710c3e 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/v7/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeSecurityGroupsRepo struct { diff --git a/cf/api/securitygroups/security_groups.go b/cf/api/securitygroups/security_groups.go index 4e72ff80857..4457c53aae5 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 093c14f29a8..3839b5082b3 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 c7846968046..0a36063e72a 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 7d6736c7f52..d817015759b 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/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeSecurityGroupRepo struct { diff --git a/cf/api/securitygroups/spaces/space_binder.go b/cf/api/securitygroups/spaces/space_binder.go index 16691d3a03d..ef2a2b21f23 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 f3992f96346..c2ed0bfb10f 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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/v7/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 768032bd026..f700c60c198 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/v7/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 935c3f694a8..d9afbfb38bb 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 931327e870d..92c76fa081f 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 2a8fba16eb7..cb3b653fb59 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 05d9118e84a..e2c7e5665b8 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 1d7f9dcb1d0..b2d8146e1d2 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + + . "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 df0080320fd..39befad9b95 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 6c979f1135c..7bfc72aec83 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 c7e2c006e98..73438342a1d 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 f404f12ac04..24294a07b75 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/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" - . "code.cloudfoundry.org/cli/cf/api" + . "code.cloudfoundry.org/cli/v7/cf/api" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v7/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 a2ad0291a9c..abb3655e6c5 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 26a74c13d07..1def34368ad 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 9d2aed39a85..976c831815c 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 cb17887ee42..8996adee5bf 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 a1920e80086..691105ea198 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" ) type ServiceInstancesSummaries struct { diff --git a/cf/api/service_summary_test.go b/cf/api/service_summary_test.go index 15e7b1bd0d3..fe491f1d213 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 87e91e208ce..393c4037c8b 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 62d5b1f476a..46e02d02792 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + . "code.cloudfoundry.org/cli/v7/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 07ab2cb248c..633e5aeadad 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 92d80051778..3f3cbebf69e 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 d895031c543..98db8c7d0df 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/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v7/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 c80e8b605cf..48570157ed3 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/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeSpaceQuotaRepository struct { diff --git a/cf/api/spaces/spaces.go b/cf/api/spaces/spaces.go index c7421629961..73247d25d4b 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 4fa12fe9ce2..f39a5b62ab1 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 157cb557444..609ff6f7bd4 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api/spaces" + . "code.cloudfoundry.org/cli/v7/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 0112f8ec720..701db7f58fa 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/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeSpaceRepository struct { diff --git a/cf/api/stacks/stacks.go b/cf/api/stacks/stacks.go index 94c5136102c..41d97c475fc 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/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 0b75daba4be..fd5d4b44c79 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 65a78a827a5..9f1e07e751f 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" - "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/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/v7/cf/api/stacks" + "code.cloudfoundry.org/cli/v7/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 bd4f105e3ff..56502d85e9c 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/v7/cf/api/stacks" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeStackRepository struct { diff --git a/cf/api/user_provided_service_instances.go b/cf/api/user_provided_service_instances.go index 2f19444dedc..bec957aee8c 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 87dd06baadf..0fdfb6f95cc 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + + . "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 bfe2c69520c..2ab6a8c3cc0 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 a2f06eddbbd..efe5c7848e7 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/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 216d1107676..234bdae7b2c 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/v7/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 eccda8a285c..ec2ee611a2d 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 63e79ce3571..c7daa72b4c8 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/v7/cf/appfiles" uuid "github.com/nu7hatch/gouuid" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v7/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 2075d71e7cb..3fabfda54af 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/v7/cf/appfiles" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeAppFiles struct { diff --git a/cf/appfiles/appfilesfakes/fake_cf_ignore.go b/cf/appfiles/appfilesfakes/fake_cf_ignore.go index 3efcacff4b5..4136fc296cb 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/v7/cf/appfiles" ) type FakeCfIgnore struct { diff --git a/cf/appfiles/appfilesfakes/fake_zipper.go b/cf/appfiles/appfilesfakes/fake_zipper.go index 1dff9a5b641..78667da60ec 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/v7/cf/appfiles" ) type FakeZipper struct { diff --git a/cf/appfiles/cf_ignore.go b/cf/appfiles/cf_ignore.go index 6faecd3ed8e..9d49cf69a6f 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/v7/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 12410ce8a83..f036364aa2d 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/v7/cf/appfiles" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/appfiles/zipper.go b/cf/appfiles/zipper.go index 22bccb71e54..6cc4f962ee2 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/v7/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 a262b2fdcf9..449cfdb6259 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/v7/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 d2c1a38264c..13e9da13f12 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commandsloader" + "code.cloudfoundry.org/cli/v7/cf/configuration" + "code.cloudfoundry.org/cli/v7/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" + "code.cloudfoundry.org/cli/v7/cf/util/spellcheck" + "code.cloudfoundry.org/cli/v7/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 5141c9bffd9..e8d79af27a0 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/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/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 7941211b441..6b11c8479d0 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/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 5bb4798d2b6..911903b9ee4 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/v7/cf/commandregistry" ) type FakeRandomWordGenerator struct { diff --git a/cf/commandregistry/dependency.go b/cf/commandregistry/dependency.go index 8360e9b8ed1..77c3b9e4ea4 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/actors/brokerbuilder" + "code.cloudfoundry.org/cli/v7/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v7/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/appfiles" + "code.cloudfoundry.org/cli/v7/cf/configuration" + "code.cloudfoundry.org/cli/v7/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/manifest" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" + "code.cloudfoundry.org/cli/v7/plugin/models" + "code.cloudfoundry.org/cli/v7/util" + "code.cloudfoundry.org/cli/v7/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 a58824a9799..cd7dee71871 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" "os" diff --git a/cf/commandregistry/fakecommand/fake_command1.go b/cf/commandregistry/fakecommand/fake_command1.go index 46c6a7a4599..bee028fb013 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeCommand1 struct { diff --git a/cf/commandregistry/fakecommand/fake_command2.go b/cf/commandregistry/fakecommand/fake_command2.go index 0d15e461c83..5e4488eda1d 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/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 1dacefa59db..7d573e4f018 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeCommand3 struct { diff --git a/cf/commandregistry/registry.go b/cf/commandregistry/registry.go index 2b7ee3cbf7f..97d8d580f3b 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" - . "code.cloudfoundry.org/cli/cf/terminal" + . "code.cloudfoundry.org/cli/v7/cf/terminal" ) var _ = initI18nFunc() diff --git a/cf/commandregistry/registry_test.go b/cf/commandregistry/registry_test.go index 86c5cfea4dc..2d68f95320c 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/v7/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/commandregistry/fakecommand" + . "code.cloudfoundry.org/cli/v7/cf/commandregistry/fakecommand" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/cf/i18n" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/api.go b/cf/commands/api.go index 8c448835745..e5d2f5a2c93 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type API struct { diff --git a/cf/commands/api_test.go b/cf/commands/api_test.go index 93d86d5ad66..f32da5db8e0 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" ) var _ = Describe("Api", func() { diff --git a/cf/commands/application/app.go b/cf/commands/application/app.go index de7ef2e8797..29bd8fd0acf 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/plugin/models" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/appinstances" + "code.cloudfoundry.org/cli/v7/cf/api/stacks" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/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 c419071b81e..65d558f1618 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/plugin/models" + + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/appinstances/appinstancesfakes" + + . "code.cloudfoundry.org/cli/v7/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 7d66957acfd..0ffa4f0ce00 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 95024a07f4b..6a324697296 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeAppDisplayer struct { diff --git a/cf/commands/application/applicationfakes/fake_displayer.go b/cf/commands/application/applicationfakes/fake_displayer.go index 29fd79fd744..734167606a0 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/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeDisplayer struct { diff --git a/cf/commands/application/applicationfakes/fake_restarter.go b/cf/commands/application/applicationfakes/fake_restarter.go index 1ee736c2abf..d19e70cac9a 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 6fdda4de082..d1957e0c37e 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/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeStagingWatcher struct { diff --git a/cf/commands/application/applicationfakes/fake_starter.go b/cf/commands/application/applicationfakes/fake_starter.go index 43ff78cdc40..2fba808148a 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeStarter struct { diff --git a/cf/commands/application/applicationfakes/fake_stopper.go b/cf/commands/application/applicationfakes/fake_stopper.go index fed79044c61..90780131cad 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeStopper struct { diff --git a/cf/commands/application/apps.go b/cf/commands/application/apps.go index d77b38fff28..d3e32c60352 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" - "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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/plugin/models" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/uihelpers" ) type ListApps struct { diff --git a/cf/commands/application/apps_test.go b/cf/commands/application/apps_test.go index 3ad32e19e38..86f7855d679 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/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/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/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 a5c9b286bd5..a454af4050a 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/api/copyapplicationsource" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 5d8e6ba0a22..4b86c965be3 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/api/copyapplicationsource/copyapplicationsourcefakes" + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + + . "code.cloudfoundry.org/cli/v7/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 caa784d5258..657ebfbf324 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DeleteApp struct { diff --git a/cf/commands/application/delete_test.go b/cf/commands/application/delete_test.go index 23d2bef4100..be4b62d0ab2 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 0f7f8f19235..ad1198260f1 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DisableSSH struct { diff --git a/cf/commands/application/disable_ssh_test.go b/cf/commands/application/disable_ssh_test.go index b223af0b660..f5946c98cf8 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 6971c44a607..9f8042b471d 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type EnableSSH struct { diff --git a/cf/commands/application/enable_ssh_test.go b/cf/commands/application/enable_ssh_test.go index aa820d3252e..53bfc8a2a6e 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 0783a5fd993..4bccc45a5d2 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type Env struct { diff --git a/cf/commands/application/env_test.go b/cf/commands/application/env_test.go index a4493225004..f43b044966d 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 1c143d75317..39c0cc33d23 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/v7/cf/api/appevents" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type Events struct { diff --git a/cf/commands/application/events_test.go b/cf/commands/application/events_test.go index c75b8507ce5..0a98444fa25 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + + "code.cloudfoundry.org/cli/v7/cf/api/appevents/appeventsfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 8584493eb53..aafae693b57 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/v7/cf/api/appfiles" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type Files struct { diff --git a/cf/commands/application/files_test.go b/cf/commands/application/files_test.go index cf8520b4155..32ff9b4fca7 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/appfiles/appfilesfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 b0dd926cf6b..71451048010 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 33b4071cdfb..720e9fab1a4 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 9bed3f1d754..ff111d05d12 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/v7/cf/api/logs" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type Logs struct { diff --git a/cf/commands/application/logs_test.go b/cf/commands/application/logs_test.go index e82d6e04d87..8228cdfe945 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/v7/cf/api/logs" + "code.cloudfoundry.org/cli/v7/cf/api/logs/logsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/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 8c48a7839a3..eae24181902 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/api/stacks" + "code.cloudfoundry.org/cli/v7/cf/appfiles" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/cf/manifest" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 2447c675510..f08313a1e19 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/v7/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v7/cf/appfiles/appfilesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commandregistry/commandregistryfakes" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v7/cf/commands/service/servicefakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/manifest" + "code.cloudfoundry.org/cli/v7/cf/manifest/manifestfakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/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 870217f8390..9c766de49a4 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type RenameApp struct { diff --git a/cf/commands/application/rename_test.go b/cf/commands/application/rename_test.go index eda7d25bcc5..c63c2931fe4 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 248a2b0453c..61f6ec30cf0 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 e55890f7ba6..b19adc223e2 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 2668be291c0..6c2d02fb8fc 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 c19dd6af3fd..a055c09004d 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/v7/cf/api/appinstances" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 b7e5f3545e9..dd2dfa1063a 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/v7/cf/api/appinstances/appinstancesfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 c4d2ba48cd0..361611dd345 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/v7/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/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 b6bc67957f0..74fc0e80b94 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 368e6241e42..8de315e2fc5 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 30363830d61..8c3713bd8c9 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type SetEnv struct { diff --git a/cf/commands/application/set_env_test.go b/cf/commands/application/set_env_test.go index 6089e957218..a3e334fd9f3 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 6a744a23def..b8669be319f 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 18c1fc26947..7647a6b4b58 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 f2a8e24481b..8dbf62f1d9b 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/requirements" + sshCmd "code.cloudfoundry.org/cli/v7/cf/ssh" + "code.cloudfoundry.org/cli/v7/cf/ssh/options" + sshTerminal "code.cloudfoundry.org/cli/v7/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v7/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 7152209b907..f3421fde021 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type SSHEnabled struct { diff --git a/cf/commands/application/ssh_enabled_test.go b/cf/commands/application/ssh_enabled_test.go index a5ef948be20..44f5d3f008c 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 99c93cc3228..c086f0bfdf6 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/commandsfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/ssh/sshfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/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 ee78184b8ee..78ca387507f 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api/appinstances" + "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/api/logs" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 fddba65a4ff..fdf684951c5 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/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/commands/application/applicationfakes" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + + "code.cloudfoundry.org/cli/v7/cf/api/appinstances/appinstancesfakes" + "code.cloudfoundry.org/cli/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/logs" + "code.cloudfoundry.org/cli/v7/cf/api/logs/logsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 c78385ae9fc..d284e6127af 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 d118e219df5..fff20606e37 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + . "code.cloudfoundry.org/cli/v7/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 f3754350cb4..df716dd85fe 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type UnsetEnv struct { diff --git a/cf/commands/application/unset_env_test.go b/cf/commands/application/unset_env_test.go index 64fca2773ed..54d78c25073 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 f65539edfff..6e4773e3f03 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type Authenticate struct { diff --git a/cf/commands/auth_test.go b/cf/commands/auth_test.go index 03202145677..52404027092 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/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 a5d02389fc0..98e7cab5d7b 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 9971cce2136..c4c388f20f2 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListBuildpacks struct { diff --git a/cf/commands/buildpack/buildpacks_test.go b/cf/commands/buildpack/buildpacks_test.go index 2b9c00fc954..226b1e8a792 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commands/buildpack" + . "code.cloudfoundry.org/cli/v7/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 b04eceb9f05..bb4fb1144ce 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type CreateBuildpack struct { diff --git a/cf/commands/buildpack/create_buildpack_test.go b/cf/commands/buildpack/create_buildpack_test.go index 8a5870fbb43..389aca2120a 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 d46f119b5e6..f12d63318da 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 4829e1c82bd..8235b2832ae 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 d9341db19d1..72883a99f97 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type RenameBuildpack struct { diff --git a/cf/commands/buildpack/rename_buildpack_test.go b/cf/commands/buildpack/rename_buildpack_test.go index d6cc8333250..538933d55d8 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 a6d50a0bcc9..112285bc316 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type UpdateBuildpack struct { diff --git a/cf/commands/buildpack/update_buildpack_test.go b/cf/commands/buildpack/update_buildpack_test.go index 64c572985d7..d2f6cee225c 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 c3529d26edd..2ffa96026c8 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/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 f7b1615709f..3f5d1a51584 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeSSHCodeGetter struct { diff --git a/cf/commands/config.go b/cf/commands/config.go index 83d003e59d3..870bb1b197d 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/cf/i18n" ) type ConfigCommands struct { diff --git a/cf/commands/config_test.go b/cf/commands/config_test.go index a2f4630dd54..10d56c5caca 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 b70141873df..9ae1cd061af 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/appinstances" + "code.cloudfoundry.org/cli/v7/cf/api/stacks" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/manifest" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 ad3b71d9b76..f0c92336e78 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/manifest/manifestfakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/stacks/stacksfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 3c07f8df6d6..d59f92702f3 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/v7/cf/flagcontext" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + cfErrors "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" ) type Curl struct { diff --git a/cf/commands/curl_test.go b/cf/commands/curl_test.go index 870836436e5..804f79547ec 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/trace" + . "code.cloudfoundry.org/cli/v7/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 b818e8540df..148105081fe 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type CreateDomain struct { diff --git a/cf/commands/domain/create_domain_test.go b/cf/commands/domain/create_domain_test.go index c2fd102c87a..ba65b8fb73f 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 ef6a1cae14b..33c2494df3e 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 33ee11a1001..c6a2bb6e1b8 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/cf/commands/domain" - "code.cloudfoundry.org/cli/cf/models" + "code.cloudfoundry.org/cli/v7/cf/commands/domain" + "code.cloudfoundry.org/cli/v7/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 09c650ba6b5..091fb826888 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DeleteDomain struct { diff --git a/cf/commands/domain/delete_domain_test.go b/cf/commands/domain/delete_domain_test.go index a4af8db6a77..3e0ec17453c 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 c8f966a1c87..f6199f3f808 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 c3517a09c43..8d45b1fe143 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 1134db11e9f..123abdb6485 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 8956bc42843..24fee6d802c 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListDomains struct { diff --git a/cf/commands/domain/domains_test.go b/cf/commands/domain/domains_test.go index 4c0e07406a2..66748017c6b 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/cf/commands/domain" + "code.cloudfoundry.org/cli/v7/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 1390d465359..379790e52dc 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 d123fcd468f..922d7ff9527 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/v7/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 51a06ebf13e..f941dad472c 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/v7/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 45430d558c2..a5f646f1355 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/v7/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 ebe73f6c22e..e3b83c1a6ee 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/v7/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 e995b8cf2e0..f6dbbb29719 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/v7/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 a5c3a05a2bc..624ce00b34d 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/v7/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + cf_errors "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 ba246d57fec..cd6f00fe83e 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/v7/cf/api/environmentvariablegroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 affe6255406..8d3b92302a0 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/v7/cf/api/environmentvariablegroups/environmentvariablegroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 2ae884c2df7..b0d9c9be5fb 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/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 c5a33a98a59..6a1824a2b66 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/v7/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 196dc9cafc0..03e2d9bb1f4 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/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 f08ebdcdc96..adbf78aa052 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/v7/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 284fc95c7c7..fef463153ee 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/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ShowFeatureFlag struct { diff --git a/cf/commands/featureflag/feature_flag_test.go b/cf/commands/featureflag/feature_flag_test.go index bb7a483ee17..34aceaecf04 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/v7/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 045e5575bc3..dfb01fffe0e 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/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListFeatureFlags struct { diff --git a/cf/commands/featureflag/feature_flags_test.go b/cf/commands/featureflag/feature_flags_test.go index 1c0599416c9..fad5fe1f5cc 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/v7/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/featureflag" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 29d57065073..3715f93ca1a 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 4415d7de931..12b2be22093 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/help" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + + . "code.cloudfoundry.org/cli/v7/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 b9e838d3f45..c5ae787ffe2 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/commandsloader" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/plugin" + + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/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 4dbea14d2e9..5e4eef06871 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/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) const maxLoginTries = 3 diff --git a/cf/commands/login_test.go b/cf/commands/login_test.go index 09d81bcc944..d3f1184ef65 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/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/matchers" ) var _ = Describe("Login Command", func() { diff --git a/cf/commands/logout.go b/cf/commands/logout.go index e74e6d58ae4..3b4fe6c13a4 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type Logout struct { diff --git a/cf/commands/logout_test.go b/cf/commands/logout_test.go index 1ac2947ed21..7951373385a 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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 3013e9d9764..85c2be2f6ce 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/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" ) type OAuthToken struct { diff --git a/cf/commands/oauth_token_test.go b/cf/commands/oauth_token_test.go index 4e74a28de30..a51b699e6fa 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/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 598c20fc4d5..240f0c86599 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 d4f78576149..18587f6b476 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/v7/cf/commands/user/userfakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 de15697f965..6f3d187bec7 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/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DeleteOrg struct { diff --git a/cf/commands/organization/delete_org_test.go b/cf/commands/organization/delete_org_test.go index f0fea1a9d61..0fac4ae086a 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/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 c8d2034267e..7836f38c7d0 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" ) type ShowOrg struct { diff --git a/cf/commands/organization/org_test.go b/cf/commands/organization/org_test.go index f310f83184a..3303492166a 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commands/organization" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v7/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 6f809a00db5..3545d08b280 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 6168ccfc974..73ed05e9fc6 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/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" ) const orgLimit = 0 diff --git a/cf/commands/organization/orgs_test.go b/cf/commands/organization/orgs_test.go index ae0d7822baf..6b777b35b41 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/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/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/v7/cf/commands/organization" + . "code.cloudfoundry.org/cli/v7/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 cbbf929bd2f..9b97dbc98f0 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/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type RenameOrg struct { diff --git a/cf/commands/organization/rename_org_test.go b/cf/commands/organization/rename_org_test.go index 8d9fe048cdf..ee25902c0f2 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/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 b743579a57b..110c736afa2 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/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type SetQuota struct { diff --git a/cf/commands/organization/set_quota_test.go b/cf/commands/organization/set_quota_test.go index 166bc33525c..b94a55648bf 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/v7/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 0e254c8efe0..eaab6e361af 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type SharePrivateDomain struct { diff --git a/cf/commands/organization/unshare_private_domain.go b/cf/commands/organization/unshare_private_domain.go index 0f60dd0739c..d5b6a17b7cc 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type UnsharePrivateDomain struct { diff --git a/cf/commands/passwd.go b/cf/commands/passwd.go index 51c9b1fa809..f8ad2603afb 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/v7/cf/api/password" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type Password struct { diff --git a/cf/commands/passwd_test.go b/cf/commands/passwd_test.go index 2a7b9a25021..8d37faa0599 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 ac9c21d567f..6fe1e518c1f 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/v7/cf/actors/plugininstaller" + "code.cloudfoundry.org/cli/v7/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/util/downloader" + "code.cloudfoundry.org/cli/v7/plugin" + "code.cloudfoundry.org/cli/v7/util" "code.cloudfoundry.org/gofileutils/fileutils" - pluginRPCService "code.cloudfoundry.org/cli/plugin/rpc" + pluginRPCService "code.cloudfoundry.org/cli/v7/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 5e7e3645e6b..191186485da 100644 --- a/cf/commands/plugin/install_plugin_test.go +++ b/cf/commands/plugin/install_plugin_test.go @@ -11,25 +11,25 @@ import ( "strings" "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" + "code.cloudfoundry.org/cli/v7/cf/actors/pluginrepo/pluginrepofakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commandregistry/commandregistryfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/cf/util/utilfakes" + "code.cloudfoundry.org/cli/v7/plugin" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 c970694347c..72cf9f9ba6b 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/v7/cf/commands/plugin" + "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v7/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 844b1ff5768..9dc490b22d9 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/util" + "code.cloudfoundry.org/cli/v7/util/sorting" ) type Plugins struct { diff --git a/cf/commands/plugin/plugins_test.go b/cf/commands/plugin/plugins_test.go index 3f9caea8fd0..9dc8cd129df 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/v7/cf/commandregistry" + plugincmd "code.cloudfoundry.org/cli/v7/cf/commands/plugin" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig/pluginconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/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 5d7574d7436..cd44dfbbb77 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + rpcService "code.cloudfoundry.org/cli/v7/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 eccf500ad65..ff7ad2b120a 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration" + "code.cloudfoundry.org/cli/v7/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/commands" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 b91f44bb42b..5135f59904d 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/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 4c1189e7c7c..ede26807cce 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/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v7/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 d7a1b0a6294..e73588c0c22 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/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 246ddfb4126..82067bc8d77 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 eb1596a24e3..8b3a4a20fb0 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/v7/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 6d4aa411e02..54810d06627 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/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 679f75bdca4..e58bf207631 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/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v7/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 dd0af956b9d..66586c82b5b 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/v7/cf/actors/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/cf/i18n" ) type RepoPlugins struct { diff --git a/cf/commands/pluginrepo/repo_plugins_test.go b/cf/commands/pluginrepo/repo_plugins_test.go index d1cc91420ac..20334d6c9c0 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/v7/cf/actors/pluginrepo/pluginrepofakes" + "code.cloudfoundry.org/cli/v7/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" - "code.cloudfoundry.org/cli/cf/commandregistry" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" clipr "code.cloudfoundry.org/cli-plugin-repo/web" - "code.cloudfoundry.org/cli/cf/flags" + "code.cloudfoundry.org/cli/v7/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 bfcce949868..7ed7623044f 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/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type CreateQuota struct { diff --git a/cf/commands/quota/create_quota_test.go b/cf/commands/quota/create_quota_test.go index 4baad819055..77337dfbda1 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/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/v7/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/commands/quota" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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 d8e08d7fbb1..85ff5a16c29 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/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DeleteQuota struct { diff --git a/cf/commands/quota/delete_quota_test.go b/cf/commands/quota/delete_quota_test.go index 936521414b3..d4fafccc4b8 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/v7/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/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 d1e91e8b5d5..e7fed9145bf 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type showQuota struct { diff --git a/cf/commands/quota/quota_suite_test.go b/cf/commands/quota/quota_suite_test.go index 87b6847303e..306e1618f92 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 bc1a7ff6c13..cd6e0a09286 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/v7/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" ) var _ = Describe("quota", func() { diff --git a/cf/commands/quota/quotas.go b/cf/commands/quota/quotas.go index ef9396576a8..dd3cb3ba39c 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListQuotas struct { diff --git a/cf/commands/quota/quotas_test.go b/cf/commands/quota/quotas_test.go index 2d74520bac4..9bed2e51403 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/v7/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v7/cf/commands/quota" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/terminal" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/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 ead549e3791..d4cae1ee03a 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/v7/cf/api/quotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type UpdateQuota struct { diff --git a/cf/commands/quota/update_quota_test.go b/cf/commands/quota/update_quota_test.go index d149aa4e645..ad39ce10876 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/v7/cf/api/quotas/quotasfakes" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + cmdsQuota "code.cloudfoundry.org/cli/v7/cf/commands/quota" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 846d09ceeb6..7336caa7e23 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type CheckRoute struct { diff --git a/cf/commands/route/check_route_test.go b/cf/commands/route/check_route_test.go index 960c7b7affa..8916b85ecd7 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 d9c0cd3c707..071729492f6 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 e68a88bdc52..e796c6e8dce 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 7eb1ec04a23..ee73aa52f2b 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 dcc43843bb8..5b303d712df 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/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 99eee02add9..79c6053d021 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DeleteRoute struct { diff --git a/cf/commands/route/delete_route_test.go b/cf/commands/route/delete_route_test.go index 44be4ba9ead..d5289e6d86b 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 4c0c1f2a43d..3fa69874796 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 ed11581b32a..047b53e9052 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/cf/commands/route/routefakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 c08170a3660..b82c73d6995 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 b0118b6c417..6062486a57b 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/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/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 c95e3c09e21..d115bdb081b 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type OldFakeRouteCreator struct { diff --git a/cf/commands/route/routes.go b/cf/commands/route/routes.go index 7d298571034..c18595a36d9 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListRoutes struct { diff --git a/cf/commands/route/routes_test.go b/cf/commands/route/routes_test.go index e21101f89ca..fb39a8d42ad 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/terminal" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/commands/route" + . "code.cloudfoundry.org/cli/v7/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 a49f850d7ec..71d42a1d341 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type UnmapRoute struct { diff --git a/cf/commands/route/unmap_route_test.go b/cf/commands/route/unmap_route_test.go index 1784e8ee0c7..ce3dadf0ff4 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" "strings" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 71f8fc8f629..224d236f754 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type RouterGroups struct { diff --git a/cf/commands/routergroups/router_groups_test.go b/cf/commands/routergroups/router_groups_test.go index 4377182cd0b..cad3206822f 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commands/routergroups" + . "code.cloudfoundry.org/cli/v7/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 2c07f499dbe..250b250aa97 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 c2258fd452c..f891921ebed 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/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 79a2fcedb0c..f80b8d99ad0 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/v7/cf/api/securitygroups/defaults/running/runningfakes" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 0f6d97f9969..d02cefcb582 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/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups" + sgbinder "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 d7b26669a30..2498233e69d 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/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/spaces/spacesfakes" + spacesapifakes "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 cb9daaa463b..b2b8db0757b 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/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 9b38fa6f7ea..f4fb1341bda 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/v7/cf/api/securitygroups/defaults/staging/stagingfakes" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 03b0cb7265b..54cb12095ab 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/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 a3b07f35786..1b0f8e49c55 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/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 5b650d2cd0c..44725e1c20e 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/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 bba0e5a5922..4032bf631a2 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/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 ea1d979668a..9c5324ed82e 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/v7/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 519c5281f03..9d756d4c9a8 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api/securitygroups/defaults/running/runningfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 8027bbceec7..7746c8de897 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ShowSecurityGroup struct { diff --git a/cf/commands/securitygroup/security_group_test.go b/cf/commands/securitygroup/security_group_test.go index dfdb9034a08..4d6b2f99d6b 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/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 e72e63370f6..31e5d408585 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type SecurityGroups struct { diff --git a/cf/commands/securitygroup/security_groups_test.go b/cf/commands/securitygroup/security_groups_test.go index a7ee40ee96d..ef538d8460a 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/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commands/securitygroup" + . "code.cloudfoundry.org/cli/v7/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 bdf730f1c0c..a1eae4d61b6 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/v7/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 65dc53ad1ec..f40c91ff8aa 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api/securitygroups/defaults/staging/stagingfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 e0607c6b755..e1fcdc1e03d 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 2e4bbc4192f..2b067e02dee 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/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/defaults/running" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 18a5860cce2..eaf9b46491f 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/v7/cf/api/securitygroups/defaults/running/runningfakes" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 ca1159d28c6..1ebacc5bc33 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/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups" + sgbinder "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/spaces" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 14eafedec97..9c5ef32cd87 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/spaces/spacesfakes" + spacesapifakes "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 c47897625e2..bb56d8cf511 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/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/defaults/staging" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 df832815cc5..cc2afdb0dd0 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/v7/cf/api/securitygroups/defaults/staging/stagingfakes" + "code.cloudfoundry.org/cli/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 d249bded6c1..473099899c2 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/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/v7/cf/api/securitygroups" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/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 477092709ef..72ea0f7bd21 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/v7/cf/api/securitygroups/securitygroupsfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 6cf791376cb..eb510f46fb2 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flagcontext" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 fcdd8264d67..2053f6bb1cb 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 7acdb3c8755..22a3e134e43 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/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 f87e080aaea..a3b106ec094 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/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 62b75952d31..da05db507b9 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/v7/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/uihelpers" + "code.cloudfoundry.org/cli/v7/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 c794355e531..7667f92de13 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/v7/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 c56846f61b6..ae41535d070 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/flagcontext" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 6db247a7929..bf77ecd640b 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 c069134ade0..cca39b383cb 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DeleteService struct { diff --git a/cf/commands/service/delete_service_test.go b/cf/commands/service/delete_service_test.go index 40717f1196a..2755f458731 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 83df62512e5..cad9c2e7cb5 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/actors/servicebuilder" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type MarketplaceServices struct { diff --git a/cf/commands/service/marketplace_test.go b/cf/commands/service/marketplace_test.go index 06d236443ac..994ee3defaf 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/v7/cf/actors/servicebuilder/servicebuilderfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/commands/service" + . "code.cloudfoundry.org/cli/v7/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 6424d85884b..990ded94c16 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 6cb83874d7c..6a7584ef2f3 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 3a29865c962..8f37045166e 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 dc7e8450305..fff90d52582 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + cferrors "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 4c55e772b89..7a373f2fbbb 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 b114e6d0e2b..6c18a18c3f5 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 9557ebe3e5c..7b199fc5aea 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type RenameService struct { diff --git a/cf/commands/service/rename_service_test.go b/cf/commands/service/rename_service_test.go index cb6c9bc1278..d7e6659c446 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 ce9faaa8a67..0f602d02f57 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" ) type ShowService struct { diff --git a/cf/commands/service/service_suite_test.go b/cf/commands/service/service_suite_test.go index c61fa706b20..5e1634aae0e 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 5c0bd774f83..9aacf4ccad2 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/api/applications/applicationsfakes" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 6ac63f8dc6e..6271cacfc56 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type OldFakeAppBinder struct { diff --git a/cf/commands/service/servicefakes/fake_binder.go b/cf/commands/service/servicefakes/fake_binder.go index b6ad688476c..3cfd9c31c4b 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/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/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 a8790fdbe71..8f8e42de869 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/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeRouteServiceUnbinder struct { diff --git a/cf/commands/service/services.go b/cf/commands/service/services.go index e13ab149fa8..b4f7f892918 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/plugin/models" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListServices struct { diff --git a/cf/commands/service/services_test.go b/cf/commands/service/services_test.go index 1093af70348..1aaa22f2069 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" + + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + + "code.cloudfoundry.org/cli/v7/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 258cfa9d535..7809d6e92cc 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 8c0fa50d3f1..e7310ba04a2 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 7f3f0a9c855..554a963a4eb 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type UnbindService struct { diff --git a/cf/commands/service/unbind_service_test.go b/cf/commands/service/unbind_service_test.go index 026d88ed30c..3928d3e7739 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 25eecda7a95..a494d021138 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/v7/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/v7/cf/actors/planbuilder" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/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 029d2fb276a..fec8f5d78a3 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/v7/cf/actors/planbuilder/planbuilderfakes" + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 1c91365f713..000377ab6c0 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/v7/cf/flagcontext" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/uihelpers" + + "code.cloudfoundry.org/cli/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 36aa4c6deaf..d743725139e 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 ae0fa27bf26..fea3887829c 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 7f99ec062ef..43caf53d481 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/v7/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 17a2edfdb92..9d0278a34fb 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + + . "code.cloudfoundry.org/cli/v7/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 a182f38252f..6b5ed4c43ee 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/v7/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 0a3ecf62897..10247242e93 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/v7/cf/actors" + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ServiceAccess struct { diff --git a/cf/commands/serviceaccess/service_access_test.go b/cf/commands/serviceaccess/service_access_test.go index 99e579e942c..450649074f5 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/v7/cf/actors/actorsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/serviceaccess" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/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 0907c997e6b..891b2a78766 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 1adfd140eb2..bfd4ef8eb40 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 541e3169c2c..3d252f45c20 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 c83b9814163..b7edf77f0e3 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 87f971ac1c4..8dd9cd0ff59 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 d9b3898b436..1958ac220fc 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 3c6d7f8fb48..c5c1fe1c19c 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commands/serviceauthtoken" + . "code.cloudfoundry.org/cli/v7/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 c58e9859ee5..826e2c1862b 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 744f00a978e..198ff5a4736 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 f671dbabfc1..8d87f163865 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 db3aaf3ae0a..f8cf1b4a9f2 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 6742386d3bc..50adb8a6502 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/servicebroker" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 46951793977..9231287b7a2 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 09a91150702..f2a726074c1 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 0f367b2a55e..89e67e9493f 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 aeea99f96a7..b96f13a2185 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 72a20de68cb..13feb0abe63 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListServiceBrokers struct { diff --git a/cf/commands/servicebroker/service_brokers_test.go b/cf/commands/servicebroker/service_brokers_test.go index ccf77690f9c..991aea7c3a5 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/commands/servicebroker" + . "code.cloudfoundry.org/cli/v7/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 b47a081abbc..29c9e9e616f 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 375111bd054..e412cb50722 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 fe69c995f2a..7c38f915d11 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 1c202774f90..ab1347065bd 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/util/json" + + . "code.cloudfoundry.org/cli/v7/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 39526952d0b..51cb19ed311 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 9ad4934b2e1..a4f5eed1bdc 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + + . "code.cloudfoundry.org/cli/v7/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 4fe1dbb8eec..4c6f1b35969 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 df3101514c0..445cd044f64 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + + . "code.cloudfoundry.org/cli/v7/cf/i18n" ) type ServiceKey struct { diff --git a/cf/commands/servicekey/service_key_test.go b/cf/commands/servicekey/service_key_test.go index eaf178a6040..92fe3d7ddf1 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 8289c83b7e1..0a29136a996 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + + . "code.cloudfoundry.org/cli/v7/cf/i18n" ) type ServiceKeys struct { diff --git a/cf/commands/servicekey/service_keys_test.go b/cf/commands/servicekey/service_keys_test.go index f657caf0666..ea06702ad03 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api/apifakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 37d37527186..5e9f9c0ac4a 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 7254ddf9330..dbe04e99389 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/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 141a556dfb6..a68dde13f79 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/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 bb862ee4db6..29d68dd04b8 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 2f52b593725..eb087aee95f 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 90268df5b07..a57a8814eab 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DeleteSpace struct { diff --git a/cf/commands/space/delete_space_test.go b/cf/commands/space/delete_space_test.go index 38d0880439e..3a077b4ad26 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/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 8095f19a8ff..82804c51110 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/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 0cc82512edd..c1b2f7addcc 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/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 92bfdb47787..af75ac39fe0 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/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type RenameSpace struct { diff --git a/cf/commands/space/rename_space_test.go b/cf/commands/space/rename_space_test.go index 2b82fbac5b8..0b233e0239f 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/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 e169568d62f..f4a6e6c2004 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/plugin/models" + + "code.cloudfoundry.org/cli/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ShowSpace struct { diff --git a/cf/commands/space/space_ssh_allowed.go b/cf/commands/space/space_ssh_allowed.go index bf4c70ec3b6..3d3483b7665 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/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 028ec8c5ddd..26efc222644 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 74d0383eece..1a52c2ab6c5 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 f0d6301e773..1b487ff396e 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/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commands/space" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" ) var _ = Describe("space command", func() { diff --git a/cf/commands/space/spaces.go b/cf/commands/space/spaces.go index 951c40c0268..a7d63855119 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/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" ) type ListSpaces struct { diff --git a/cf/commands/space/spaces_test.go b/cf/commands/space/spaces_test.go index dc19e7ab0ad..ba8d0c486e2 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/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" + + "code.cloudfoundry.org/cli/v7/cf/commands/space" + . "code.cloudfoundry.org/cli/v7/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 876c580c531..d0cdf7ebe28 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/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 337d4507852..b4e4ed48908 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + + "code.cloudfoundry.org/cli/v7/cf/api/resources" + "code.cloudfoundry.org/cli/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/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 d23a6b04e48..bb9f2b4cd8a 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/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + + . "code.cloudfoundry.org/cli/v7/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 e58f51eae55..51f557e2d81 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/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 0829c3734a5..46d04b6435f 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/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 eafc3503e76..b790c6ac4b9 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/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 52d134a9f20..4097b4b44fb 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/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type SpaceQuota struct { diff --git a/cf/commands/spacequota/space_quota_test.go b/cf/commands/spacequota/space_quota_test.go index 7a83b45de21..513ec38ce25 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/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 563b449f78e..2aa5a6f8e24 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/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListSpaceQuotas struct { diff --git a/cf/commands/spacequota/space_quotas_test.go b/cf/commands/spacequota/space_quotas_test.go index a2efb46bd53..c9b62554bdd 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/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + "code.cloudfoundry.org/cli/v7/cf/commands/spacequota" + . "code.cloudfoundry.org/cli/v7/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 ca6f9b07226..8d6da61b449 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 d603e4a7b71..b187b6b64b8 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/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 9b348503d4e..809bc3f9f3f 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/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 e006966cc69..f1b9941e1e6 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/v7/cf/api/spacequotas" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 a984e36c21b..182c9077142 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/v7/cf/api/spacequotas/spacequotasfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + testterm "code.cloudfoundry.org/cli/v7/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 57d3e3a2f4a..eb4354ac357 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 34f2d49d695..3549ea944e3 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/authentication/authenticationfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 8374503ba4d..15751395def 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/v7/cf/api/stacks" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListStack struct { diff --git a/cf/commands/stack_test.go b/cf/commands/stack_test.go index 51138196b9c..24a78e165b2 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/v7/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" ) var _ = Describe("stack command", func() { diff --git a/cf/commands/stacks.go b/cf/commands/stacks.go index a2899eac905..165c88a1e33 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/v7/cf/api/stacks" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type ListStacks struct { diff --git a/cf/commands/stacks_test.go b/cf/commands/stacks_test.go index 0cae63393a7..8745d96ed3e 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/v7/cf/api/stacks/stacksfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/commands" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" ) var _ = Describe("stacks command", func() { diff --git a/cf/commands/target.go b/cf/commands/target.go index 107ddb96fae..0cfcc8e3581 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/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type Target struct { diff --git a/cf/commands/target_test.go b/cf/commands/target_test.go index 08676260163..09c6a3409c9 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/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf/commands" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/cf/commands" + . "code.cloudfoundry.org/cli/v7/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 9076dd1d6ed..2255c3d6cdf 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type CreateUser struct { diff --git a/cf/commands/user/create_user_test.go b/cf/commands/user/create_user_test.go index 7e964fc1a36..6b6bff6ca76 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/cf/commandregistry" + . "code.cloudfoundry.org/cli/v7/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 2d5dbd16855..5a176bd841d 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type DeleteUser struct { diff --git a/cf/commands/user/delete_user_test.go b/cf/commands/user/delete_user_test.go index ce79ef84cb9..2c6d482d82d 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/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/v7/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 3d24c6e94f0..292d9bdde9a 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/v7/cf/actors/userprint" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" ) type OrgUsers struct { diff --git a/cf/commands/user/org_users_test.go b/cf/commands/user/org_users_test.go index 942b9597cd5..ace1e3b46fb 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + plugin_models "code.cloudfoundry.org/cli/v7/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 d87a84f1168..c7abe8c6928 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 33c07a5952d..103e2c3cdc3 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags/featureflagsfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 14329d26bc4..61de7900625 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/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 64d3926662d..fbf8ca14ac6 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 0764b130451..44ce58da1b7 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/v7/cf/actors/userprint" + "code.cloudfoundry.org/cli/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/plugin/models" ) type SpaceUsers struct { diff --git a/cf/commands/user/space_users_test.go b/cf/commands/user/space_users_test.go index a28f136e989..6ee0d25e76e 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testcmd "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/commands" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + plugin_models "code.cloudfoundry.org/cli/v7/plugin/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 7f97312132d..3432118ca65 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 32f68ead1fd..b35d40d9790 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + testapi "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags/featureflagsfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 2697e8b57f6..64fe05d9ba9 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags" + "code.cloudfoundry.org/cli/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/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 cc42cbf4c6a..2123375d68a 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/requirements/requirementsfakes" + + "code.cloudfoundry.org/cli/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/api/featureflags/featureflagsfakes" + "code.cloudfoundry.org/cli/v7/cf/api/spaces/spacesfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" + + . "code.cloudfoundry.org/cli/v7/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 720eecbf23f..690f49aeabb 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 0acf6936607..878e59e2242 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 5499c3d74a9..fb07b3297e6 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands/user" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeSpaceRoleSetter struct { diff --git a/cf/commands/version.go b/cf/commands/version.go index 13c76e8b7de..9e5908916cc 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/version" ) type Version struct { diff --git a/cf/commands/version_test.go b/cf/commands/version_test.go index 5d52a679330..4c9f8863bce 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/flags" - testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" + testterm "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/terminal" - "code.cloudfoundry.org/cli/cf" + "code.cloudfoundry.org/cli/v7/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 5e884cb60dd..a87062cf67a 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/v7/cf/commands" + "code.cloudfoundry.org/cli/v7/cf/commands/application" + "code.cloudfoundry.org/cli/v7/cf/commands/buildpack" + "code.cloudfoundry.org/cli/v7/cf/commands/domain" + "code.cloudfoundry.org/cli/v7/cf/commands/environmentvariablegroup" + "code.cloudfoundry.org/cli/v7/cf/commands/featureflag" + "code.cloudfoundry.org/cli/v7/cf/commands/organization" + "code.cloudfoundry.org/cli/v7/cf/commands/plugin" + "code.cloudfoundry.org/cli/v7/cf/commands/pluginrepo" + "code.cloudfoundry.org/cli/v7/cf/commands/quota" + "code.cloudfoundry.org/cli/v7/cf/commands/route" + "code.cloudfoundry.org/cli/v7/cf/commands/routergroups" + "code.cloudfoundry.org/cli/v7/cf/commands/securitygroup" + "code.cloudfoundry.org/cli/v7/cf/commands/service" + "code.cloudfoundry.org/cli/v7/cf/commands/serviceaccess" + "code.cloudfoundry.org/cli/v7/cf/commands/serviceauthtoken" + "code.cloudfoundry.org/cli/v7/cf/commands/servicebroker" + "code.cloudfoundry.org/cli/v7/cf/commands/servicekey" + "code.cloudfoundry.org/cli/v7/cf/commands/space" + "code.cloudfoundry.org/cli/v7/cf/commands/spacequota" + "code.cloudfoundry.org/cli/v7/cf/commands/user" ) /******************* diff --git a/cf/commandsloader/commands_loader_test.go b/cf/commandsloader/commands_loader_test.go index 922a84ed28b..8074c7dc8db 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/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 288486627f5..822c3369a02 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/v7/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 3746d42ee7b..b616118d4b2 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/v7/cf/configuration" ) type FakeDataInterface struct { diff --git a/cf/configuration/configurationfakes/fake_persistor.go b/cf/configuration/configurationfakes/fake_persistor.go index 3283bb555d5..d99e46c214b 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/v7/cf/configuration" ) type FakePersistor struct { diff --git a/cf/configuration/coreconfig/access_token_test.go b/cf/configuration/coreconfig/access_token_test.go index d9278e88325..8b9e34407bd 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/v7/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 3e933ce4775..fd30f75065b 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/v7/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 2f52d74caec..b93ae455d45 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" - "code.cloudfoundry.org/cli/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig/coreconfigfakes" + "code.cloudfoundry.org/cli/v7/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 975d1aa0ee7..0cf2628fab8 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type AuthPromptType string diff --git a/cf/configuration/coreconfig/config_data_test.go b/cf/configuration/coreconfig/config_data_test.go index e3f44d726c9..42c1b0a7275 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/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 6da594b364d..11f82a18ae6 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/v7/cf/configuration" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 d71006e4b0d..45cb99379bd 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/v7/cf/configuration" + "code.cloudfoundry.org/cli/v7/cf/configuration/configurationfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 aaf2b94c6f3..aa2e3811bfa 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/v7/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 1e924f299c6..d9b508aadc6 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/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 853f44f6073..55b4546bf72 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" "github.com/blang/semver/v4" ) diff --git a/cf/configuration/pluginconfig/plugin_config.go b/cf/configuration/pluginconfig/plugin_config.go index c2212f7f880..ec06053721b 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/v7/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 ffc259781be..ea1239c0d9e 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/v7/cf/configuration" + "code.cloudfoundry.org/cli/v7/cf/configuration/confighelpers" + . "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + "code.cloudfoundry.org/cli/v7/plugin" - "code.cloudfoundry.org/cli/cf/configuration/configurationfakes" + "code.cloudfoundry.org/cli/v7/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 9d9cebe4907..2d3aed29c4e 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/v7/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 42220dae934..131cf619b32 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/v7/cf/configuration/pluginconfig" ) type FakePluginConfiguration struct { diff --git a/cf/errors/access_denied_error.go b/cf/errors/access_denied_error.go index 36fb366d8aa..cbd5de5f312 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/v7/cf/i18n" type AccessDeniedError struct { } diff --git a/cf/errors/ambiguous_model_error.go b/cf/errors/ambiguous_model_error.go index 071745bcf01..b831f2a25f1 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/v7/cf/i18n" ) type AmbiguousModelError struct { diff --git a/cf/errors/curl_http_error.go b/cf/errors/curl_http_error.go index 4883e943c4a..6e7b9ab5dfb 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/v7/cf/i18n" ) type CurlHTTPError struct { diff --git a/cf/errors/empty_dir_error.go b/cf/errors/empty_dir_error.go index 8cca87afa04..f25c8d64251 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/v7/cf/i18n" ) type EmptyDirError struct { diff --git a/cf/errors/errorsfakes/fake_httperror.go b/cf/errors/errorsfakes/fake_httperror.go index ee993fdd855..b32547ffece 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/v7/cf/errors" ) type FakeHTTPError struct { diff --git a/cf/errors/gateway_error.go b/cf/errors/gateway_error.go index 22d908bbed3..eb231d024e8 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/v7/cf/i18n" ) type AsyncTimeoutError struct { diff --git a/cf/errors/http_error.go b/cf/errors/http_error.go index bb8e1f60b08..a24d95abb33 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/v7/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 70f81d7af1d..d12513e0ff2 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/v7/cf/i18n" ) type InvalidSSLCert struct { diff --git a/cf/errors/invalid_token_error.go b/cf/errors/invalid_token_error.go index 4860758669f..840915cb099 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/v7/cf/i18n" ) type InvalidTokenError struct { diff --git a/cf/errors/model_already_exists_error.go b/cf/errors/model_already_exists_error.go index ef8b832dc6b..db799c4e740 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/v7/cf/i18n" ) type ModelAlreadyExistsError struct { diff --git a/cf/errors/model_not_found_error.go b/cf/errors/model_not_found_error.go index d41611978d2..3327d4fcefe 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/v7/cf/i18n" ) type ModelNotFoundError struct { diff --git a/cf/errors/not_authorized_error.go b/cf/errors/not_authorized_error.go index 4e9160bde13..9e9683a99b9 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/v7/cf/i18n" ) type NotAuthorizedError struct { diff --git a/cf/errors/service_association_error.go b/cf/errors/service_association_error.go index 34ae899c037..eb72cdfdf8d 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/v7/cf/i18n" ) type ServiceAssociationError struct { diff --git a/cf/errors/unbindable_service_error.go b/cf/errors/unbindable_service_error.go index 35a788a9a12..44c79ad21cd 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/v7/cf/i18n" ) type UnbindableServiceError struct { diff --git a/cf/flagcontext/flag_content_helper_test.go b/cf/flagcontext/flag_content_helper_test.go index c57324995b9..c71daa282f8 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/v7/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 fcdd89c2911..fc754d97f38 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/v7/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 1e744afe6b2..5a982fbb382 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/v7/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 56851007ecc..463dd0e8662 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/v7/cf/flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bools.go b/cf/formatters/bools.go index 4ce3d0c8418..eb395eed9f4 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/v7/cf/i18n" ) func Allowed(allowed bool) string { diff --git a/cf/formatters/bools_test.go b/cf/formatters/bools_test.go index 4074e130d58..1745661de29 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/v7/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bytes.go b/cf/formatters/bytes.go index bdd76a65c28..2c995b0794e 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/v7/cf/i18n" ) const ( diff --git a/cf/formatters/bytes_test.go b/cf/formatters/bytes_test.go index 0e486e37a58..176a94151dd 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/v7/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 cfc282f00a2..12f80441eae 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 12e1af7f470..5bd48f83afb 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/v7/cf/formatters" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/help/help.go b/cf/help/help.go index bb992977d66..e5ede6246b5 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration" + "code.cloudfoundry.org/cli/v7/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v7/cf/configuration/pluginconfig" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/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 8c631e6d77c..b37a284afa7 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/v7/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 83a2c269be1..ebac03449c0 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/confighelpers" + "code.cloudfoundry.org/cli/v7/cf/help" - "code.cloudfoundry.org/cli/cf/util/testhelpers/io" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/io" "os" diff --git a/cf/help/template.go b/cf/help/template.go index 850480fd584..71904600f63 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/v7/cf/i18n" func GetHelpTemplate() string { return `{{.Title "` + T("NAME:") + `"}} diff --git a/cf/i18n/i18n.go b/cf/i18n/i18n.go index 4084738e99c..0b089f67e77 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/v7/util/ui" var T ui.TranslateFunc diff --git a/cf/i18n/locale.go b/cf/i18n/locale.go index 3857d1e42d1..ca4672bc384 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/v7/i18n/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) const resourceSuffix = ".all.json" diff --git a/cf/i18n/locale_test.go b/cf/i18n/locale_test.go index df8781dd85d..92f61b98771 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/v7/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 6a8a9eb68c4..b9ebebc03ac 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/v7/cf/models" "gopkg.in/yaml.v2" "io" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/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 78e35599267..bc6fd9291fa 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/v7/cf/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/manifest/manifest.go b/cf/manifest/manifest.go index 4d959ae5a06..3adbf340cb4 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/v7/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/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/util/generic" + "code.cloudfoundry.org/cli/v7/util/randomword" ) type Manifest struct { diff --git a/cf/manifest/manifest_disk_repository.go b/cf/manifest/manifest_disk_repository.go index 166e3202bd1..91df4ddfbef 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/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 b59abaf8a5a..866940d3ccd 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/v7/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 3e0fb18b5c2..47391580302 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 aa31a10414d..46b7d7d3eb4 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/v7/cf/manifest" + "code.cloudfoundry.org/cli/v7/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 54860590aa5..3222728d120 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/v7/cf/manifest" + "code.cloudfoundry.org/cli/v7/cf/models" ) type FakeApp struct { diff --git a/cf/manifest/manifestfakes/fake_repository.go b/cf/manifest/manifestfakes/fake_repository.go index a87be0e2861..974adb8d955 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/v7/cf/manifest" ) type FakeRepository struct { diff --git a/cf/models/application_test.go b/cf/models/application_test.go index ea7ad0ac178..26179463d68 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/v7/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 251fa439906..8f5c3ec3d20 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/v7/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 8b69e271aea..c77bda4b103 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/v7/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 9772ba8ac0c..c92e2162e4e 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/v7/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 c58f8381287..773a8bb3a22 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/v7/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 af9d8510b92..4f94255d91a 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/v7/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 4edf2992ee1..b89c8743f4b 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/v7/cf/formatters" + . "code.cloudfoundry.org/cli/v7/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 449ccbf972e..cc6cdb15dc6 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" ) type ccErrorResponse struct { diff --git a/cf/net/cloud_controller_gateway_test.go b/cf/net/cloud_controller_gateway_test.go index cbf72f34db4..39041653172 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v7/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 9a7ee4f701f..d8dd5da22a3 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" + "code.cloudfoundry.org/cli/v7/util" + "code.cloudfoundry.org/cli/v7/version" ) const ( diff --git a/cf/net/gateway_test.go b/cf/net/gateway_test.go index b1926c950f6..43979882f05 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/v7/cf/api/authentication" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/net/netfakes" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testnet "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/net" + "code.cloudfoundry.org/cli/v7/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 8f6411cd697..b530eeb9649 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/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/i18n" "golang.org/x/net/websocket" ) diff --git a/cf/net/http_client_test.go b/cf/net/http_client_test.go index e1c5ff5c496..a76843c9760 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/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/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 8c16c8faf75..404a15f6650 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 9040eef181c..1c535cf9df1 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/v7/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 19350408b1a..c6331fd1915 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/v7/cf/net" ) type FakeRequestDumperInterface struct { diff --git a/cf/net/netfakes/fake_warning_producer.go b/cf/net/netfakes/fake_warning_producer.go index d21e5364852..f23c9739c44 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/v7/cf/net" ) type FakeWarningProducer struct { diff --git a/cf/net/progress_reader.go b/cf/net/progress_reader.go index 8716cafd980..07cd2b9ce06 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/v7/cf/formatters" + "code.cloudfoundry.org/cli/v7/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 3f5fecb9518..ef4054fbb3e 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/v7/cf/net" + "code.cloudfoundry.org/cli/v7/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 18670114846..a593b4215cb 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" + "code.cloudfoundry.org/cli/v7/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 97ff4513b49..5fb4e95cca9 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/v7/cf/net" + "code.cloudfoundry.org/cli/v7/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 c186a87c1d8..336c362808a 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" ) type errorResponse struct { diff --git a/cf/net/routing_api_gateway_test.go b/cf/net/routing_api_gateway_test.go index 86e1d57c714..5075c74a223 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/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 29d9105062c..18c2c1b8d4a 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" ) type uaaErrorResponse struct { diff --git a/cf/net/uaa_gateway_test.go b/cf/net/uaa_gateway_test.go index 79b92ca1f97..ad919c9ed83 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + . "code.cloudfoundry.org/cli/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + testconfig "code.cloudfoundry.org/cli/v7/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 0ae16613dcd..81f674bbe30 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/v7/cf/terminal" ) const DeprecatedEndpointWarning = "Endpoint deprecated" diff --git a/cf/net/warnings_collector_test.go b/cf/net/warnings_collector_test.go index 81d434e9085..d7b283bc543 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/v7/cf/net" + "code.cloudfoundry.org/cli/v7/cf/net/netfakes" + "code.cloudfoundry.org/cli/v7/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 6208289630d..046d0c6bc53 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type APIEndpointRequirement struct { diff --git a/cf/requirements/api_endpoint_test.go b/cf/requirements/api_endpoint_test.go index dd8ecd43f6d..a04c4d33e7b 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/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v7/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 3ce04a99cbc..00de533e461 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/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 de87d9fe455..f2974aaef47 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/v7/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + . "code.cloudfoundry.org/cli/v7/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/buildpack.go b/cf/requirements/buildpack.go index 0f8981e3da3..1d4161d2611 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 b40e60e323c..dc388a0174b 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/models" + . "code.cloudfoundry.org/cli/v7/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 a6f46179b7b..82a53dab703 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/v7/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 3421504cc20..fea83a9a388 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/v7/cf/requirements" "errors" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/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 747c9d42e4d..78082e4f35d 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/v7/cf/api/applications" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 bc6b6122239..ae2cf24cd14 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" - "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" + "code.cloudfoundry.org/cli/v7/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 72d9d01d212..68511ce867d 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/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 20d31fc8871..ae174ac6eaa 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + . "code.cloudfoundry.org/cli/v7/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v7/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 0e3d9cbcdcd..329896276fe 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" "github.com/blang/semver/v4" ) diff --git a/cf/requirements/login.go b/cf/requirements/login.go index 05e54315a79..beec9b86376 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type LoginRequirement struct { diff --git a/cf/requirements/login_test.go b/cf/requirements/login_test.go index 68e18fd0a94..0a0e61fec15 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/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/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/v7/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 a93cd923995..8df37a4b31b 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/v7/cf/configuration/coreconfig" "github.com/blang/semver/v4" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/cf/i18n" ) type MaxAPIVersionRequirement struct { diff --git a/cf/requirements/max_api_version_test.go b/cf/requirements/max_api_version_test.go index 00d0465b348..1cb13bc0dc6 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" "github.com/blang/semver/v4" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v7/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 063b00c7a74..f6dc13303d8 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/v7/cf/configuration/coreconfig" "github.com/blang/semver/v4" - . "code.cloudfoundry.org/cli/cf/i18n" + . "code.cloudfoundry.org/cli/v7/cf/i18n" ) type MinAPIVersionRequirement struct { diff --git a/cf/requirements/min_api_version_test.go b/cf/requirements/min_api_version_test.go index 4041ed37200..b3e6445ec43 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" "github.com/blang/semver/v4" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v7/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 36672dabf66..d751cadf978 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/v7/cf/i18n" ) type NumberArguments struct { diff --git a/cf/requirements/number_arguments_test.go b/cf/requirements/number_arguments_test.go index 6e1e8e82fb8..46f245a0c11 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/v7/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cf/requirements/organization.go b/cf/requirements/organization.go index 96d1c8d8007..2b1b678242f 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/v7/cf/api/organizations" + "code.cloudfoundry.org/cli/v7/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 6830194f6ff..59ad88b23d9 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/v7/cf/api/organizations/organizationsfakes" + "code.cloudfoundry.org/cli/v7/cf/models" + . "code.cloudfoundry.org/cli/v7/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 410c11929dc..01d1754f590 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 bda87e4e11b..a8050380bcb 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/v7/cf/requirements" - "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" + "code.cloudfoundry.org/cli/v7/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 b165f5a7c20..94a1df641b9 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeApplicationRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_buildpack_requirement.go b/cf/requirements/requirementsfakes/fake_buildpack_requirement.go index 531ae8e0591..ab515feaece 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeBuildpackRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_config_refresher.go b/cf/requirements/requirementsfakes/fake_config_refresher.go index 2a602ba115d..803a50c7e0a 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeConfigRefresher struct { diff --git a/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go b/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go index 282f0047e0d..44b8014d5a0 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeDEAApplicationRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_domain_requirement.go b/cf/requirements/requirementsfakes/fake_domain_requirement.go index 0e1bdca81d3..d6ff11e6e34 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeDomainRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_factory.go b/cf/requirements/requirementsfakes/fake_factory.go index 2eadc27b032..4bc8ae210ff 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/v7/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 c9b1752a1ec..7216f24738f 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeOrganizationRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_requirement.go b/cf/requirements/requirementsfakes/fake_requirement.go index 0ebc0b1a938..489a004309d 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/v7/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 52a9c81065a..199c0476e11 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeServiceInstanceRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_space_requirement.go b/cf/requirements/requirementsfakes/fake_space_requirement.go index 12758455c70..8cad09b1191 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 f4faa3ddb50..af5c8012bea 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeTargetedOrgRequirement struct { diff --git a/cf/requirements/requirementsfakes/fake_user_requirement.go b/cf/requirements/requirementsfakes/fake_user_requirement.go index a8df8330825..a9b9710d2e2 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeUserRequirement struct { diff --git a/cf/requirements/service_instance.go b/cf/requirements/service_instance.go index 7c4616934d5..c071388acaf 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 da164134082..cbf04200d5f 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/v7/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/models" + . "code.cloudfoundry.org/cli/v7/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/space.go b/cf/requirements/space.go index 7f56ba5aed9..294d8962491 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/v7/cf/api/spaces" + "code.cloudfoundry.org/cli/v7/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 99cb6a34c85..a76e29e5f20 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/v7/cf/api/spaces/spacesfakes" + "code.cloudfoundry.org/cli/v7/cf/models" + . "code.cloudfoundry.org/cli/v7/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 adf4469ecf6..6f8b1eab8c5 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 6ffa2bde52d..8fe9de788c6 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" - testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" - . "code.cloudfoundry.org/cli/cf/requirements" + . "code.cloudfoundry.org/cli/v7/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 7f0bc55bba1..f4d5f296f49 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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + . "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type TargetedSpaceRequirement struct { diff --git a/cf/requirements/targeted_space_test.go b/cf/requirements/targeted_space_test.go index 09e5ecae3dd..ef4762e699e 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + . "code.cloudfoundry.org/cli/v7/cf/requirements" + testconfig "code.cloudfoundry.org/cli/v7/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 3b67eacd83a..aead1e91df6 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/v7/cf/i18n" ) type UnsupportedLegacyFlagRequirement struct { diff --git a/cf/requirements/unsupported_legacy_flag_test.go b/cf/requirements/unsupported_legacy_flag_test.go index 1cd17b8b50e..cdce1d7490a 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/v7/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 ac2f2197d8b..7c0ced3002e 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/v7/cf/i18n" ) type RequirementFunction func() error diff --git a/cf/requirements/usage_requirement_test.go b/cf/requirements/usage_requirement_test.go index 67bfe9d7708..5dd54d373ae 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/v7/cf/requirements" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/user.go b/cf/requirements/user.go index 298231fea07..6c5d3cac1ae 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/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 cc3956c1685..0c2014451b7 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/requirements" - "code.cloudfoundry.org/cli/cf/api/apifakes" + "code.cloudfoundry.org/cli/v7/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 a4976a538cd..424b4c24e87 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/v7/cf/flags" ) type TTYRequest int diff --git a/cf/ssh/options/ssh_options_test.go b/cf/ssh/options/ssh_options_test.go index 914e3fcf359..71ed7df6cb0 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/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/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 68fbd5bf50b..0ca4e97181e 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/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/ssh/options" + "code.cloudfoundry.org/cli/v7/cf/ssh/sigwinch" + "code.cloudfoundry.org/cli/v7/cf/ssh/terminal" "github.com/moby/term" ) diff --git a/cf/ssh/ssh_test.go b/cf/ssh/ssh_test.go index 624979e57ae..6adb159bce4 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/v7/cf/models" + sshCmd "code.cloudfoundry.org/cli/v7/cf/ssh" + "code.cloudfoundry.org/cli/v7/cf/ssh/options" + "code.cloudfoundry.org/cli/v7/cf/ssh/sshfakes" + "code.cloudfoundry.org/cli/v7/cf/ssh/terminal" + "code.cloudfoundry.org/cli/v7/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 2f378cdbf81..a500b000687 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/v7/cf/ssh" ) type FakeListenerFactory struct { diff --git a/cf/ssh/sshfakes/fake_secure_client.go b/cf/ssh/sshfakes/fake_secure_client.go index d2df9c7d0a8..acc399c8d95 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/v7/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 d7fdc1d40db..b1e57001ddb 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/v7/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 16a44a39442..8683031036f 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/v7/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 35dfa9f51f0..54fc946c9fb 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/v7/cf/ssh" + "code.cloudfoundry.org/cli/v7/cf/ssh/options" ) type FakeSecureShell struct { diff --git a/cf/ssh/terminal/helper_test.go b/cf/ssh/terminal/helper_test.go index 9c243435407..14d7baf110c 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/v7/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 82bb9d228bc..f500f31da20 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/v7/cf/ssh/terminal" "github.com/moby/term" ) diff --git a/cf/terminal/color_test.go b/cf/terminal/color_test.go index a69a675b6bb..2f52f6c5e43 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/v7/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 542c1e7bcea..0a6a9a0396f 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/v7/cf/terminal" + . "code.cloudfoundry.org/cli/v7/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 da6d70eb764..fa8a3cd7354 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/v7/cf/terminal" - io_helpers "code.cloudfoundry.org/cli/cf/util/testhelpers/io" + io_helpers "code.cloudfoundry.org/cli/v7/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 611d5c1b14a..77b45763f09 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 dda18707b17..f95cdecc7bc 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type FakeUI struct { diff --git a/cf/terminal/ui.go b/cf/terminal/ui.go index 18df1937bd6..422ad3150ce 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/v7/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/v7/cf" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/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 33e803c49b4..b481739288a 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + io_helpers "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/io" + newUI "code.cloudfoundry.org/cli/v7/util/ui" + + . "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/trace" + . "code.cloudfoundry.org/cli/v7/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 08ccdfbdd4a..54e9fd3cc1b 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/v7/cf/i18n" ) const ( diff --git a/cf/trace/combined_printer_test.go b/cf/trace/combined_printer_test.go index 33d4dc420da..ca9138c589e 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/v7/cf/trace" - "code.cloudfoundry.org/cli/cf/trace/tracefakes" + "code.cloudfoundry.org/cli/v7/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 6337b0dbd5d..a8c2cdd32d1 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/v7/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 2e1198fd443..ca0c018c219 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/v7/cf/trace" "code.cloudfoundry.org/gofileutils/fileutils" "os" diff --git a/cf/trace/trace.go b/cf/trace/trace.go index 25addf1c26e..ccd87943f38 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/v7/cf/i18n" ) var LoggingToStdout bool diff --git a/cf/trace/trace_suite_test.go b/cf/trace/trace_suite_test.go index c8c3731a11c..158c74c60a6 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/v7/cf/i18n" + "code.cloudfoundry.org/cli/v7/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 3d5aa9f628a..de8e4bd374b 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/v7/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 af366fefc72..ed6e9f16bba 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/v7/cf/trace" ) type FakePrinter struct { diff --git a/cf/uihelpers/tags_parser_test.go b/cf/uihelpers/tags_parser_test.go index 11e01e09f2d..da9a78fc2b2 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/v7/cf/uihelpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/uihelpers/ui.go b/cf/uihelpers/ui.go index ca43771236f..396397e9b3e 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/v7/cf/i18n" - "code.cloudfoundry.org/cli/cf/models" - "code.cloudfoundry.org/cli/cf/terminal" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/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 8f5c41e0e7c..7faa09e6eef 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/v7/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 1cf3a440c8a..9483c1b7c97 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/v7/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 2a79a289ca2..16f1e8bb9c4 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/v7/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 40e4cb8cc21..720a6c40676 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/v7/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 d000c04096e..2f4ee847a5e 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/v7/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 627ccd1fb63..3bc5b691823 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + testterm "code.cloudfoundry.org/cli/v7/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 40819751fd6..900b3e57860 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/v7/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 358217b660b..849e87e6827 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/v7/cf/configuration" + "code.cloudfoundry.org/cli/v7/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 0c7f0341bc6..a4c214e3f22 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/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/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 505ee413ed6..49f546028af 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/v7/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 fe425529a58..8521375e961 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/v7/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 ed52746c5d2..946888a7340 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/v7/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 168ddd8ec67..4220952c13f 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/v7/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 3d9ab6b1e99..0d65ad5fa2e 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/v7/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 55f3363c1bf..7bfcdab64ac 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/v7/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 bc31c2149bd..4f4ce6b0073 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/v7/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 1537fb7c486..8f063d49acd 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/v7/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 a058e4ea6e2..d2ba3ed2041 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/v7/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 723ebdc964c..7bf15a0f49d 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/v7/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 aaaf2ec90cc..8f775d59120 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/v7/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 0fce7829962..92d34847103 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/v7/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 b234743de44..64f6dc24111 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/v7/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v7/plugin" + plugin_models "code.cloudfoundry.org/cli/v7/plugin/models" ) type FakeHandlers struct { diff --git a/cf/util/testhelpers/rpcserver/server.go b/cf/util/testhelpers/rpcserver/server.go index 8933195911c..1116269cd33 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/v7/plugin" + "code.cloudfoundry.org/cli/v7/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 ec8a0cbd9cd..22dde3a8f6e 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/v7/cf/configuration/coreconfig" + term "code.cloudfoundry.org/cli/v7/cf/terminal" ) type FakeUI struct { diff --git a/cf/util/utilfakes/fake_sha1checksum.go b/cf/util/utilfakes/fake_sha1checksum.go index 977e7cc7d47..02692e7f312 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/v7/util" ) type FakeSha1Checksum struct { diff --git a/command/api_version_warning.go b/command/api_version_warning.go index e4bb564f56b..8f6ab3b97ab 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/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/version" "github.com/blang/semver/v4" ) diff --git a/command/api_version_warning_test.go b/command/api_version_warning_test.go index c8cd96b58fb..4fd90a2e629 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/v7/api/cloudcontroller/ccversion" + . "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 f6987b2bc31..00717be9e09 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/v7/command" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type FakeConfig struct { diff --git a/command/commandfakes/fake_shared_actor.go b/command/commandfakes/fake_shared_actor.go index fec3b1b77d3..68c8cda3e39 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/v7/command" ) type FakeSharedActor struct { diff --git a/command/commandfakes/fake_ui.go b/command/commandfakes/fake_ui.go index 8dc9623340f..c399e49ee62 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/v7/command" + "code.cloudfoundry.org/cli/v7/util/ui" ) type FakeUI struct { diff --git a/command/common/command_list_v7.go b/command/common/command_list_v7.go index c0dc4c59847..78fdb2e869e 100644 --- a/command/common/command_list_v7.go +++ b/command/common/command_list_v7.go @@ -3,9 +3,9 @@ package common import ( "reflect" - "code.cloudfoundry.org/cli/command/plugin" - v6 "code.cloudfoundry.org/cli/command/v6" - v7 "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v7/command/plugin" + v6 "code.cloudfoundry.org/cli/v7/command/v6" + v7 "code.cloudfoundry.org/cli/v7/command/v7" ) var Commands commandList diff --git a/command/common/command_list_v7_test.go b/command/common/command_list_v7_test.go index 23bfe58082e..c7d5f8437ba 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/v7/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 ac130fb2f4c..f6dc80efd30 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/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 3f6de0cf1d0..b4254b68c6f 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/command/common" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type FakeInstallPluginActor struct { diff --git a/command/common/help_command.go b/command/common/help_command.go index f492a004a5d..72a3f7f8f85 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/common/internal" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 b119bb6d1e5..e81d95a1eab 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/plugin/shared" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util" + "code.cloudfoundry.org/cli/v7/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 af2a80b01ea..e2cccd01667 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/common" + "code.cloudfoundry.org/cli/v7/command/common/commonfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 a6d49af0ca4..7a39fb90cf2 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/common" + "code.cloudfoundry.org/cli/v7/command/common/commonfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 bb93ffb9ce9..07f6ebdd68d 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/v7/command/common" + "code.cloudfoundry.org/cli/v7/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 55eb2c87480..52c351d89c5 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/sorting" ) type HelpCategory struct { diff --git a/command/common/version_command.go b/command/common/version_command.go index 2b1e2ba8676..dfe9bbb59f9 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/v7/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 9db08671ad9..62da9f70f52 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/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/common" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/config.go b/command/config.go index d84b8d1f421..4d597c3b070 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/v7/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 cceaba6bea8..9cab6041b24 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/v7/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 6bba5ef984a..163893c45c3 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/v7/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 4dd9d9330b5..2a4ceaa21b5 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/v7/types" ) type Buildpack struct { diff --git a/command/flag/buildpack_test.go b/command/flag/buildpack_test.go index 2910227b642..1c1adc6037b 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/v7/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/color_test.go b/command/flag/color_test.go index 2a007ba6207..ad1c9761b97 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/v7/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 d041895392b..81bb3e2258d 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/v7/types" ) type Command struct { diff --git a/command/flag/command_test.go b/command/flag/command_test.go index 522e43c56fb..76bc03ec80f 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/v7/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/credentials_or_json_test.go b/command/flag/credentials_or_json_test.go index aff6b28cf1b..6d7e789c160 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/v7/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 0c7a98bb5e4..2a9bb49a1a5 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/v7/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 d8f8ad229a5..223b6125e19 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/v7/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v7/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 ddfb59c896f..5c05d86588c 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/v7/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 1d3f2562bbd..6228dbc0023 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/v7/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 30249af3454..07945376fc2 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/v7/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 203f36017c5..9d8046b3859 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/v7/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 c381233924d..67c0109c312 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/v7/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v7/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 21fbb122385..adb1df8979c 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/v7/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 437042a9034..c04d7de2c23 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/v7/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/instances_test.go b/command/flag/instances_test.go index 10dd691de6c..d33049ca459 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 1f5c9253414..b3b9b3047a9 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/v7/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/integer_limit_test.go b/command/flag/integer_limit_test.go index 9fae1ecc6b1..dcd952bd202 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/v7/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 d2cf1871ff0..f7610518cd0 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/v7/cf/i18n" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/locale_test.go b/command/flag/locale_test.go index 5209068bdae..e3ba12297f8 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/v7/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 edb780c9b7d..842072c1f69 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/v7/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 6a43936dd3e..d8dec1a65a8 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/v7/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/memory_with_unlimited.go b/command/flag/memory_with_unlimited.go index 10fe06b32f6..4ab9bbd746a 100644 --- a/command/flag/memory_with_unlimited.go +++ b/command/flag/memory_with_unlimited.go @@ -1,7 +1,7 @@ package flag import ( - "code.cloudfoundry.org/cli/types" + "code.cloudfoundry.org/cli/v7/types" ) type MemoryWithUnlimited types.NullInt diff --git a/command/flag/memory_with_unlimited_test.go b/command/flag/memory_with_unlimited_test.go index c92664894f2..356b5b7b558 100644 --- a/command/flag/memory_with_unlimited_test.go +++ b/command/flag/memory_with_unlimited_test.go @@ -1,7 +1,7 @@ package flag_test import ( - . "code.cloudfoundry.org/cli/command/flag" + . "code.cloudfoundry.org/cli/v7/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 5f709893e92..f10f4ad4e3e 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/v7/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 ae7e99135e1..2bd248e9159 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/v7/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/flag/optional_string_test.go b/command/flag/optional_string_test.go index 971337a7bcc..da65da71c4a 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/v7/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 6419d6ef93e..3e0e17a2781 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/v7/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 23d3f890842..d1588517aa4 100644 --- a/command/flag/path.go +++ b/command/flag/path.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/util/v6manifestparser" + "code.cloudfoundry.org/cli/v7/util/v6manifestparser" "github.com/jessevdk/go-flags" ) diff --git a/command/flag/path_test.go b/command/flag/path_test.go index 998987e3abc..d3613257fd4 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/v7/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 17d430ed36f..a01578c0e28 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/v7/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/port_test.go b/command/flag/port_test.go index 3a4c6e182f7..bcdf3d1ed9a 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 9154fb9ec99..bb89cd65bd9 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/v7/command/flag" ) var _ = Describe("Positive Integer", func() { diff --git a/command/flag/revision.go b/command/flag/revision.go index f800f8f9552..e3bbf4c5f8d 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/v7/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/revision_test.go b/command/flag/revision_test.go index 9fb898ec140..50493f0aa40 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 cbdc440c3f2..fa4224c90d0 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/v7/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 1f7a61d075f..d54e29bd74a 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/v7/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 2f355dc5493..7e6bfe09fd1 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/v7/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 3d9c79708a0..c8c1c71a9e5 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/v7/command/flag" flags "github.com/jessevdk/go-flags" . "github.com/onsi/ginkgo/v2" diff --git a/command/flag/tags_test.go b/command/flag/tags_test.go index 71a133cff39..ec225afb4a1 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/v7/command/flag" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/timeout.go b/command/flag/timeout.go index 42250a543de..34e2960a582 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/v7/types" flags "github.com/jessevdk/go-flags" ) diff --git a/command/flag/timeout_test.go b/command/flag/timeout_test.go index 82245063c24..9dbf6c6a26e 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/v7/command/flag" ) var _ = Describe("Timeout", func() { diff --git a/command/log_cache_client.go b/command/log_cache_client.go index 957d3e7d31d..f15f8950bdd 100644 --- a/command/log_cache_client.go +++ b/command/log_cache_client.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v7/util" logcache "code.cloudfoundry.org/go-log-cache/v2" ) @@ -30,31 +30,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 } } @@ -104,7 +104,7 @@ func NewLogCacheClient(logCacheEndpoint string, config Config, ui UI) *logcache. }).DialContext, } - var client logcache.HTTPClient //nolint + var client logcache.HTTPClient // nolint client = &http.Client{Transport: tr} verbose, location := config.Verbose() diff --git a/command/minimum_version_check.go b/command/minimum_version_check.go index 9fa7aebf7a2..38dd4bb4bdd 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/v7/command/translatableerror" log "github.com/sirupsen/logrus" ) diff --git a/command/minimum_version_check_test.go b/command/minimum_version_check_test.go index 61aaa94450b..2de6b01b637 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/v7/command" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 8c699b03a2d..12e6d595dd3 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 1197642d203..b3b6945ffc0 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/plugin" + "code.cloudfoundry.org/cli/v7/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v7/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 a4f1288fd0a..1f6510db58d 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/v7/command" + "code.cloudfoundry.org/cli/v7/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 30a8dac4fc0..c6219881b22 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/v7/command/plugin" ) type FakeAddPluginRepoActor struct { diff --git a/command/plugin/pluginfakes/fake_plugins_actor.go b/command/plugin/pluginfakes/fake_plugins_actor.go index d16659bf10b..637b773ab48 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/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 45ea9092410..7f021930057 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/command/plugin" ) type FakeUninstallPluginActor struct { diff --git a/command/plugin/plugins_command.go b/command/plugin/plugins_command.go index 7c1a626c263..7f9e8710c87 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/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/plugin/shared" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 381a51a5659..23cdbc439eb 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/plugin" + "code.cloudfoundry.org/cli/v7/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 db5c6d042c0..51cedd0fed1 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/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type RemovePluginRepoCommand struct { diff --git a/command/plugin/repo_plugins_command.go b/command/plugin/repo_plugins_command.go index bbc825bddce..13e7300e62c 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/v7/command" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type RepoPluginsCommand struct { diff --git a/command/plugin/shared/new_client.go b/command/plugin/shared/new_client.go index 01db4719a85..b3f2f9bc2e1 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/v7/api/plugin" + "code.cloudfoundry.org/cli/v7/api/plugin/wrapper" + "code.cloudfoundry.org/cli/v7/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 0565fc5b002..ede2742952a 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/trace" + "code.cloudfoundry.org/cli/v7/plugin/rpc" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type Config interface { diff --git a/command/plugin/uninstall_plugin_command.go b/command/plugin/uninstall_plugin_command.go index 05a32d962da..b25c30394cf 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/pluginaction" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/plugin/shared" + "code.cloudfoundry.org/cli/v7/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 ca15844dff2..08e226d9a32 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/plugin" + "code.cloudfoundry.org/cli/v7/command/plugin/pluginfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 46c9fa0cf8b..909c40081df 100644 --- a/command/translatableerror/convert_to_translatable_error.go +++ b/command/translatableerror/convert_to_translatable_error.go @@ -5,14 +5,14 @@ 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/util/v6manifestparser" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v7/util/download" + "code.cloudfoundry.org/cli/v7/util/manifest" + "code.cloudfoundry.org/cli/v7/util/v6manifestparser" 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 94f70dd751c..48572382d7d 100644 --- a/command/translatableerror/convert_to_translatable_error_test.go +++ b/command/translatableerror/convert_to_translatable_error_test.go @@ -5,15 +5,15 @@ 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/util/v6manifestparser" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/plugin/pluginerror" + "code.cloudfoundry.org/cli/v7/api/uaa" + . "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/clissh/ssherror" + "code.cloudfoundry.org/cli/v7/util/download" + "code.cloudfoundry.org/cli/v7/util/manifest" + "code.cloudfoundry.org/cli/v7/util/v6manifestparser" . "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 8d8e06416b5..6268f4055a7 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/v7/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 a237531625f..432c998e58e 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/v7/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 f79c98834be..697cb08f222 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/v7/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 1353cd4f9ee..5c6205f4373 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/v7/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 6394d787ee1..909ef39dc01 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/v7/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 989347828fa..df2743397d3 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/v7/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 0ce31dd5f1e..2013bb054ad 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/v7/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 a8792e81093..4ecf1447949 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 f4a97e0aba8..141e4b3ca61 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/v7/command/translatableerror" ) type FakeTranslatableError struct { diff --git a/command/translatableerror/translate_test.go b/command/translatableerror/translate_test.go index cbfc8c3bb7c..2254b9838d5 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/v7/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 339d350d1be..adfa049cd98 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/v7/command/translatableerror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/ui.go b/command/ui.go index 5059d6054da..1ba1953a616 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/v7/util/ui" ) // UI is the interface to STDOUT, STDERR, and STDIN. diff --git a/command/v6/bind_route_service_command.go b/command/v6/bind_route_service_command.go index 10c291333db..fe2f51e358f 100644 --- a/command/v6/bind_route_service_command.go +++ b/command/v6/bind_route_service_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type BindRouteServiceCommand struct { diff --git a/command/v6/bind_service_command.go b/command/v6/bind_service_command.go index cd748e149e6..f2a594bb0cb 100644 --- a/command/v6/bind_service_command.go +++ b/command/v6/bind_service_command.go @@ -3,12 +3,12 @@ package v6 import ( "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . BindServiceActor diff --git a/command/v6/bind_service_command_test.go b/command/v6/bind_service_command_test.go index 5d9c7da55f0..26fbb30ea94 100644 --- a/command/v6/bind_service_command_test.go +++ b/command/v6/bind_service_command_test.go @@ -3,16 +3,16 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/create_service_command.go b/command/v6/create_service_command.go index c70b745f66e..ac3cb2dc5a0 100644 --- a/command/v6/create_service_command.go +++ b/command/v6/create_service_command.go @@ -1,14 +1,14 @@ package v6 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CreateServiceActor diff --git a/command/v6/create_service_command_test.go b/command/v6/create_service_command_test.go index 1b1c21c6a10..5eaee4ae003 100644 --- a/command/v6/create_service_command_test.go +++ b/command/v6/create_service_command_test.go @@ -3,17 +3,17 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/create_service_key_command.go b/command/v6/create_service_key_command.go index b2cf1e88ec0..a1e93ce8006 100644 --- a/command/v6/create_service_key_command.go +++ b/command/v6/create_service_key_command.go @@ -1,12 +1,12 @@ package v6 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . CreateServiceKeyActor diff --git a/command/v6/create_service_key_command_test.go b/command/v6/create_service_key_command_test.go index 749da08003f..642959628b2 100644 --- a/command/v6/create_service_key_command_test.go +++ b/command/v6/create_service_key_command_test.go @@ -3,15 +3,15 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/create_user_provided_service_command.go b/command/v6/create_user_provided_service_command.go index 673e0802dbd..99e866a27a6 100644 --- a/command/v6/create_user_provided_service_command.go +++ b/command/v6/create_user_provided_service_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type CreateUserProvidedServiceCommand struct { diff --git a/command/v6/curl_command.go b/command/v6/curl_command.go index 06635792b93..7c20c322335 100644 --- a/command/v6/curl_command.go +++ b/command/v6/curl_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type CurlCommand struct { diff --git a/command/v6/delete_service_command.go b/command/v6/delete_service_command.go index 02db0569af4..e58f1adbaf3 100644 --- a/command/v6/delete_service_command.go +++ b/command/v6/delete_service_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type DeleteServiceCommand struct { diff --git a/command/v6/delete_service_key_command.go b/command/v6/delete_service_key_command.go index 0404211f225..96e6ded19d3 100644 --- a/command/v6/delete_service_key_command.go +++ b/command/v6/delete_service_key_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type DeleteServiceKeyCommand struct { diff --git a/command/v6/purge_service_instance_command.go b/command/v6/purge_service_instance_command.go index 581d2ec3a8f..8d744bbe489 100644 --- a/command/v6/purge_service_instance_command.go +++ b/command/v6/purge_service_instance_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type PurgeServiceInstanceCommand struct { diff --git a/command/v6/rename_service_command.go b/command/v6/rename_service_command.go index 06d220dc1f3..eb9de359751 100644 --- a/command/v6/rename_service_command.go +++ b/command/v6/rename_service_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type RenameServiceCommand struct { diff --git a/command/v6/service_command.go b/command/v6/service_command.go index 77eef8310bd..43fc3d40a19 100644 --- a/command/v6/service_command.go +++ b/command/v6/service_command.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceActor diff --git a/command/v6/service_command_test.go b/command/v6/service_command_test.go index 3977387813d..46484e685ac 100644 --- a/command/v6/service_command_test.go +++ b/command/v6/service_command_test.go @@ -3,16 +3,16 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/service_key_command.go b/command/v6/service_key_command.go index 30405c17447..311bfbbb959 100644 --- a/command/v6/service_key_command.go +++ b/command/v6/service_key_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type ServiceKeyCommand struct { diff --git a/command/v6/service_keys_command.go b/command/v6/service_keys_command.go index bfb93c33210..ceb4286c8eb 100644 --- a/command/v6/service_keys_command.go +++ b/command/v6/service_keys_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type ServiceKeysCommand struct { diff --git a/command/v6/services_command.go b/command/v6/services_command.go index be5582f459e..920f48801d5 100644 --- a/command/v6/services_command.go +++ b/command/v6/services_command.go @@ -5,13 +5,13 @@ import ( "sort" "strings" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/v6/shared" - "code.cloudfoundry.org/cli/util/sorting" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/v6/shared" + "code.cloudfoundry.org/cli/v7/util/sorting" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ServiceInstancesActor diff --git a/command/v6/services_command_test.go b/command/v6/services_command_test.go index c70c2435b3d..5cfff67b9b7 100644 --- a/command/v6/services_command_test.go +++ b/command/v6/services_command_test.go @@ -3,16 +3,16 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/share_service_command.go b/command/v6/share_service_command.go index 4fd6afe0ab1..b858194651e 100644 --- a/command/v6/share_service_command.go +++ b/command/v6/share_service_command.go @@ -1,15 +1,15 @@ package v6 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ShareServiceActor diff --git a/command/v6/share_service_command_test.go b/command/v6/share_service_command_test.go index f41f2a6cf5c..66adbe8845f 100644 --- a/command/v6/share_service_command_test.go +++ b/command/v6/share_service_command_test.go @@ -3,16 +3,16 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/shared/app_summary_displayer.go b/command/v6/shared/app_summary_displayer.go index 45bd98cfa88..0dd138c14c5 100644 --- a/command/v6/shared/app_summary_displayer.go +++ b/command/v6/shared/app_summary_displayer.go @@ -6,11 +6,11 @@ import ( "time" "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command" ) type AppSummaryDisplayer struct { diff --git a/command/v6/shared/app_summary_displayer_refactored.go b/command/v6/shared/app_summary_displayer_refactored.go index 3e980d5c3ce..bebfee18585 100644 --- a/command/v6/shared/app_summary_displayer_refactored.go +++ b/command/v6/shared/app_summary_displayer_refactored.go @@ -6,10 +6,10 @@ import ( "time" "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command" ) type AppSummaryDisplayer2 struct { diff --git a/command/v6/shared/app_summary_displayer_refactored_test.go b/command/v6/shared/app_summary_displayer_refactored_test.go index 2f17fbed320..51c23c6aa52 100644 --- a/command/v6/shared/app_summary_displayer_refactored_test.go +++ b/command/v6/shared/app_summary_displayer_refactored_test.go @@ -4,15 +4,15 @@ import ( "math" "time" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "code.cloudfoundry.org/cli/command/v6/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/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v7/command/v6/shared" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/shared/app_summary_displayer_test.go b/command/v6/shared/app_summary_displayer_test.go index e98ff194a88..ac78be52c3d 100644 --- a/command/v6/shared/app_summary_displayer_test.go +++ b/command/v6/shared/app_summary_displayer_test.go @@ -4,18 +4,18 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v3action" - "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/v6/shared" - "code.cloudfoundry.org/cli/command/v6/shared/sharedfakes" - "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/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v6/shared" + "code.cloudfoundry.org/cli/v7/command/v6/shared/sharedfakes" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/shared/application_summary_actor.go b/command/v6/shared/application_summary_actor.go index 18c73966028..01dcf5d983a 100644 --- a/command/v6/shared/application_summary_actor.go +++ b/command/v6/shared/application_summary_actor.go @@ -1,6 +1,6 @@ package shared -import "code.cloudfoundry.org/cli/actor/v2v3action" +import "code.cloudfoundry.org/cli/v7/actor/v2v3action" //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ApplicationSummaryActor diff --git a/command/v6/shared/get_application_changes.go b/command/v6/shared/get_application_changes.go index 186f1747723..d0a9ae3d3bd 100644 --- a/command/v6/shared/get_application_changes.go +++ b/command/v6/shared/get_application_changes.go @@ -2,8 +2,8 @@ package shared import ( "code.cloudfoundry.org/bytefmt" - "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/util/ui" ) func GetApplicationChanges(appConfig pushaction.ApplicationConfig) []ui.Change { diff --git a/command/v6/shared/get_application_changes_test.go b/command/v6/shared/get_application_changes_test.go index b93e4bdf626..111d9e8b1b6 100644 --- a/command/v6/shared/get_application_changes_test.go +++ b/command/v6/shared/get_application_changes_test.go @@ -3,12 +3,12 @@ package shared_test import ( "fmt" - "code.cloudfoundry.org/cli/actor/pushaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "code.cloudfoundry.org/cli/command/v6/shared" - "code.cloudfoundry.org/cli/types" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/pushaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + . "code.cloudfoundry.org/cli/v7/command/v6/shared" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v6/shared/new_clients.go b/command/v6/shared/new_clients.go index 759824795c0..63578ad4876 100644 --- a/command/v6/shared/new_clients.go +++ b/command/v6/shared/new_clients.go @@ -1,14 +1,14 @@ package shared import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - ccWrapper "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/router" - routerWrapper "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/v7/api/cloudcontroller/ccv2" + ccWrapper "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/api/router" + routerWrapper "code.cloudfoundry.org/cli/v7/api/router/wrapper" + "code.cloudfoundry.org/cli/v7/api/uaa" + uaaWrapper "code.cloudfoundry.org/cli/v7/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) func NewRouterClient(config command.Config, ui command.UI, uaaClient *uaa.Client) (*router.Client, error) { diff --git a/command/v6/shared/new_clients_test.go b/command/v6/shared/new_clients_test.go index dea27448924..9bf349a9165 100644 --- a/command/v6/shared/new_clients_test.go +++ b/command/v6/shared/new_clients_test.go @@ -5,11 +5,11 @@ import ( "runtime" "time" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v6/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v6/shared" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v6/shared/new_networking_client.go b/command/v6/shared/new_networking_client.go index 24057e3df88..069ab9349f3 100644 --- a/command/v6/shared/new_networking_client.go +++ b/command/v6/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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/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/v6/shared/new_networking_client_test.go b/command/v6/shared/new_networking_client_test.go index e7ee4170222..423514232ad 100644 --- a/command/v6/shared/new_networking_client_test.go +++ b/command/v6/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/v6/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v6/shared" + "code.cloudfoundry.org/cli/v7/util/ui" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -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() { diff --git a/command/v6/shared/new_v3_based_clients.go b/command/v6/shared/new_v3_based_clients.go index f4c3dc517d6..29119ca9bcb 100644 --- a/command/v6/shared/new_v3_based_clients.go +++ b/command/v6/shared/new_v3_based_clients.go @@ -1,12 +1,12 @@ package shared import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - ccWrapper "code.cloudfoundry.org/cli/api/cloudcontroller/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/v7/api/cloudcontroller/ccv3" + ccWrapper "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/api/uaa" + uaaWrapper "code.cloudfoundry.org/cli/v7/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) // NewV3BasedClients creates a new V3 Cloud Controller client and UAA client using the diff --git a/command/v6/shared/new_v3_based_clients_test.go b/command/v6/shared/new_v3_based_clients_test.go index bcdcba19ff6..53db6b51a23 100644 --- a/command/v6/shared/new_v3_based_clients_test.go +++ b/command/v6/shared/new_v3_based_clients_test.go @@ -5,11 +5,11 @@ import ( "runtime" "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v6/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v6/shared" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v6/shared/noaa_client.go b/command/v6/shared/noaa_client.go index 25bbb4b5486..a6b977a4d37 100644 --- a/command/v6/shared/noaa_client.go +++ b/command/v6/shared/noaa_client.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/api/uaa/noaabridge" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/util" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/noaabridge" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/util" "github.com/cloudfoundry/noaa/v2/consumer" ) diff --git a/command/v6/shared/noaa_client_test.go b/command/v6/shared/noaa_client_test.go index 9a3fbef491d..d9cdfa4c704 100644 --- a/command/v6/shared/noaa_client_test.go +++ b/command/v6/shared/noaa_client_test.go @@ -3,10 +3,10 @@ package shared_test import ( "reflect" - "code.cloudfoundry.org/cli/api/uaa" - "code.cloudfoundry.org/cli/command/commandfakes" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command/commandfakes" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/command/v6/shared" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v6/shared/package_displayer.go b/command/v6/shared/package_displayer.go index 389b5b8e327..2c5356d08a5 100644 --- a/command/v6/shared/package_displayer.go +++ b/command/v6/shared/package_displayer.go @@ -1,7 +1,7 @@ package shared import ( - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v7/command" ) type PackageDisplayer struct { diff --git a/command/v6/shared/poll_start.go b/command/v6/shared/poll_start.go index 079fb2c7fa0..8159a20da6a 100644 --- a/command/v6/shared/poll_start.go +++ b/command/v6/shared/poll_start.go @@ -3,11 +3,11 @@ package shared import ( "context" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) func PollStart(ui command.UI, config command.Config, diff --git a/command/v6/shared/poll_start_test.go b/command/v6/shared/poll_start_test.go index a53569b0184..736c3fe71ea 100644 --- a/command/v6/shared/poll_start_test.go +++ b/command/v6/shared/poll_start_test.go @@ -4,14 +4,14 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v6/shared" - - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v6/shared" + + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v6/shared/sharedfakes/fake_application_summary_actor.go b/command/v6/shared/sharedfakes/fake_application_summary_actor.go index 6ba6883349d..f16a4f42ec9 100644 --- a/command/v6/shared/sharedfakes/fake_application_summary_actor.go +++ b/command/v6/shared/sharedfakes/fake_application_summary_actor.go @@ -4,8 +4,8 @@ package sharedfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) type FakeApplicationSummaryActor struct { diff --git a/command/v6/shared/sharedfakes/fake_v2app_actor.go b/command/v6/shared/sharedfakes/fake_v2app_actor.go index 86d946fac72..757762dc375 100644 --- a/command/v6/shared/sharedfakes/fake_v2app_actor.go +++ b/command/v6/shared/sharedfakes/fake_v2app_actor.go @@ -4,8 +4,8 @@ package sharedfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) type FakeV2AppActor struct { diff --git a/command/v6/shared/sharedfakes/fake_v3app_summary_actor.go b/command/v6/shared/sharedfakes/fake_v3app_summary_actor.go index 9ee5aa5fe2f..896290ba036 100644 --- a/command/v6/shared/sharedfakes/fake_v3app_summary_actor.go +++ b/command/v6/shared/sharedfakes/fake_v3app_summary_actor.go @@ -4,8 +4,8 @@ package sharedfakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) type FakeV3AppSummaryActor struct { diff --git a/command/v6/shared/v3_poll_stage.go b/command/v6/shared/v3_poll_stage.go index 4b5e0d90eb8..71383c53ae4 100644 --- a/command/v6/shared/v3_poll_stage.go +++ b/command/v6/shared/v3_poll_stage.go @@ -1,9 +1,9 @@ package shared import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/command" ) func PollStage(dropletStream <-chan v3action.Droplet, warningsStream <-chan v3action.Warnings, errStream <-chan error, logStream <-chan *v3action.LogMessage, logErrStream <-chan error, ui command.UI) (v3action.Droplet, error) { diff --git a/command/v6/shared/v3_poll_stage_test.go b/command/v6/shared/v3_poll_stage_test.go index e3b1bd0a50b..3966139aae5 100644 --- a/command/v6/shared/v3_poll_stage_test.go +++ b/command/v6/shared/v3_poll_stage_test.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v3action" - . "code.cloudfoundry.org/cli/command/v6/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v3action" + . "code.cloudfoundry.org/cli/v7/command/v6/shared" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v6/unbind_route_service_command.go b/command/v6/unbind_route_service_command.go index 0b52343242a..c5296fbee25 100644 --- a/command/v6/unbind_route_service_command.go +++ b/command/v6/unbind_route_service_command.go @@ -1,9 +1,9 @@ package v6 import ( - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type UnbindRouteServiceCommand struct { diff --git a/command/v6/unbind_service_command.go b/command/v6/unbind_service_command.go index effeb01bb66..2218f34e81c 100644 --- a/command/v6/unbind_service_command.go +++ b/command/v6/unbind_service_command.go @@ -3,12 +3,12 @@ package v6 import ( "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UnbindServiceActor diff --git a/command/v6/unbind_service_command_test.go b/command/v6/unbind_service_command_test.go index eb28450e342..cee06bc74d9 100644 --- a/command/v6/unbind_service_command_test.go +++ b/command/v6/unbind_service_command_test.go @@ -3,15 +3,15 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/unshare_service_command.go b/command/v6/unshare_service_command.go index 5adc9e91d16..cd661e99d97 100644 --- a/command/v6/unshare_service_command.go +++ b/command/v6/unshare_service_command.go @@ -1,15 +1,15 @@ package v6 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UnshareServiceActor diff --git a/command/v6/unshare_service_command_test.go b/command/v6/unshare_service_command_test.go index 50607d6341a..39c586f544c 100644 --- a/command/v6/unshare_service_command_test.go +++ b/command/v6/unshare_service_command_test.go @@ -3,16 +3,16 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v2v3action" - "code.cloudfoundry.org/cli/command/commandfakes" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/update_service_command.go b/command/v6/update_service_command.go index d153660c37d..273d2d7848a 100644 --- a/command/v6/update_service_command.go +++ b/command/v6/update_service_command.go @@ -1,15 +1,15 @@ package v6 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/actor/v2action/composite" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/actor/v2action/composite" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UpdateServiceActor diff --git a/command/v6/update_service_command_test.go b/command/v6/update_service_command_test.go index b8e2838ab0e..ed03a88a690 100644 --- a/command/v6/update_service_command_test.go +++ b/command/v6/update_service_command_test.go @@ -4,17 +4,17 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/actionerror" - - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/update_user_provided_service_command.go b/command/v6/update_user_provided_service_command.go index 0786cf1f008..e02b5f5c00e 100644 --- a/command/v6/update_user_provided_service_command.go +++ b/command/v6/update_user_provided_service_command.go @@ -3,12 +3,12 @@ package v6 import ( "fmt" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . UpdateUserProvidedServiceActor diff --git a/command/v6/update_user_provided_service_command_test.go b/command/v6/update_user_provided_service_command_test.go index 9f95bcf15b9..a8bfb730549 100644 --- a/command/v6/update_user_provided_service_command_test.go +++ b/command/v6/update_user_provided_service_command_test.go @@ -5,14 +5,14 @@ import ( "errors" "fmt" - "code.cloudfoundry.org/cli/actor/v2action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/v2action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -90,7 +90,7 @@ var _ = Describe("update-user-provided-service Command", func() { Name: fakeOrgName, }) - fakeConfig.CurrentUserReturns(configv3.User{Name: fakeUserName}, nil) //TODO: test errors + fakeConfig.CurrentUserReturns(configv3.User{Name: fakeUserName}, nil) // TODO: test errors }) It("looks up the service instance GUID", func() { diff --git a/command/v6/v3_cancel_zdt_push_command.go b/command/v6/v3_cancel_zdt_push_command.go index e129f0e6252..0cc7416b1a9 100644 --- a/command/v6/v3_cancel_zdt_push_command.go +++ b/command/v6/v3_cancel_zdt_push_command.go @@ -3,11 +3,11 @@ package v6 import ( "errors" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V3CancelZdtPushActor diff --git a/command/v6/v3_cancel_zdt_push_command_test.go b/command/v6/v3_cancel_zdt_push_command_test.go index 3abbac37a21..454ce8249c3 100644 --- a/command/v6/v3_cancel_zdt_push_command_test.go +++ b/command/v6/v3_cancel_zdt_push_command_test.go @@ -3,14 +3,14 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/command/commandfakes" - "code.cloudfoundry.org/cli/command/flag" - . "code.cloudfoundry.org/cli/command/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/v3_zdt_restart_command.go b/command/v6/v3_zdt_restart_command.go index 5be9e7a84b8..a4ed8d6ff89 100644 --- a/command/v6/v3_zdt_restart_command.go +++ b/command/v6/v3_zdt_restart_command.go @@ -1,12 +1,12 @@ package v6 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/actor/v3action" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v6/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v6/shared" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . V3ZeroDowntimeRestartActor diff --git a/command/v6/v3_zdt_restart_command_test.go b/command/v6/v3_zdt_restart_command_test.go index c0c7ec74555..dec13c433a8 100644 --- a/command/v6/v3_zdt_restart_command_test.go +++ b/command/v6/v3_zdt_restart_command_test.go @@ -3,18 +3,18 @@ package v6_test import ( "errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/command/translatableerror" - - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/v3action" - "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/v6" - "code.cloudfoundry.org/cli/command/v6/v6fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v3action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v6" + "code.cloudfoundry.org/cli/v7/command/v6/v6fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v6/v6fakes/fake_bind_service_actor.go b/command/v6/v6fakes/fake_bind_service_actor.go index 55335ac3e1d..3fa7971af78 100644 --- a/command/v6/v6fakes/fake_bind_service_actor.go +++ b/command/v6/v6fakes/fake_bind_service_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeBindServiceActor struct { diff --git a/command/v6/v6fakes/fake_create_service_actor.go b/command/v6/v6fakes/fake_create_service_actor.go index fe27b55c94f..6a11fc44cfd 100644 --- a/command/v6/v6fakes/fake_create_service_actor.go +++ b/command/v6/v6fakes/fake_create_service_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeCreateServiceActor struct { diff --git a/command/v6/v6fakes/fake_create_service_key_actor.go b/command/v6/v6fakes/fake_create_service_key_actor.go index aa9fbd49970..8ae04f5ea0c 100644 --- a/command/v6/v6fakes/fake_create_service_key_actor.go +++ b/command/v6/v6fakes/fake_create_service_key_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeCreateServiceKeyActor struct { diff --git a/command/v6/v6fakes/fake_service_actor.go b/command/v6/v6fakes/fake_service_actor.go index 821260121a0..768d9c0b400 100644 --- a/command/v6/v6fakes/fake_service_actor.go +++ b/command/v6/v6fakes/fake_service_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeServiceActor struct { diff --git a/command/v6/v6fakes/fake_service_instances_actor.go b/command/v6/v6fakes/fake_service_instances_actor.go index b14f26e6bc6..21cecf60949 100644 --- a/command/v6/v6fakes/fake_service_instances_actor.go +++ b/command/v6/v6fakes/fake_service_instances_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeServiceInstancesActor struct { diff --git a/command/v6/v6fakes/fake_share_service_actor.go b/command/v6/v6fakes/fake_share_service_actor.go index 5d8f4b6e9df..8a706d553bb 100644 --- a/command/v6/v6fakes/fake_share_service_actor.go +++ b/command/v6/v6fakes/fake_share_service_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2v3action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeShareServiceActor struct { diff --git a/command/v6/v6fakes/fake_unbind_service_actor.go b/command/v6/v6fakes/fake_unbind_service_actor.go index fccdf68e052..60705e081ff 100644 --- a/command/v6/v6fakes/fake_unbind_service_actor.go +++ b/command/v6/v6fakes/fake_unbind_service_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeUnbindServiceActor struct { diff --git a/command/v6/v6fakes/fake_unshare_service_actor.go b/command/v6/v6fakes/fake_unshare_service_actor.go index 5bda2aa4a44..db5d9dbbd52 100644 --- a/command/v6/v6fakes/fake_unshare_service_actor.go +++ b/command/v6/v6fakes/fake_unshare_service_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2v3action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2v3action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeUnshareServiceActor struct { diff --git a/command/v6/v6fakes/fake_update_service_actor.go b/command/v6/v6fakes/fake_update_service_actor.go index 89ec1ed3cde..61ee2f3a362 100644 --- a/command/v6/v6fakes/fake_update_service_actor.go +++ b/command/v6/v6fakes/fake_update_service_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeUpdateServiceActor struct { diff --git a/command/v6/v6fakes/fake_update_user_provided_service_actor.go b/command/v6/v6fakes/fake_update_user_provided_service_actor.go index 6ed161b9f11..eb80b13082e 100644 --- a/command/v6/v6fakes/fake_update_user_provided_service_actor.go +++ b/command/v6/v6fakes/fake_update_user_provided_service_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v2action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v2action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeUpdateUserProvidedServiceActor struct { diff --git a/command/v6/v6fakes/fake_v3cancel_zdt_push_actor.go b/command/v6/v6fakes/fake_v3cancel_zdt_push_actor.go index bcf826a4970..9fb6ff8e8b7 100644 --- a/command/v6/v6fakes/fake_v3cancel_zdt_push_actor.go +++ b/command/v6/v6fakes/fake_v3cancel_zdt_push_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v3action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v3action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeV3CancelZdtPushActor struct { diff --git a/command/v6/v6fakes/fake_v3zero_downtime_restart_actor.go b/command/v6/v6fakes/fake_v3zero_downtime_restart_actor.go index 1e7810eaf30..e3189f86911 100644 --- a/command/v6/v6fakes/fake_v3zero_downtime_restart_actor.go +++ b/command/v6/v6fakes/fake_v3zero_downtime_restart_actor.go @@ -4,8 +4,8 @@ package v6fakes import ( "sync" - "code.cloudfoundry.org/cli/actor/v3action" - v6 "code.cloudfoundry.org/cli/command/v6" + "code.cloudfoundry.org/cli/v7/actor/v3action" + v6 "code.cloudfoundry.org/cli/v7/command/v6" ) type FakeV3ZeroDowntimeRestartActor struct { diff --git a/command/v7/actor.go b/command/v7/actor.go index 0de7b945ab6..8b5405e40da 100644 --- a/command/v7/actor.go +++ b/command/v7/actor.go @@ -5,14 +5,14 @@ import ( "io" "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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + uaa "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" "github.com/SermoDigital/jose/jwt" ) diff --git a/command/v7/add_network_policy_command.go b/command/v7/add_network_policy_command.go index 6fce8acc9fe..662d96c08a3 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/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/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 a3b20675cee..8c1ed5dedbd 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 3900e532600..ac986be8065 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 2606239f217..a9814d65ee9 100644 --- a/command/v7/allow_space_ssh_command_test.go +++ b/command/v7/allow_space_ssh_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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 aa222af4c96..a96fc51e2ec 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" ) type APICommand struct { diff --git a/command/v7/api_command_test.go b/command/v7/api_command_test.go index e9df7ae7e0c..3e2632041a4 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 9c7227dc195..76dae03aaa6 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" ) type AppCommand struct { diff --git a/command/v7/app_command_test.go b/command/v7/app_command_test.go index 0ba3e526e18..8faca227bef 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 819d00021d4..95b5d7ef550 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/cf/errors" + "code.cloudfoundry.org/cli/v7/cf/errors" "gopkg.in/yaml.v2" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/manifestparser" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" ) diff --git a/command/v7/apply_manifest_command_test.go b/command/v7/apply_manifest_command_test.go index d3a8167f78f..4e9632c9b9c 100644 --- a/command/v7/apply_manifest_command_test.go +++ b/command/v7/apply_manifest_command_test.go @@ -6,16 +6,16 @@ import ( "gopkg.in/yaml.v2" - "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" - . "code.cloudfoundry.org/cli/command/v7" - "code.cloudfoundry.org/cli/command/v7/v7fakes" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/manifestparser" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/manifestparser" + "code.cloudfoundry.org/cli/v7/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 f0ca3ab6748..e1511316d66 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/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type AppsCommand struct { diff --git a/command/v7/apps_command_test.go b/command/v7/apps_command_test.go index 53af5863bbe..ddafb9d0e47 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 99fd6ea0ab4..3eb24b3c958 100644 --- a/command/v7/auth_command.go +++ b/command/v7/auth_command.go @@ -3,12 +3,12 @@ package v7 import ( "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/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/shared" ) type AuthCommand struct { diff --git a/command/v7/auth_command_test.go b/command/v7/auth_command_test.go index 91c758ea128..c067fe8cab2 100644 --- a/command/v7/auth_command_test.go +++ b/command/v7/auth_command_test.go @@ -3,14 +3,14 @@ package v7_test import ( "errors" - "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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 e40bcc26d65..a9bc4c92246 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/v7/shared" "code.cloudfoundry.org/clock" ) diff --git a/command/v7/bind_running_security_group_command.go b/command/v7/bind_running_security_group_command.go index 74bd333724d..b644248191e 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 10d58d6777b..64ae99ad88b 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 85164a69a60..9d3a343b836 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 8f44b33de7e..5db3c6d8819 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -278,7 +278,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_staging_security_group_command.go b/command/v7/bind_staging_security_group_command.go index 394398ca8c1..48851bb60f9 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 00f0d5e5c4e..11d5fd577da 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 8a8533fd06e..e5aecb8cadf 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/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type BuildpacksCommand struct { diff --git a/command/v7/buildpacks_command_test.go b/command/v7/buildpacks_command_test.go index 7c002a08e32..4d408ed1db8 100644 --- a/command/v7/buildpacks_command_test.go +++ b/command/v7/buildpacks_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/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 c89296eae12..040a069b254 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/v7/command/flag" ) type CancelDeploymentCommand struct { diff --git a/command/v7/cancel_deployment_command_test.go b/command/v7/cancel_deployment_command_test.go index cae5dbdebed..b57e5dcfb5f 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 2649bae98d0..3759bd29ee5 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/v7/command/flag" ) type CheckRouteCommand struct { diff --git a/command/v7/check_route_command_test.go b/command/v7/check_route_command_test.go index 8bc34856e1a..404cb076bc0 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 ae306787c5f..7edc3e703f6 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/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type ConfigCommand struct { diff --git a/command/v7/config_command_test.go b/command/v7/config_command_test.go index dcc61aa6e88..154dad98beb 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/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/copy_source_command.go b/command/v7/copy_source_command.go index 944e3845939..100a0dc82c3 100644 --- a/command/v7/copy_source_command.go +++ b/command/v7/copy_source_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type CopySourceCommand struct { diff --git a/command/v7/copy_source_command_test.go b/command/v7/copy_source_command_test.go index 9f7b278b2be..d3b94e82d7e 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 4d250626605..6d8a7208b78 100644 --- a/command/v7/create_app_command.go +++ b/command/v7/create_app_command.go @@ -1,10 +1,10 @@ package v7 import ( - "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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" ) type CreateAppCommand struct { diff --git a/command/v7/create_app_command_test.go b/command/v7/create_app_command_test.go index 1d6653bff05..6b9cfde1d2b 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 72891fe80ff..c7a2146ccdb 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/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 dc919f5059e..cebf9337870 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 e36c254bc91..cdbcbf000b4 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/download" ) type CreateBuildpackCommand struct { diff --git a/command/v7/create_buildpack_command_test.go b/command/v7/create_buildpack_command_test.go index 844b10aed9f..2b192c5aca6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 a170740eabe..86b8f43dc8a 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 db5de854d84..12d291329a6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 a7ca4c30a6d..54e9fda480b 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type CreateOrgCommand struct { diff --git a/command/v7/create_org_command_test.go b/command/v7/create_org_command_test.go index d6a7bf2cb06..ee93a30c265 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 6f9bfa78ae1..b7d7f7e77a3 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 4b36309d765..e352c914ff4 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 3febb4f3421..032b2378942 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" ) type CreatePackageCommand struct { diff --git a/command/v7/create_package_command_test.go b/command/v7/create_package_command_test.go index d73f9a54571..bf3cb9a96d6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 48f8d3e4ccd..383566f58d7 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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 a42c5bb933e..d685ba4c799 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 654bfb0fcc0..84b83803b9d 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type CreateRouteCommand struct { diff --git a/command/v7/create_route_command_test.go b/command/v7/create_route_command_test.go index bd37db2ec87..40d4733d74c 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 420cde2c061..5cb1be433d7 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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 8e1ade6e8cd..78d0dd3220d 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 99c2d224c6d..6c02ae4fcf2 100644 --- a/command/v7/create_service_broker_command.go +++ b/command/v7/create_service_broker_command.go @@ -1,9 +1,9 @@ package v7 import ( - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 f20fc495713..dbdf2869803 100644 --- a/command/v7/create_service_broker_command_test.go +++ b/command/v7/create_service_broker_command_test.go @@ -3,12 +3,12 @@ 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/util/configv3" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 39237843927..a3a68d3c466 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/v7/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 53c7a100c5f..db865ded014 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 376cb5d0144..efdc81c751a 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" ) type CreateSpaceActor interface { diff --git a/command/v7/create_space_command_test.go b/command/v7/create_space_command_test.go index 6f1d804917b..6c35c2372d3 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 afc5eb2e7d3..d6a17d6d2b0 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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 04bf16ae3e2..5359a05ad88 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 c3647bc3daf..40fd22fa265 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type CreateUserCommand struct { diff --git a/command/v7/create_user_command_test.go b/command/v7/create_user_command_test.go index 6f42a724227..714d28343cc 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 c0d0e5f5717..676a5cb209f 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type DeleteBuildpackCommand struct { diff --git a/command/v7/delete_buildpack_command_test.go b/command/v7/delete_buildpack_command_test.go index ccd53b95b5d..d9ada5e3341 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 b45abf764bf..d7ecc8a95d3 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type DeleteCommand struct { diff --git a/command/v7/delete_command_test.go b/command/v7/delete_command_test.go index 58ec7fcb020..4cfc836cd14 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 6e586ca6c3a..fe491b886f9 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 1ccc939c9c1..30d286c0dd5 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 4131654ea90..02668bd63be 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type DeleteOrgCommand struct { diff --git a/command/v7/delete_org_command_test.go b/command/v7/delete_org_command_test.go index 4e4c4d5afb3..b231360251e 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 3df1937cfb4..a560c8c56b6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 182ba17b311..4e32a212c99 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 dec3f2f3cfe..89f349b4003 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 1899ca6c378..f8d6f7a0766 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 af7ac32e2e6..9b11932989b 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/resources" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 13614b6b1ae..883dd64637f 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type DeleteRouteCommand struct { diff --git a/command/v7/delete_route_command_test.go b/command/v7/delete_route_command_test.go index 77b9bfc3055..70951a6357c 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 5f3ae90c72e..4dfbb889c19 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 ed29a6895b0..dac26cf1eb4 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 3a7206d55f4..a8808047b3b 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 87341a802b7..e4dd935cc0f 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 e293cd7f142..6cc443ab08e 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 e7a74969f88..2c2c3cd61c9 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/resources" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 4747bfd98ad..e8770ee0f82 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type DeleteSpaceCommand struct { diff --git a/command/v7/delete_space_command_test.go b/command/v7/delete_space_command_test.go index a3abc019f88..ae6ff905d42 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 5d8ca16ba71..e9d2a3a99a8 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 66db6b1752c..f09002f583b 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 ff6e35b4fb6..324031c6fe6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type DeleteUserCommand struct { diff --git a/command/v7/delete_user_command_test.go b/command/v7/delete_user_command_test.go index 36d407865bf..0f51e0def75 100644 --- a/command/v7/delete_user_command_test.go +++ b/command/v7/delete_user_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/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/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 f6ef34fdd2f..1e0b44f78ca 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/v7/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 b1a3017df4a..8f5c0df082f 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 0101c0cfeb5..fbe4b4b64c3 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/v7/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 598fc3a9d50..c80ead96e05 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 7a15cbbbbdb..80838d420d2 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/v7/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 829173f4e12..a207947216b 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 3cddb8b0d5f..7bdfe51a9db 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/v7/command/flag" ) type DisableSSHCommand struct { diff --git a/command/v7/disable_ssh_command_test.go b/command/v7/disable_ssh_command_test.go index 23c8ed73b99..3f44fe082f9 100644 --- a/command/v7/disable_ssh_command_test.go +++ b/command/v7/disable_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/resources" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 de22e9b586b..225f9472ffc 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 80f9ec7588a..ac3043441b0 100644 --- a/command/v7/disallow_space_ssh_command_test.go +++ b/command/v7/disallow_space_ssh_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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 f649b1a6e94..92c9b165293 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/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/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 8a48279ecb1..d483b1cd644 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/v7/resources" + "code.cloudfoundry.org/cli/v7/util/sorting" + "code.cloudfoundry.org/cli/v7/util/ui" ) type DomainsCommand struct { diff --git a/command/v7/domains_command_test.go b/command/v7/domains_command_test.go index d0fab281cc3..9a64bc501d4 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/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 cd04b1f4006..f98b7e29080 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type DownloadDropletCommand struct { diff --git a/command/v7/download_droplet_command_test.go b/command/v7/download_droplet_command_test.go index 1ff351c4142..10d8800c61f 100644 --- a/command/v7/download_droplet_command_test.go +++ b/command/v7/download_droplet_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/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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 a9b58e221ca..0f029f8d02c 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/util/ui" ) type DropletsCommand struct { diff --git a/command/v7/droplets_command_test.go b/command/v7/droplets_command_test.go index 8b3eea5d655..603f22b6046 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 4ca569c9c85..6ee342b9bd7 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/v7/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 28a6ca2b3ef..d2bc1c91430 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 54bb5ad9a14..eb42cbea672 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/v7/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 f338550b136..6ae4349fb3a 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 e7e3d4cdec5..4e8ff6f9f78 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/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 3dd616944cd..68d6bfba255 100644 --- a/command/v7/enable_service_access_command_test.go +++ b/command/v7/enable_service_access_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/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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 70c79f0bc8c..eb481ba2534 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/v7/command/flag" ) type EnableSSHCommand struct { diff --git a/command/v7/enable_ssh_command_test.go b/command/v7/enable_ssh_command_test.go index b144f633f6a..8e1205f15d0 100644 --- a/command/v7/enable_ssh_command_test.go +++ b/command/v7/enable_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/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/ui" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 6896356ee04..5e24d49fa83 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/v7/command/flag" log "github.com/sirupsen/logrus" ) diff --git a/command/v7/env_command_test.go b/command/v7/env_command_test.go index d80bd94844c..0e95341ec56 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 566169ae6c7..45ed31246be 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/util/ui" ) type EventsCommand struct { diff --git a/command/v7/events_command_test.go b/command/v7/events_command_test.go index caa9958170b..7effc80bbb0 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/flag" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 7d113030cd7..4c297065044 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type FeatureFlagCommand struct { diff --git a/command/v7/feature_flag_command_test.go b/command/v7/feature_flag_command_test.go index 0560e7bdfea..90d046a4508 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 5d98ccd1147..76bd5149a03 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/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type FeatureFlagsCommand struct { diff --git a/command/v7/feature_flags_command_test.go b/command/v7/feature_flags_command_test.go index e5353bedd15..a9b04632a3b 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 1611d15f3d5..676c1ba4bb9 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 a4d2795ad4d..2262f609bb8 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 4f77f3b305a..a5c7981007e 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/v7/util/ui" ) type IsolationSegmentsCommand struct { diff --git a/command/v7/isolation_segments_command_test.go b/command/v7/isolation_segments_command_test.go index c39bd880a52..0091b695105 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 cd77a7f7c9f..ba040efeca1 100644 --- a/command/v7/label_updater.go +++ b/command/v7/label_updater.go @@ -5,10 +5,10 @@ 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/types" ) //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 dd24af3142a..f412775492c 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -306,7 +306,7 @@ var _ = Describe("LabelUpdater", func() { When("Unsetting labels", func() { BeforeEach(func() { cmd.Action = Unset - //FIXME do we want to change the labels to all have nil values? + // FIXME do we want to change the labels to all have nil values? }) It("shows 'Removing' as action", func() { Expect(testUI.Out).To(Say(regexp.QuoteMeta(`Removing label(s) for app %s in org fake-org / space fake-space as some-user...`), appName)) @@ -316,7 +316,7 @@ var _ = Describe("LabelUpdater", func() { When("Setting labels", func() { BeforeEach(func() { cmd.Action = Set - //FIXME do we want to change the labels to all have not nil values? + // FIXME do we want to change the labels to all have not nil values? }) It("shows 'Setting' as action", func() { @@ -456,7 +456,7 @@ var _ = Describe("LabelUpdater", func() { When("Setting labels", func() { BeforeEach(func() { cmd.Action = Set - //FIXME do we want to change the labels to all have not nil values? + // FIXME do we want to change the labels to all have not nil values? }) When("stack is passed", func() { diff --git a/command/v7/labels_command.go b/command/v7/labels_command.go index 284b21c05f0..d614b389ca4 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/ui" ) type ResourceType string diff --git a/command/v7/labels_command_test.go b/command/v7/labels_command_test.go index a0f3864a58a..c8d32fd2d19 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 3349d6ed304..3ec858180b3 100644 --- a/command/v7/login_command.go +++ b/command/v7/login_command.go @@ -7,18 +7,18 @@ 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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/command" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 fa6df210fa1..0c500e4c5a9 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 9bf7fdddbb3..dd300879eaa 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/v7/shared" "code.cloudfoundry.org/clock" ) diff --git a/command/v7/logout_command_test.go b/command/v7/logout_command_test.go index 575106f8a76..3853f824de7 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 bfac1a457b7..6c81e4f171e 100644 --- a/command/v7/logs_command.go +++ b/command/v7/logs_command.go @@ -5,11 +5,11 @@ import ( "os/signal" "time" - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" ) type LogsCommand struct { diff --git a/command/v7/logs_command_test.go b/command/v7/logs_command_test.go index 23585584e79..d359f2a8aae 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 039b6777d0e..db30fd9b2b5 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type MapRouteCommand struct { diff --git a/command/v7/map_route_command_test.go b/command/v7/map_route_command_test.go index 1b1b2a44c5e..f1e07669dce 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 65409102543..0a3b5ad2a0e 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type MarketplaceCommand struct { diff --git a/command/v7/marketplace_command_test.go b/command/v7/marketplace_command_test.go index 22e36156ff5..5ed5e252f5c 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/network_policies_command.go b/command/v7/network_policies_command.go index 1c1b991f22a..8c5a38ef86f 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/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/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 a3fa1914f37..05c24cf5533 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 a5feff234a1..b82e62d8b61 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/v7/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 51eac274dcd..dbe339fc575 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 972cd68bfe0..42afa54c632 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/v7/command/flag" ) type OrgCommand struct { diff --git a/command/v7/org_command_test.go b/command/v7/org_command_test.go index 79e274f9ba4..bba87b50b30 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 9f55424a7b6..c7a0446f939 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" ) type OrgQuotaCommand struct { diff --git a/command/v7/org_quota_command_test.go b/command/v7/org_quota_command_test.go index 20ca2a2711b..07924003169 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 d774c48a236..61e42f6d2bc 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/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" ) type OrgQuotasCommand struct { diff --git a/command/v7/org_quotas_command_test.go b/command/v7/org_quotas_command_test.go index 4eeb411f9c6..dbacac1724b 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 16434e85611..bdbd78ac8f4 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" ) type OrgUsersCommand struct { diff --git a/command/v7/org_users_command_test.go b/command/v7/org_users_command_test.go index 5f298e5e274..24de3f95560 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 5a5ed52fc97..dc61cd37db6 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/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type OrgsCommand struct { diff --git a/command/v7/orgs_command_test.go b/command/v7/orgs_command_test.go index c17cc7d102a..39cb0afe5fb 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 0d35de66dbf..8ec5444644c 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/util/ui" ) type PackagesCommand struct { diff --git a/command/v7/packages_command_test.go b/command/v7/packages_command_test.go index 5840b8fbd7d..a64237c26b2 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 fcdf18d79e2..a74808f5a01 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/v7/command/translatableerror" ) type PasswdCommand struct { diff --git a/command/v7/passwd_command_test.go b/command/v7/passwd_command_test.go index 6b177d7c7f1..706ee89e906 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/purge_service_offering_command.go b/command/v7/purge_service_offering_command.go index bcc9cdaa2e5..fc40b1d0eb2 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/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 c52d0335cd4..021caad0aa1 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/v7/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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 38623f2b9c7..1ef72425211 100644 --- a/command/v7/push_command.go +++ b/command/v7/push_command.go @@ -6,20 +6,20 @@ 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/v7pushaction" - "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/resources" - "code.cloudfoundry.org/cli/util/configv3" - "code.cloudfoundry.org/cli/util/manifestparser" - "code.cloudfoundry.org/cli/util/progressbar" + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/manifestparser" + "code.cloudfoundry.org/cli/v7/util/progressbar" "github.com/cloudfoundry/bosh-cli/director/template" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" diff --git a/command/v7/push_command_test.go b/command/v7/push_command_test.go index 61cf20163cc..7f9e407f6db 100644 --- a/command/v7/push_command_test.go +++ b/command/v7/push_command_test.go @@ -5,22 +5,22 @@ 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/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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/manifestparser" + "code.cloudfoundry.org/cli/v7/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 6aaa7f768d3..b0a3901dd2e 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 d81f689c732..8ed4bc1f700 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 2680ca77283..84b75f0fca6 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/v7/command/flag" ) type RenameCommand struct { diff --git a/command/v7/rename_command_test.go b/command/v7/rename_command_test.go index 0497d7906e1..9cc3c18c4df 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 94f18aec7fa..4d015c30f77 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/v7/command/flag" ) type RenameOrgCommand struct { diff --git a/command/v7/rename_org_command_test.go b/command/v7/rename_org_command_test.go index 3689ee412a9..1e44892ba0a 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 aa586cef1c7..41e70dd1f19 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 e495123954a..f6576858068 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 af1e0ee28db..2bdaa207888 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/v7/command/flag" ) type RenameSpaceCommand struct { diff --git a/command/v7/rename_space_command_test.go b/command/v7/rename_space_command_test.go index 3962376e99f..4992a07716a 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 bd10206ddf8..96a31c494f0 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/v7/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 339d531255f..8e35beeed7a 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 7ad5c4dd8a8..3713cd25d33 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/v7/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 6d17805f141..073ca17badb 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 563b6fa3334..e1a47ad0b8b 100644 --- a/command/v7/restage_command.go +++ b/command/v7/restage_command.go @@ -1,12 +1,12 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/actionerror" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/shared" ) type RestageCommand struct { diff --git a/command/v7/restage_command_test.go b/command/v7/restage_command_test.go index 4df3a054af7..161df28b42e 100644 --- a/command/v7/restage_command_test.go +++ b/command/v7/restage_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/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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 d2598da20b1..7f1176df8d5 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/v7/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 c2e3935e09a..cac5e15adab 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 3cae5e696a3..c862e36c094 100644 --- a/command/v7/restart_command.go +++ b/command/v7/restart_command.go @@ -1,10 +1,10 @@ package v7 import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" ) type RestartCommand struct { diff --git a/command/v7/restart_command_test.go b/command/v7/restart_command_test.go index 649c0b2f863..95f8252ea88 100644 --- a/command/v7/restart_command_test.go +++ b/command/v7/restart_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/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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 ebd429291b4..fe054cb9f06 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/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" ) type RevisionCommand struct { diff --git a/command/v7/revision_command_test.go b/command/v7/revision_command_test.go index 2b31c71045f..2eb662cc41d 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/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 c7484afe4d3..0cc90ce848e 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 e389e027945..3c52cb579fd 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 09138c2f687..3ea4b13b611 100644 --- a/command/v7/rollback_command.go +++ b/command/v7/rollback_command.go @@ -3,12 +3,12 @@ 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/v7/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" ) type RollbackCommand struct { diff --git a/command/v7/rollback_command_test.go b/command/v7/rollback_command_test.go index 3fdba633a04..6253d9f771b 100644 --- a/command/v7/rollback_command_test.go +++ b/command/v7/rollback_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" - 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 dabc5413dc4..9d8ea5f5e67 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/util/ui" ) type RouterGroupsCommand struct { diff --git a/command/v7/router_groups_command_test.go b/command/v7/router_groups_command_test.go index 08c3e39bce2..f18c5f6f88a 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 bd946f9cdd2..ff93879791e 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type RoutesCommand struct { diff --git a/command/v7/routes_command_test.go b/command/v7/routes_command_test.go index 04c8639811f..52b889caddf 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 cc1c65105f7..7b96683219b 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" ) type RunTaskCommand struct { diff --git a/command/v7/run_task_command_test.go b/command/v7/run_task_command_test.go index 72d9a374da0..78ac949cfbb 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 9b782ce7cf9..9cf33a37258 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 0314df19750..41a98f0a9c6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 b3f84c84494..4394343dc9b 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/v7/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 d35746f5ba3..afcef133c94 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 94494d4bdf1..142505329b0 100644 --- a/command/v7/scale_command.go +++ b/command/v7/scale_command.go @@ -1,12 +1,12 @@ 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" ) type ScaleCommand struct { diff --git a/command/v7/scale_command_test.go b/command/v7/scale_command_test.go index 9689ce642ce..28cff54d0ce 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 9d42e93b982..c7c71a8b3ab 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/util/ui" ) type SecurityGroupCommand struct { diff --git a/command/v7/security_group_command_test.go b/command/v7/security_group_command_test.go index 8ed30098b11..eecb8100f1b 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 13c721da2cf..4355aa96be4 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/v7/util/ui" ) type SecurityGroupsCommand struct { diff --git a/command/v7/security_groups_command_test.go b/command/v7/security_groups_command_test.go index f7b894f47d5..eb259082f61 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 acf93097c33..32bf6413f8c 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/v7/util/ui" - "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command" ) type ServiceAccessCommand struct { diff --git a/command/v7/service_access_command_test.go b/command/v7/service_access_command_test.go index e42616db144..e652dfabce2 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 bbf5ae14b41..94920728387 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/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type ServiceBrokersCommand struct { diff --git a/command/v7/service_brokers_command_test.go b/command/v7/service_brokers_command_test.go index 1ba294149b0..1adcc7fe01c 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 b9304be32b9..66daaae2379 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/v7/command/flag" ) type SetDropletCommand struct { diff --git a/command/v7/set_droplet_command_test.go b/command/v7/set_droplet_command_test.go index d9311df1049..60832387fcf 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 0a3e739b30e..e28035fbdf7 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" ) type SetEnvCommand struct { diff --git a/command/v7/set_env_command_test.go b/command/v7/set_env_command_test.go index b3984847d4c..ce70db4c3b5 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 e66dc875b92..e0e5243715c 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/v7/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 8fa4dd85d07..877537b76a4 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 abce36c14d4..f467a2f7ef9 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/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 7f730ce581b..9c58c6ce7b1 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/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 df6b1342736..6b28a6d8395 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/v7/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 9246e0df74c..1451927db12 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/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 4d8734b0b39..b2ef3da5132 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/v7/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 7daef819009..15b8fb67a5d 100644 --- a/command/v7/set_org_quota_command_test.go +++ b/command/v7/set_org_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/resources" - "code.cloudfoundry.org/cli/util/ui" - - . "code.cloudfoundry.org/cli/command/v7" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" + + . "code.cloudfoundry.org/cli/v7/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 9756681e14a..63775e58a41 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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 02fa8e97853..958669e8f9f 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/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 b2b93d806fe..edddd3ff35a 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 9bbe8421dc7..71043793bcb 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 fa42aa98eea..65d407fec1a 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/v7/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 18e2282a704..27397e6f1da 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 90a36af8e77..b5ae37c540d 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/v7/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 4d2fa053149..ac77decfbbd 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" + + . "code.cloudfoundry.org/cli/v7/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 b3ff564cbc8..6ae443912fe 100644 --- a/command/v7/set_space_role_command.go +++ b/command/v7/set_space_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/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 13c5d522c07..febe4c6a71a 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/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 84a6bac78f8..6af2fe82747 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 725a4c6b659..443f99b3b94 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 66bb9c95b9f..b458d0380a9 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/v7/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 c3c17ab328c..adc04180fb8 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/shared/app_stager.go b/command/v7/shared/app_stager.go index b5d231e2be3..4e3bdb35440 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" ) /* diff --git a/command/v7/shared/app_stager_test.go b/command/v7/shared/app_stager_test.go index ad62b2acd34..5056f954f84 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 38978ee148d..fee308a946d 100644 --- a/command/v7/shared/app_summary_displayer.go +++ b/command/v7/shared/app_summary_displayer.go @@ -6,11 +6,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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 f4891cc5c30..fcda527f1d0 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + . "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/new_clients.go b/command/v7/shared/new_clients.go index ea04b5bf647..0fabb3da2a0 100644 --- a/command/v7/shared/new_clients.go +++ b/command/v7/shared/new_clients.go @@ -1,14 +1,14 @@ package shared import ( - "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/v7/api/cloudcontroller/ccv3" + ccWrapper "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/api/router" + routingWrapper "code.cloudfoundry.org/cli/v7/api/router/wrapper" + "code.cloudfoundry.org/cli/v7/api/uaa" + uaaWrapper "code.cloudfoundry.org/cli/v7/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/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 035c66a1032..b9b282e1879 100644 --- a/command/v7/shared/new_clients_test.go +++ b/command/v7/shared/new_clients_test.go @@ -5,11 +5,11 @@ import ( "runtime" "time" - "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/shared" - "code.cloudfoundry.org/cli/util/ui" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/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 24057e3df88..069ab9349f3 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/v7/api/uaa" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/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 b9e0c344c18..c92998665f3 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/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/util/ui" - "code.cloudfoundry.org/cli/api/uaa" + "code.cloudfoundry.org/cli/v7/api/uaa" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -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() { diff --git a/command/v7/shared/package_displayer.go b/command/v7/shared/package_displayer.go index 73ed36df804..fc1c757408f 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/v7/command" ) type PackageDisplayer struct { diff --git a/command/v7/shared/quota_displayer.go b/command/v7/shared/quota_displayer.go index d209223b18c..17db1984a78 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/v7/command" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/ui" ) const ( diff --git a/command/v7/shared/sharedfakes/fake_app_stager.go b/command/v7/shared/sharedfakes/fake_app_stager.go index 39ba63146d4..26066058674 100644 --- a/command/v7/shared/sharedfakes/fake_app_stager.go +++ b/command/v7/shared/sharedfakes/fake_app_stager.go @@ -4,10 +4,10 @@ package sharedfakes import ( "sync" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command/v7/shared" - "code.cloudfoundry.org/cli/resources" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type FakeAppStager struct { diff --git a/command/v7/shared/v3_poll_stage.go b/command/v7/shared/v3_poll_stage.go index 1c48365d620..267f7b3d5c3 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/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 01483fbcef2..b71c5cea78f 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + . "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/shared/version_checker_test.go b/command/v7/shared/version_checker_test.go index 702972e2589..743ef610924 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/v7/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 3fbc2b42c9a..10d8891111d 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type SpaceCommand struct { diff --git a/command/v7/space_command_test.go b/command/v7/space_command_test.go index d350ab2883d..de4e224fd8a 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 81b3d6188f7..34a88bb6b9f 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" ) type SpaceQuotaCommand struct { diff --git a/command/v7/space_quota_command_test.go b/command/v7/space_quota_command_test.go index 50ded6bac30..85097947c26 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 addfd2b44ec..034a9efb9f1 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/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" ) type SpaceQuotasCommand struct { diff --git a/command/v7/space_quotas_command_test.go b/command/v7/space_quotas_command_test.go index 9b388d75082..5bbb91a74cc 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 eabef97c5ad..8157963bcc2 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 ba208d631f9..8e756a33891 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 9ab01a0c8cc..894edbd8100 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" ) type SpaceUsersCommand struct { diff --git a/command/v7/space_users_command_test.go b/command/v7/space_users_command_test.go index 809d9ab32fd..34faddaf6c5 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 b3db2a42e2c..022c2702e47 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/v7/resources" + "code.cloudfoundry.org/cli/v7/util/ui" ) type SpacesCommand struct { diff --git a/command/v7/spaces_command_test.go b/command/v7/spaces_command_test.go index e456754e796..2074b679b87 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 46dcf5fe599..ab9a818000d 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 c9caf5d2f64..29dd12b434d 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 556e25662e6..a692f28a50c 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 9ddf1a9f15d..58bdfb1c843 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/v7/command/flag" ) type SSHEnabledCommand struct { diff --git a/command/v7/ssh_enabled_command_test.go b/command/v7/ssh_enabled_command_test.go index 794d61b42bb..abd3e4860a3 100644 --- a/command/v7/ssh_enabled_command_test.go +++ b/command/v7/ssh_enabled_command_test.go @@ -3,12 +3,12 @@ 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/ui" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 bb10ffd456b..993fe566074 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/resources" ) type StackCommand struct { diff --git a/command/v7/stack_command_test.go b/command/v7/stack_command_test.go index 3cbc36d577f..1e006c800f9 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/resources" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 ea91ef5c3a9..5e08f624f03 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/v7/resources" + "code.cloudfoundry.org/cli/v7/util/sorting" + "code.cloudfoundry.org/cli/v7/util/ui" ) type StacksCommand struct { diff --git a/command/v7/stacks_command_test.go b/command/v7/stacks_command_test.go index 502f0106730..e314eb81f31 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 0ef71036364..db76084ace4 100644 --- a/command/v7/stage_package_command.go +++ b/command/v7/stage_package_command.go @@ -4,11 +4,11 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/actor/sharedaction" - "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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" + "code.cloudfoundry.org/cli/v7/resources" ) type StagePackageCommand struct { diff --git a/command/v7/stage_package_command_test.go b/command/v7/stage_package_command_test.go index 7fbed642af2..6978c53b6d0 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 bcfea5b9d9a..e024cb5d578 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 ee64c2dc12c..c1ec66adefc 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 f9cb0137f15..607336b12f7 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/v7/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 9fd964a076d..042a6c977c1 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 2dec5b583c1..028ccc8808d 100644 --- a/command/v7/start_command.go +++ b/command/v7/start_command.go @@ -1,11 +1,11 @@ package v7 import ( - "code.cloudfoundry.org/cli/actor/sharedaction" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/command" - "code.cloudfoundry.org/cli/command/flag" - "code.cloudfoundry.org/cli/command/v7/shared" + "code.cloudfoundry.org/cli/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/shared" ) type StartCommand struct { diff --git a/command/v7/start_command_test.go b/command/v7/start_command_test.go index beb2e78604c..b876f03a03d 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/sharedaction/sharedactionfakes" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/shared/sharedfakes" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 c7ee62b5809..006524bdc41 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/v7/command/flag" ) type StopCommand struct { diff --git a/command/v7/stop_command_test.go b/command/v7/stop_command_test.go index 34ae288038e..796a512c3e9 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 5ac84889c70..2f36bfae26d 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" ) type TargetCommand struct { diff --git a/command/v7/target_command_test.go b/command/v7/target_command_test.go index f727241dabc..7cdbf6d82a8 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/v7/actor/v7action" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 2a8e49dd00f..3c6591f9f2f 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/util/ui" ) type TasksCommand struct { diff --git a/command/v7/tasks_command_test.go b/command/v7/tasks_command_test.go index e051bac2730..971d6cd5e92 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 b1b2cd5bc11..7150077ecbc 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) type TerminateTaskCommand struct { diff --git a/command/v7/terminate_task_command_test.go b/command/v7/terminate_task_command_test.go index b890c42f546..947b6d7b778 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 f7bc104d7c7..4447251c4a6 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 ab41192c5fd..2a581778b09 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/flag" ) type UnbindRunningSecurityGroupCommand struct { diff --git a/command/v7/unbind_security_group.go b/command/v7/unbind_security_group.go index 1bc26de31c3..544b8ca8883 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/flag" ) type UnbindSecurityGroupCommand struct { diff --git a/command/v7/unbind_security_group_test.go b/command/v7/unbind_security_group_test.go index 586704ec87f..510d2f15d67 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 097cf274795..d6a417f5806 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 bc9b37b2ea3..22854c4cc79 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 2f1c2e4157d..9702d2ec5ee 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type UnmapRouteCommand struct { diff --git a/command/v7/unmap_route_command_test.go b/command/v7/unmap_route_command_test.go index ca068d06c40..4d036b13da4 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 e1c4e1224ac..280fe1095c8 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/flag" ) type UnsetEnvCommand struct { diff --git a/command/v7/unset_env_command_test.go b/command/v7/unset_env_command_test.go index f1eae3c9114..9ed70cf74a2 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 029d8a4a716..b7fb6fcf7a8 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/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 09e5f7ddae2..143a740326d 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/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/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 c77cf45706b..4dd2ae9dd57 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 228c8ae22ee..3e68c7e91d8 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/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 c5ac052ad6a..1d120b9beb4 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/v7/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 6260893ff41..326622b1e3e 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" + + . "code.cloudfoundry.org/cli/v7/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 51b56556dc5..d742fe75cbc 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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 e2d532887ee..3920321c771 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + + "code.cloudfoundry.org/cli/v7/command/commandfakes" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/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 69cfccb1f89..645f8afd451 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/v7/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 5fb36287bc4..74e3e12f750 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + + "code.cloudfoundry.org/cli/v7/util/ui" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/command/v7/update_buildpack_command.go b/command/v7/update_buildpack_command.go index 5c0ca66e7d9..a34412b08a5 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/download" ) type UpdateBuildpackActor interface { diff --git a/command/v7/update_buildpack_command_test.go b/command/v7/update_buildpack_command_test.go index 9e749f80407..c114f0cf907 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccerror" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" + + "code.cloudfoundry.org/cli/v7/command/translatableerror" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + . "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 cc188b329a4..0eab36dc71a 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 cdd2138f876..54ec27e7ec1 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/v7/command/translatableerror" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 2b75d2244bf..797a5503365 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/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 79214391237..472c1ca7f01 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 ad39ad1393c..97f982e7c8d 100644 --- a/command/v7/update_service_broker_command.go +++ b/command/v7/update_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/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 5e147469ec4..f434af9d566 100644 --- a/command/v7/update_service_broker_command_test.go +++ b/command/v7/update_service_broker_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" - 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/cf/errors" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 d5e30b1fc5a..1a1d003d54b 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/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 ba8c14741f9..61378fba261 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/v7/command/translatableerror" + + "code.cloudfoundry.org/cli/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/command/commandfakes" + "code.cloudfoundry.org/cli/v7/command/flag" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/command/v7/v7fakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 f582d4e04c3..51b6d7facef 100644 --- a/command/v7/v7fakes/fake_actor.go +++ b/command/v7/v7fakes/fake_actor.go @@ -7,15 +7,15 @@ 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + constanta "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/api/uaa/constant" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/types" "github.com/SermoDigital/jose/jwt" ) diff --git a/command/v7/v7fakes/fake_actor_reloader.go b/command/v7/v7fakes/fake_actor_reloader.go index f5397aaae12..e1255ff3209 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/v7/command" + v7 "code.cloudfoundry.org/cli/v7/command/v7" ) type FakeActorReloader struct { diff --git a/command/v7/v7fakes/fake_label_setter.go b/command/v7/v7fakes/fake_label_setter.go index 21b6cea3a98..02e22a142fb 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/v7/command/v7" + "code.cloudfoundry.org/cli/v7/types" ) type FakeLabelSetter struct { diff --git a/command/v7/v7fakes/fake_label_unsetter.go b/command/v7/v7fakes/fake_label_unsetter.go index 6b57278a967..2d90489126e 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/v7/command/v7" + "code.cloudfoundry.org/cli/v7/types" ) type FakeLabelUnsetter struct { diff --git a/command/v7/v7fakes/fake_manifest_locator.go b/command/v7/v7fakes/fake_manifest_locator.go index abbbbcfaf48..bfc0b61fc80 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/v7/command/v7" ) type FakeManifestLocator struct { diff --git a/command/v7/v7fakes/fake_manifest_parser.go b/command/v7/v7fakes/fake_manifest_parser.go index 75d2df1ee05..13f65af079f 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/v7/command/v7" + "code.cloudfoundry.org/cli/v7/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 79857f0c170..211c3aee628 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/v7/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v7/command/v7" ) type FakeNetworkPoliciesActor struct { diff --git a/command/v7/v7fakes/fake_networking_actor.go b/command/v7/v7fakes/fake_networking_actor.go index bb42ffac9b5..26c2fd5df7b 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/v7/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v7/command/v7" ) type FakeNetworkingActor struct { diff --git a/command/v7/v7fakes/fake_progress_bar.go b/command/v7/v7fakes/fake_progress_bar.go index 9c40495632c..6c09fcc1cf2 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/v7/command/v7" ) type FakeProgressBar struct { diff --git a/command/v7/v7fakes/fake_push_actor.go b/command/v7/v7fakes/fake_push_actor.go index 95c137b77ba..311cd4e267b 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/v7/actor/v7action" + "code.cloudfoundry.org/cli/v7/actor/v7pushaction" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/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 b2ed7ded2e3..5730fd5e306 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/v7/actor/cfnetworkingaction" + v7 "code.cloudfoundry.org/cli/v7/command/v7" ) type FakeRemoveNetworkPolicyActor struct { diff --git a/command/v7/v7fakes/fake_revisions_actor.go b/command/v7/v7fakes/fake_revisions_actor.go index 6db96cce2c0..fe3ea6c5287 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/v7/actor/v7action" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/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 8e31531fb4b..d5d4e4357c8 100644 --- a/command/v7/v7fakes/fake_set_label_actor.go +++ b/command/v7/v7fakes/fake_set_label_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/types" + "code.cloudfoundry.org/cli/v7/actor/v7action" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/types" ) type FakeSetLabelActor struct { diff --git a/command/v7/v7fakes/fake_shared_sshactor.go b/command/v7/v7fakes/fake_shared_sshactor.go index 0ddf9c40d68..76c98ae6491 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/v7/actor/sharedaction" + v7 "code.cloudfoundry.org/cli/v7/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 e0005d0483d..a7feb17cb28 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/v7/actor/sharedaction" + "code.cloudfoundry.org/cli/v7/actor/v7action" + v7 "code.cloudfoundry.org/cli/v7/command/v7" + "code.cloudfoundry.org/cli/v7/resources" ) type FakeV7ActorForPush struct { diff --git a/fixtures/plugins/alias_conflicts.go b/fixtures/plugins/alias_conflicts.go index 3ac44ff67d1..352d70b851f 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/v7/plugin" ) type AliasConflicts struct { diff --git a/fixtures/plugins/call_core_cmd.go b/fixtures/plugins/call_core_cmd.go index 6027c0c3a3c..6596fbcd1e8 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/v7/plugin" ) type CoreCmd struct{} diff --git a/fixtures/plugins/empty_plugin.go b/fixtures/plugins/empty_plugin.go index e7d6f971e99..176d612f926 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/v7/plugin" type EmptyPlugin struct{} diff --git a/fixtures/plugins/input.go b/fixtures/plugins/input.go index cefcd4232e5..92d93fd54f5 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/v7/plugin" ) type Input struct { diff --git a/fixtures/plugins/my_say.go b/fixtures/plugins/my_say.go index 1859ccd4236..46bdd7ac529 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/v7/plugin" ) type MySay struct { diff --git a/fixtures/plugins/panics.go b/fixtures/plugins/panics.go index bb76c2a9c7e..203b5f8e466 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/v7/plugin" ) type Panics struct { diff --git a/fixtures/plugins/test_1.go b/fixtures/plugins/test_1.go index 2d57bf235c5..133cc8650e9 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/v7/plugin" ) type Test1 struct { diff --git a/fixtures/plugins/test_2.go b/fixtures/plugins/test_2.go index 3e8abdd5739..1039aeb0713 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/v7/plugin" ) type Test2 struct{} diff --git a/fixtures/plugins/test_with_help.go b/fixtures/plugins/test_with_help.go index a5479d68764..280675f09f5 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/v7/plugin" ) type TestWithHelp struct { diff --git a/fixtures/plugins/test_with_orgs.go b/fixtures/plugins/test_with_orgs.go index 0c34ce337a9..9646162c249 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/v7/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 2f083b77928..57de2e674fa 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/v7/plugin" ) type TestWithOrgsShortName struct { diff --git a/fixtures/plugins/test_with_push.go b/fixtures/plugins/test_with_push.go index b9ab37900a2..62952a510da 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/v7/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 9466fc94bb4..167493e8693 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/v7/plugin" ) type TestWithPushShortName struct { diff --git a/go.mod b/go.mod index 5996853e50c..aac956d4aa0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.cloudfoundry.org/cli +module code.cloudfoundry.org/cli/v7 go 1.23.1 @@ -50,6 +50,7 @@ require ( ) require ( + code.cloudfoundry.org/cli v7.1.0+incompatible // indirect code.cloudfoundry.org/inigo v0.0.0-20230612153013-b300679e6ed6 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/bmatcuk/doublestar v1.3.4 // indirect diff --git a/go.sum b/go.sum index 79d5dfaf55d..9bc6c81f45b 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-20240701140235-0ab1c0e216c8 h1:U9t+5gylASZzKYjaLhW4azDnGvSH4GKVhmWoMAbaLRo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20240701140235-0ab1c0e216c8/go.mod h1:cf3zRgfxIBUHx8FmX9SgiQ0QWVxRsH+begnYUdigZag= code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 h1:O+j8afQWaDuxzKGcculsjgHGK+biBTn6iMjgFpBf54c= diff --git a/i18n/resources/README.md b/i18n/resources/README.md index e2cfa233ddd..34bc7e4da81 100644 --- a/i18n/resources/README.md +++ b/i18n/resources/README.md @@ -3,6 +3,6 @@ This directory will get populated by the pipeline during the `build-binaries` jo ## How this file was generated ``` -$ cd code.cloudfoundry.org/cli/i18n +$ cd code.cloudfoundry.org/cli/v7/i18n $ go-bindata -nometadata -pkg resources -ignore ".go" -o resources/i18n_resources.go resources/*.all.json ``` diff --git a/integration/README.md b/integration/README.md index 6de6c90a319..f50d46c68c5 100644 --- a/integration/README.md +++ b/integration/README.md @@ -7,8 +7,8 @@ These are high-level tests for the CLI that make assertions about the behavior o On most systems `cf` points to an installed version. To test the latest source (most likely source that you're changing), ensure the dev `cf` binary is in your `PATH`: ``` -[[ `which cf` = *"$GOPATH/src/code.cloudfoundry.org/cli/out"* ]] || - export PATH="$GOPATH/src/code.cloudfoundry.org/cli/out:$PATH" +[[ `which cf` = *"$GOPATH/src/code.cloudfoundry.org/cli/v7/out"* ]] || + export PATH="$GOPATH/src/code.cloudfoundry.org/cli/v7/out:$PATH" ``` You'll also need to rebuild `cf` after making any relevant changes to the source: diff --git a/integration/assets/configurable_plugin/test_plugin.go b/integration/assets/configurable_plugin/test_plugin.go index 428ef6763cd..10ac3ef9341 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/v7/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 7342ae5a34c..aa53cedcb19 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/v7/plugin" "github.com/blang/semver/v4" ) diff --git a/integration/assets/test_plugin/test_plugin.go b/integration/assets/test_plugin/test_plugin.go index e6182cf10e2..5f8304743c5 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/v7/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 14ea6c61ee6..4afacc57bee 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/v7/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 a3c20408b5c..2eb7efc93ca 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/v7/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 c8e96c48ca4..777ca04c64c 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/v7/plugin" type TestPluginWithPanic struct { } diff --git a/integration/helpers/app_instance_table_test.go b/integration/helpers/app_instance_table_test.go index 48b86eac86e..a93c8041c62 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/v7/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 facc0321d60..befe015c7b8 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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/helpers/client.go b/integration/helpers/client.go index 79ceeb88015..27d7d3b412b 100644 --- a/integration/helpers/client.go +++ b/integration/helpers/client.go @@ -1,12 +1,12 @@ package helpers import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - ccWrapper "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - "code.cloudfoundry.org/cli/api/uaa" - uaaWrapper "code.cloudfoundry.org/cli/api/uaa/wrapper" - "code.cloudfoundry.org/cli/command/translatableerror" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + ccWrapper "code.cloudfoundry.org/cli/v7/api/cloudcontroller/wrapper" + "code.cloudfoundry.org/cli/v7/api/uaa" + uaaWrapper "code.cloudfoundry.org/cli/v7/api/uaa/wrapper" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" ) // CreateCCV2Client constructs a client object able to communicate with the diff --git a/integration/helpers/commonisolated/common_isolated_setup.go b/integration/helpers/commonisolated/common_isolated_setup.go index 0f071c7d028..b4888df6ce4 100644 --- a/integration/helpers/commonisolated/common_isolated_setup.go +++ b/integration/helpers/commonisolated/common_isolated_setup.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/config.go b/integration/helpers/config.go index a7d63dcc781..39eadb899aa 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/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/helpers/plugin.go b/integration/helpers/plugin.go index 2f8b1e617ac..a4b038a4add 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/v7/integration/assets/%s", pluginType), "-o", name, "-ldflags", diff --git a/integration/helpers/plugin_repo.go b/integration/helpers/plugin_repo.go index 105d77e4c52..71cecd813aa 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/v7/util" + "code.cloudfoundry.org/cli/v7/util/generic" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/integration/helpers/route.go b/integration/helpers/route.go index d9ad43c9b12..937bfb8e81e 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/v7/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 3e6dc0903a4..166ae0c2bdd 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/v7/resources" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/service_binding.go b/integration/helpers/service_binding.go index 6c2717831c7..21a054efbbf 100644 --- a/integration/helpers/service_binding.go +++ b/integration/helpers/service_binding.go @@ -3,8 +3,8 @@ package helpers import ( "time" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv2/constant" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/api.go b/integration/helpers/servicebrokerstub/api.go index 647a143b2ca..47700cf918e 100644 --- a/integration/helpers/servicebrokerstub/api.go +++ b/integration/helpers/servicebrokerstub/api.go @@ -3,7 +3,7 @@ package servicebrokerstub import ( "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" ) diff --git a/integration/helpers/servicebrokerstub/app_config.go b/integration/helpers/servicebrokerstub/app_config.go index d12adba175c..08f62acc2cc 100644 --- a/integration/helpers/servicebrokerstub/app_config.go +++ b/integration/helpers/servicebrokerstub/app_config.go @@ -8,8 +8,7 @@ import ( "net/http" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/gomega" + "code.cloudfoundry.org/cli/v7/integration/helpers" ) func newDefaultConfig() *ServiceBrokerStub { diff --git a/integration/helpers/servicebrokerstub/app_deploy.go b/integration/helpers/servicebrokerstub/app_deploy.go index 1612868ec5c..709fdc31478 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/v7/integration/helpers" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/cf.go b/integration/helpers/servicebrokerstub/cf.go index a46f1179b28..aaaab079902 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/v7/integration/helpers" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/version.go b/integration/helpers/version.go index 485913db015..0f2660de804 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/v7/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 4e819c02d36..c02079f58dc 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/v7/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 d049a732d40..2349f56aa85 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/v7/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 7ccd5fa7d18..69a0d254b01 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/v7/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 612822bd839..a489d9dc755 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/v7/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 68167ac179d..7979f8e5620 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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/shared/isolated/auth_command_test.go b/integration/shared/isolated/auth_command_test.go index 8229bb140b1..de043e602f7 100644 --- a/integration/shared/isolated/auth_command_test.go +++ b/integration/shared/isolated/auth_command_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/api/uaa/uaaversion" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/api/uaa/uaaversion" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "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 324989d6b15..d45e84c2f76 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/v7/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 3539a6a7c6e..39785abd752 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/v7/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 7b5c8afd1aa..c2162a90d35 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/v7/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 8a01781a206..3abf38f0af2 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/v7/integration/helpers/commonisolated" ) var ( diff --git a/integration/shared/isolated/logs_command_test.go b/integration/shared/isolated/logs_command_test.go index d250756a1d9..030b26f4916 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/v7/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 0e801ea7886..d154fb2ad48 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/v7/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 2fca098d47a..96e58a9bc2d 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/v7/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 35da3f34c1a..3ee221bcf5c 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/v7/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 f9b0cad5084..a88e774aa6c 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/v7/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 41f9ec43d96..d3766900694 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/v7/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 8b2b4a56dde..664aad6aa6a 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/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 aa8b37bb8d7..749b05e20fb 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/v7/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 db0da47d6c0..a96ba55fb34 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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/v7/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/v7/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/v7/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 4deae1aaed2..6b90aea83fa 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/v7/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 15d707292ac..5b4a048a3fc 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 fd7df06f8e3..e868d6c9fab 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/v7/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 4411dd6fe7d..8d97157b232 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/v7/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/v7/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/v7/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/v7/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 f02ce4f7c8d..db303b4e1f8 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 0f2bc869334..bf6abb51034 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/v7/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 f937e9e842d..c97f0420f8b 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 7458c325f6f..afe1a9d0c56 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/experimental_suite_test.go b/integration/v6/experimental/experimental_suite_test.go index d3fdc585d3b..9f62be83c98 100644 --- a/integration/v6/experimental/experimental_suite_test.go +++ b/integration/v6/experimental/experimental_suite_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v6/experimental/v3_apply_manifest_command_test.go b/integration/v6/experimental/v3_apply_manifest_command_test.go index b27de197053..387719c2c36 100644 --- a/integration/v6/experimental/v3_apply_manifest_command_test.go +++ b/integration/v6/experimental/v3_apply_manifest_command_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_apps_command_test.go b/integration/v6/experimental/v3_apps_command_test.go index ceacb57520c..9b5895ac639 100644 --- a/integration/v6/experimental/v3_apps_command_test.go +++ b/integration/v6/experimental/v3_apps_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_cancel_zdt_push_test.go b/integration/v6/experimental/v3_cancel_zdt_push_test.go index 4c589f6808f..6894d74b81a 100644 --- a/integration/v6/experimental/v3_cancel_zdt_push_test.go +++ b/integration/v6/experimental/v3_cancel_zdt_push_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_create_app_command_test.go b/integration/v6/experimental/v3_create_app_command_test.go index 02e3d19cee9..1286eabc6df 100644 --- a/integration/v6/experimental/v3_create_app_command_test.go +++ b/integration/v6/experimental/v3_create_app_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_create_package_cfignore_test.go b/integration/v6/experimental/v3_create_package_cfignore_test.go index c15a8ecc8b4..641d2614d6b 100644 --- a/integration/v6/experimental/v3_create_package_cfignore_test.go +++ b/integration/v6/experimental/v3_create_package_cfignore_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_create_package_command_test.go b/integration/v6/experimental/v3_create_package_command_test.go index d76680f40a3..79413e36773 100644 --- a/integration/v6/experimental/v3_create_package_command_test.go +++ b/integration/v6/experimental/v3_create_package_command_test.go @@ -4,7 +4,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_delete_command_test.go b/integration/v6/experimental/v3_delete_command_test.go index 31a1c61fe7b..22d6df2fa40 100644 --- a/integration/v6/experimental/v3_delete_command_test.go +++ b/integration/v6/experimental/v3_delete_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_droplets_command_test.go b/integration/v6/experimental/v3_droplets_command_test.go index 8df79507ec0..52989c6331f 100644 --- a/integration/v6/experimental/v3_droplets_command_test.go +++ b/integration/v6/experimental/v3_droplets_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_env_command_test.go b/integration/v6/experimental/v3_env_command_test.go index f06f3586773..9202290309c 100644 --- a/integration/v6/experimental/v3_env_command_test.go +++ b/integration/v6/experimental/v3_env_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_get_health_check_command_test.go b/integration/v6/experimental/v3_get_health_check_command_test.go index 56e3b6db044..bd7ac38ca10 100644 --- a/integration/v6/experimental/v3_get_health_check_command_test.go +++ b/integration/v6/experimental/v3_get_health_check_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_packages_command_test.go b/integration/v6/experimental/v3_packages_command_test.go index fc25187eef0..8c34bb68b65 100644 --- a/integration/v6/experimental/v3_packages_command_test.go +++ b/integration/v6/experimental/v3_packages_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_push_cfignore_test.go b/integration/v6/experimental/v3_push_cfignore_test.go index 8f3844c8e95..9fb8bf7f882 100644 --- a/integration/v6/experimental/v3_push_cfignore_test.go +++ b/integration/v6/experimental/v3_push_cfignore_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_push_command_test.go b/integration/v6/experimental/v3_push_command_test.go index 1587ae34247..cadcc4aaa0d 100644 --- a/integration/v6/experimental/v3_push_command_test.go +++ b/integration/v6/experimental/v3_push_command_test.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_push_no_start_test.go b/integration/v6/experimental/v3_push_no_start_test.go index 5d70f179342..629f470292f 100644 --- a/integration/v6/experimental/v3_push_no_start_test.go +++ b/integration/v6/experimental/v3_push_no_start_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_restart_app_instance_command_test.go b/integration/v6/experimental/v3_restart_app_instance_command_test.go index 776874970e9..f68ba61ab6c 100644 --- a/integration/v6/experimental/v3_restart_app_instance_command_test.go +++ b/integration/v6/experimental/v3_restart_app_instance_command_test.go @@ -3,8 +3,8 @@ package experimental import ( "fmt" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_restart_command_test.go b/integration/v6/experimental/v3_restart_command_test.go index 7a940b51ec7..ddb4b851e5a 100644 --- a/integration/v6/experimental/v3_restart_command_test.go +++ b/integration/v6/experimental/v3_restart_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_scale_command_test.go b/integration/v6/experimental/v3_scale_command_test.go index d02c09014e0..5b62d65272f 100644 --- a/integration/v6/experimental/v3_scale_command_test.go +++ b/integration/v6/experimental/v3_scale_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_set_droplet_command_test.go b/integration/v6/experimental/v3_set_droplet_command_test.go index e27555ea12b..e87cccab014 100644 --- a/integration/v6/experimental/v3_set_droplet_command_test.go +++ b/integration/v6/experimental/v3_set_droplet_command_test.go @@ -3,7 +3,7 @@ package experimental import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_set_env_command_test.go b/integration/v6/experimental/v3_set_env_command_test.go index 215f79d9fe2..2f9d5938343 100644 --- a/integration/v6/experimental/v3_set_env_command_test.go +++ b/integration/v6/experimental/v3_set_env_command_test.go @@ -3,7 +3,7 @@ package experimental import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_set_health_check_command_test.go b/integration/v6/experimental/v3_set_health_check_command_test.go index e39657a8aa2..636279ec8ba 100644 --- a/integration/v6/experimental/v3_set_health_check_command_test.go +++ b/integration/v6/experimental/v3_set_health_check_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_ssh_command_test.go b/integration/v6/experimental/v3_ssh_command_test.go index d5bfd8d1e9f..155e55fa445 100644 --- a/integration/v6/experimental/v3_ssh_command_test.go +++ b/integration/v6/experimental/v3_ssh_command_test.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_stage_command_test.go b/integration/v6/experimental/v3_stage_command_test.go index 40b3270340a..6b069fe7e73 100644 --- a/integration/v6/experimental/v3_stage_command_test.go +++ b/integration/v6/experimental/v3_stage_command_test.go @@ -3,7 +3,7 @@ package experimental import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_start_command_test.go b/integration/v6/experimental/v3_start_command_test.go index 671290ea43a..827ea11992f 100644 --- a/integration/v6/experimental/v3_start_command_test.go +++ b/integration/v6/experimental/v3_start_command_test.go @@ -3,7 +3,7 @@ package experimental import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_stop_application_command_test.go b/integration/v6/experimental/v3_stop_application_command_test.go index 98309fdc273..1e37f0263d0 100644 --- a/integration/v6/experimental/v3_stop_application_command_test.go +++ b/integration/v6/experimental/v3_stop_application_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_unset_env_command_test.go b/integration/v6/experimental/v3_unset_env_command_test.go index 85bb515a330..bd0e2a756e1 100644 --- a/integration/v6/experimental/v3_unset_env_command_test.go +++ b/integration/v6/experimental/v3_unset_env_command_test.go @@ -3,7 +3,7 @@ package experimental import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_zdt_push_command_test.go b/integration/v6/experimental/v3_zdt_push_command_test.go index 569dfd85b5f..267dc0f6897 100644 --- a/integration/v6/experimental/v3_zdt_push_command_test.go +++ b/integration/v6/experimental/v3_zdt_push_command_test.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/experimental/v3_zdt_restart_command_test.go b/integration/v6/experimental/v3_zdt_restart_command_test.go index 76030b4a4c0..ce58706d957 100644 --- a/integration/v6/experimental/v3_zdt_restart_command_test.go +++ b/integration/v6/experimental/v3_zdt_restart_command_test.go @@ -1,7 +1,7 @@ package experimental import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/bind_staging_security_group_command_test.go b/integration/v6/global/bind_staging_security_group_command_test.go index c025ebb103c..c2f86a8bb34 100644 --- a/integration/v6/global/bind_staging_security_group_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/buildpacks_command_test.go b/integration/v6/global/buildpacks_command_test.go index 0ab7e9e2881..d13f92cbef2 100644 --- a/integration/v6/global/buildpacks_command_test.go +++ b/integration/v6/global/buildpacks_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/create_buildpack_command_test.go b/integration/v6/global/create_buildpack_command_test.go index c57842457f4..5ca93ee3fb7 100644 --- a/integration/v6/global/create_buildpack_command_test.go +++ b/integration/v6/global/create_buildpack_command_test.go @@ -7,7 +7,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/delete_buildpack_command_test.go b/integration/v6/global/delete_buildpack_command_test.go index a246ef0e78f..2dbe75ef8a5 100644 --- a/integration/v6/global/delete_buildpack_command_test.go +++ b/integration/v6/global/delete_buildpack_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/disable_feature_flags_command_test.go b/integration/v6/global/disable_feature_flags_command_test.go index 5b188d72289..36619defd4d 100644 --- a/integration/v6/global/disable_feature_flags_command_test.go +++ b/integration/v6/global/disable_feature_flags_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/enable_feature_flags_command_test.go b/integration/v6/global/enable_feature_flags_command_test.go index 1b4ed1003c4..875df72db49 100644 --- a/integration/v6/global/enable_feature_flags_command_test.go +++ b/integration/v6/global/enable_feature_flags_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/env_command_test.go b/integration/v6/global/env_command_test.go index 7280d32f053..74fae8596fb 100644 --- a/integration/v6/global/env_command_test.go +++ b/integration/v6/global/env_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "math/rand" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/feature_flags_command_test.go b/integration/v6/global/feature_flags_command_test.go index d0416d40c5a..f92f6e925c5 100644 --- a/integration/v6/global/feature_flags_command_test.go +++ b/integration/v6/global/feature_flags_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/global_suite_test.go b/integration/v6/global/global_suite_test.go index 04e8be3c60b..faab7cdc479 100644 --- a/integration/v6/global/global_suite_test.go +++ b/integration/v6/global/global_suite_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/global/quota_command_test.go b/integration/v6/global/quota_command_test.go index d77413f1d29..3d74aa01529 100644 --- a/integration/v6/global/quota_command_test.go +++ b/integration/v6/global/quota_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/quotas_command_test.go b/integration/v6/global/quotas_command_test.go index 15010d86856..71e1930a9e4 100644 --- a/integration/v6/global/quotas_command_test.go +++ b/integration/v6/global/quotas_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/rename_buildpack_command_test.go b/integration/v6/global/rename_buildpack_command_test.go index 2568f34adc4..2d69e2963d6 100644 --- a/integration/v6/global/rename_buildpack_command_test.go +++ b/integration/v6/global/rename_buildpack_command_test.go @@ -1,7 +1,7 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -219,7 +219,7 @@ var _ = Describe("rename buildpack command", func() { }) }) - //If the user does not provide a stack, and there are multiple ambiguous buildpacks, we assume that they intended to rename the one with an empty stack. + // If the user does not provide a stack, and there are multiple ambiguous buildpacks, we assume that they intended to rename the one with an empty stack. When("the user does not provide a stack", func() { var session *Session diff --git a/integration/v6/global/set_org_role_command_test.go b/integration/v6/global/set_org_role_command_test.go index 4682993512a..62af3d44f50 100644 --- a/integration/v6/global/set_org_role_command_test.go +++ b/integration/v6/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/v7/integration/helpers" ) var _ = Describe("set-org-role command", func() { diff --git a/integration/v6/global/set_running_environment_variable_group_command_test.go b/integration/v6/global/set_running_environment_variable_group_command_test.go index 6241705147f..38671748880 100644 --- a/integration/v6/global/set_running_environment_variable_group_command_test.go +++ b/integration/v6/global/set_running_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/set_space_role_command_test.go b/integration/v6/global/set_space_role_command_test.go index eb52522e483..0d8c958583d 100644 --- a/integration/v6/global/set_space_role_command_test.go +++ b/integration/v6/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/v7/integration/helpers" ) var _ = Describe("set-space-role command", func() { diff --git a/integration/v6/global/set_staging_environment_variable_group_command_test.go b/integration/v6/global/set_staging_environment_variable_group_command_test.go index 8dfa7aa20b6..74aa91ecbca 100644 --- a/integration/v6/global/set_staging_environment_variable_group_command_test.go +++ b/integration/v6/global/set_staging_environment_variable_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/global/update_buildpack_command_test.go b/integration/v6/global/update_buildpack_command_test.go index 09425c23a58..3a4c72a1ef5 100644 --- a/integration/v6/global/update_buildpack_command_test.go +++ b/integration/v6/global/update_buildpack_command_test.go @@ -7,7 +7,7 @@ import ( "os" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/add_network_policy_command_test.go b/integration/v6/isolated/add_network_policy_command_test.go index b8e33983cb3..2cf7f1a80f4 100644 --- a/integration/v6/isolated/add_network_policy_command_test.go +++ b/integration/v6/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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/api_command_test.go b/integration/v6/isolated/api_command_test.go index 792e0fc3eff..9c8067a4bab 100644 --- a/integration/v6/isolated/api_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/app_command_test.go b/integration/v6/isolated/app_command_test.go index fa45ad6791d..c7bb667350c 100644 --- a/integration/v6/isolated/app_command_test.go +++ b/integration/v6/isolated/app_command_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/bind_route_service_command_test.go b/integration/v6/isolated/bind_route_service_command_test.go index 685e3095e76..03f3679ac0d 100644 --- a/integration/v6/isolated/bind_route_service_command_test.go +++ b/integration/v6/isolated/bind_route_service_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/bind_running_security_group_command_test.go b/integration/v6/isolated/bind_running_security_group_command_test.go index 6f94a06440b..57735f20896 100644 --- a/integration/v6/isolated/bind_running_security_group_command_test.go +++ b/integration/v6/isolated/bind_running_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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/bind_security_group_command_test.go b/integration/v6/isolated/bind_security_group_command_test.go index f690e07a0ef..5ee6ecdd076 100644 --- a/integration/v6/isolated/bind_security_group_command_test.go +++ b/integration/v6/isolated/bind_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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/check_route_command_test.go b/integration/v6/isolated/check_route_command_test.go index d9e2ddb4bfb..658893b3590 100644 --- a/integration/v6/isolated/check_route_command_test.go +++ b/integration/v6/isolated/check_route_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/config_command_test.go b/integration/v6/isolated/config_command_test.go index 054af339e0e..c86c8806e32 100644 --- a/integration/v6/isolated/config_command_test.go +++ b/integration/v6/isolated/config_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/copy_source_command_test.go b/integration/v6/isolated/copy_source_command_test.go index c322926d3ad..9e6c3987dc8 100644 --- a/integration/v6/isolated/copy_source_command_test.go +++ b/integration/v6/isolated/copy_source_command_test.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_app_manifest_command_test.go b/integration/v6/isolated/create_app_manifest_command_test.go index f9964623b93..7e03059fb39 100644 --- a/integration/v6/isolated/create_app_manifest_command_test.go +++ b/integration/v6/isolated/create_app_manifest_command_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/manifest" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_isolation_segment_command_test.go b/integration/v6/isolated/create_isolation_segment_command_test.go index 2a73c0e05a9..371ae52159a 100644 --- a/integration/v6/isolated/create_isolation_segment_command_test.go +++ b/integration/v6/isolated/create_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_org_command_test.go b/integration/v6/isolated/create_org_command_test.go index 5f0d6883b12..e68fd30e944 100644 --- a/integration/v6/isolated/create_org_command_test.go +++ b/integration/v6/isolated/create_org_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_quota_command_test.go b/integration/v6/isolated/create_quota_command_test.go index ed3b78bb0e1..989ef81ead9 100644 --- a/integration/v6/isolated/create_quota_command_test.go +++ b/integration/v6/isolated/create_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_route_command_test.go b/integration/v6/isolated/create_route_command_test.go index 10e0188aef9..70c66f4d73f 100644 --- a/integration/v6/isolated/create_route_command_test.go +++ b/integration/v6/isolated/create_route_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_shared_domain_test.go b/integration/v6/isolated/create_shared_domain_test.go index a6364c8669b..13d47aebd7b 100644 --- a/integration/v6/isolated/create_shared_domain_test.go +++ b/integration/v6/isolated/create_shared_domain_test.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_space_command_test.go b/integration/v6/isolated/create_space_command_test.go index cacc62af86b..a7d53301973 100644 --- a/integration/v6/isolated/create_space_command_test.go +++ b/integration/v6/isolated/create_space_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_space_quota_command_test.go b/integration/v6/isolated/create_space_quota_command_test.go index ec7fbc5bee5..93877dceac6 100644 --- a/integration/v6/isolated/create_space_quota_command_test.go +++ b/integration/v6/isolated/create_space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/create_user_command_test.go b/integration/v6/isolated/create_user_command_test.go index 0dc4611e8ed..647e42c42cd 100644 --- a/integration/v6/isolated/create_user_command_test.go +++ b/integration/v6/isolated/create_user_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/curl_command_test.go b/integration/v6/isolated/curl_command_test.go index 0d6d37f96c8..afce804c00c 100644 --- a/integration/v6/isolated/curl_command_test.go +++ b/integration/v6/isolated/curl_command_test.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_command_test.go b/integration/v6/isolated/delete_command_test.go index e540c2cad17..8c28116bf1a 100644 --- a/integration/v6/isolated/delete_command_test.go +++ b/integration/v6/isolated/delete_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_isolation_segment_command_test.go b/integration/v6/isolated/delete_isolation_segment_command_test.go index d6869e814bb..365c5bb8b8a 100644 --- a/integration/v6/isolated/delete_isolation_segment_command_test.go +++ b/integration/v6/isolated/delete_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_org_command_test.go b/integration/v6/isolated/delete_org_command_test.go index 31573f7d94c..ac78282f67a 100644 --- a/integration/v6/isolated/delete_org_command_test.go +++ b/integration/v6/isolated/delete_org_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_orphaned_routes_command_test.go b/integration/v6/isolated/delete_orphaned_routes_command_test.go index 1a3be5881c1..e9aef9d7873 100644 --- a/integration/v6/isolated/delete_orphaned_routes_command_test.go +++ b/integration/v6/isolated/delete_orphaned_routes_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_quota_command_test.go b/integration/v6/isolated/delete_quota_command_test.go index aa2d6759186..ff3b90920be 100644 --- a/integration/v6/isolated/delete_quota_command_test.go +++ b/integration/v6/isolated/delete_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_security_group_command_test.go b/integration/v6/isolated/delete_security_group_command_test.go index 8e02a939e9c..5b70a306eea 100644 --- a/integration/v6/isolated/delete_security_group_command_test.go +++ b/integration/v6/isolated/delete_security_group_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_space_command_test.go b/integration/v6/isolated/delete_space_command_test.go index 1abdc8a31eb..4fc99bfc585 100644 --- a/integration/v6/isolated/delete_space_command_test.go +++ b/integration/v6/isolated/delete_space_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_space_quota_command_test.go b/integration/v6/isolated/delete_space_quota_command_test.go index b8eb7d69d77..b959521ea9c 100644 --- a/integration/v6/isolated/delete_space_quota_command_test.go +++ b/integration/v6/isolated/delete_space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/delete_user_command_test.go b/integration/v6/isolated/delete_user_command_test.go index fbaf32a672d..9b8498a06c6 100644 --- a/integration/v6/isolated/delete_user_command_test.go +++ b/integration/v6/isolated/delete_user_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/disable_feature_flag_command_test.go b/integration/v6/isolated/disable_feature_flag_command_test.go index 46258c89e0a..632d0494801 100644 --- a/integration/v6/isolated/disable_feature_flag_command_test.go +++ b/integration/v6/isolated/disable_feature_flag_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/disable_org_isolation_command_test.go b/integration/v6/isolated/disable_org_isolation_command_test.go index bb47b2d7571..732ea5e93bc 100644 --- a/integration/v6/isolated/disable_org_isolation_command_test.go +++ b/integration/v6/isolated/disable_org_isolation_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/disable_service_access_command_test.go b/integration/v6/isolated/disable_service_access_command_test.go index 24bf580065b..b866c907fa6 100644 --- a/integration/v6/isolated/disable_service_access_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/disallow_ssh_command_test.go b/integration/v6/isolated/disallow_ssh_command_test.go index 8629cde8af7..f29d2508f14 100644 --- a/integration/v6/isolated/disallow_ssh_command_test.go +++ b/integration/v6/isolated/disallow_ssh_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/domains_command_test.go b/integration/v6/isolated/domains_command_test.go index 9e0c7cd5ec1..4cdd6baa15c 100644 --- a/integration/v6/isolated/domains_command_test.go +++ b/integration/v6/isolated/domains_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/enable_feature_flag_command_test.go b/integration/v6/isolated/enable_feature_flag_command_test.go index d4dd4bcac17..03644b71594 100644 --- a/integration/v6/isolated/enable_feature_flag_command_test.go +++ b/integration/v6/isolated/enable_feature_flag_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/enable_org_isolation_command_test.go b/integration/v6/isolated/enable_org_isolation_command_test.go index 5f8ded92b22..5cdcf803cd1 100644 --- a/integration/v6/isolated/enable_org_isolation_command_test.go +++ b/integration/v6/isolated/enable_org_isolation_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/enable_service_access_command_test.go b/integration/v6/isolated/enable_service_access_command_test.go index 2ff4a84b8a5..314f646261f 100644 --- a/integration/v6/isolated/enable_service_access_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/feature_flag_command_test.go b/integration/v6/isolated/feature_flag_command_test.go index 24fb9bc215e..79fa8fbac01 100644 --- a/integration/v6/isolated/feature_flag_command_test.go +++ b/integration/v6/isolated/feature_flag_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/feature_flags_command_test.go b/integration/v6/isolated/feature_flags_command_test.go index 5086f76f58e..7b3bbb3cd2d 100644 --- a/integration/v6/isolated/feature_flags_command_test.go +++ b/integration/v6/isolated/feature_flags_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/get_health_check_command_test.go b/integration/v6/isolated/get_health_check_command_test.go index 2a05de998fd..7783799113b 100644 --- a/integration/v6/isolated/get_health_check_command_test.go +++ b/integration/v6/isolated/get_health_check_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/help_command_test.go b/integration/v6/isolated/help_command_test.go index eabf3444816..0b111537a88 100644 --- a/integration/v6/isolated/help_command_test.go +++ b/integration/v6/isolated/help_command_test.go @@ -4,7 +4,7 @@ import ( "os/exec" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/isolated_suite_test.go b/integration/v6/isolated/isolated_suite_test.go index d01cf8a9029..905d60c3c7a 100644 --- a/integration/v6/isolated/isolated_suite_test.go +++ b/integration/v6/isolated/isolated_suite_test.go @@ -3,7 +3,7 @@ package isolated import ( "testing" - "code.cloudfoundry.org/cli/integration/helpers/commonisolated" + "code.cloudfoundry.org/cli/v7/integration/helpers/commonisolated" ) const ( diff --git a/integration/v6/isolated/isolation_segments_command_test.go b/integration/v6/isolated/isolation_segments_command_test.go index 79659770c60..7a301d6599e 100644 --- a/integration/v6/isolated/isolation_segments_command_test.go +++ b/integration/v6/isolated/isolation_segments_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/login_command_test.go b/integration/v6/isolated/login_command_test.go index c93f419d225..1b904831b7f 100644 --- a/integration/v6/isolated/login_command_test.go +++ b/integration/v6/isolated/login_command_test.go @@ -11,8 +11,8 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -251,8 +251,8 @@ var _ = Describe("login command", func() { } Eventually(session).Should(Say("API endpoint: %s", apiURL)) // TODO https://www.pivotaltracker.com/story/show/166938709/comments/204492216 - //Consistently(session).ShouldNot(Say("API endpoint:")) - //session.Interrupt() + // Consistently(session).ShouldNot(Say("API endpoint:")) + // session.Interrupt() Eventually(session).Should(Exit()) }) @@ -478,7 +478,7 @@ var _ = Describe("login command", func() { It("doesn't complain about an invalid cert when we specify --skip-ssl-validation", func() { session := helpers.CF("login", "-a", server.URL(), "--skip-ssl-validation") - //session := helpers.CF("api", server.URL(), "--skip-ssl-validation") + // session := helpers.CF("api", server.URL(), "--skip-ssl-validation") Eventually(session).Should(Exit(0)) Expect(session).Should(Say("API endpoint:\\s+" + server.URL())) Expect(session).Should(Say(`Authenticating\.\.\.`)) @@ -552,7 +552,7 @@ var _ = Describe("login command", func() { Eventually(session).Should(Say("FAILED")) Eventually(session).Should(Exit(1)) - //And I am still logged in + // And I am still logged in targetSession := helpers.CF("target") Eventually(targetSession).Should(Exit(0)) }) diff --git a/integration/v6/isolated/logout_command_test.go b/integration/v6/isolated/logout_command_test.go index 5b86aa0c15d..a1f041bd1e8 100644 --- a/integration/v6/isolated/logout_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/logs_command_test.go b/integration/v6/isolated/logs_command_test.go index b41819adf8d..0d79799b626 100644 --- a/integration/v6/isolated/logs_command_test.go +++ b/integration/v6/isolated/logs_command_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/marketplace_command_test.go b/integration/v6/isolated/marketplace_command_test.go index 4b9963af87e..ac07591b52c 100644 --- a/integration/v6/isolated/marketplace_command_test.go +++ b/integration/v6/isolated/marketplace_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "strings" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/isolated/network_policies_command_test.go b/integration/v6/isolated/network_policies_command_test.go index 14d135b9257..9ae55a0ece7 100644 --- a/integration/v6/isolated/network_policies_command_test.go +++ b/integration/v6/isolated/network_policies_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/oauth_client_test.go b/integration/v6/isolated/oauth_client_test.go index 36a0cde8812..92e02ff9e4e 100644 --- a/integration/v6/isolated/oauth_client_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/oauth_token_command_test.go b/integration/v6/isolated/oauth_token_command_test.go index 1b26968b9cb..c9f9e247f7c 100644 --- a/integration/v6/isolated/oauth_token_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/org_command_test.go b/integration/v6/isolated/org_command_test.go index 31ca28c47e9..061db2553a7 100644 --- a/integration/v6/isolated/org_command_test.go +++ b/integration/v6/isolated/org_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "sort" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/org_users_command_test.go b/integration/v6/isolated/org_users_command_test.go index a9ae250d78f..7eb83e40bfe 100644 --- a/integration/v6/isolated/org_users_command_test.go +++ b/integration/v6/isolated/org_users_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/v7/integration/helpers" ) var _ = Describe("org-users command", func() { diff --git a/integration/v6/isolated/orgs_command_test.go b/integration/v6/isolated/orgs_command_test.go index a8e0692e38b..ac7754264d3 100644 --- a/integration/v6/isolated/orgs_command_test.go +++ b/integration/v6/isolated/orgs_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/proxy_connection_test.go b/integration/v6/isolated/proxy_connection_test.go index e528c01d352..4179d7184dd 100644 --- a/integration/v6/isolated/proxy_connection_test.go +++ b/integration/v6/isolated/proxy_connection_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/purge_service_offering_command_test.go b/integration/v6/isolated/purge_service_offering_command_test.go index 52ba82f3a92..98ff6a0097b 100644 --- a/integration/v6/isolated/purge_service_offering_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/remove_network_policy_command_test.go b/integration/v6/isolated/remove_network_policy_command_test.go index 4938b34ac83..77968e03367 100644 --- a/integration/v6/isolated/remove_network_policy_command_test.go +++ b/integration/v6/isolated/remove_network_policy_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/rename_service_broker_command_test.go b/integration/v6/isolated/rename_service_broker_command_test.go index f960a0c3695..336a192d323 100644 --- a/integration/v6/isolated/rename_service_broker_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/isolated/reset_org_default_isolation_segment_command_test.go b/integration/v6/isolated/reset_org_default_isolation_segment_command_test.go index b74720e5234..0109f13fd47 100644 --- a/integration/v6/isolated/reset_org_default_isolation_segment_command_test.go +++ b/integration/v6/isolated/reset_org_default_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/reset_space_isolation_segment_test.go b/integration/v6/isolated/reset_space_isolation_segment_test.go index f563ae4f2e9..9c1b201b6e3 100644 --- a/integration/v6/isolated/reset_space_isolation_segment_test.go +++ b/integration/v6/isolated/reset_space_isolation_segment_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/restage_command_test.go b/integration/v6/isolated/restage_command_test.go index cc28ee21c85..14ed0aa92a6 100644 --- a/integration/v6/isolated/restage_command_test.go +++ b/integration/v6/isolated/restage_command_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/restart_command_test.go b/integration/v6/isolated/restart_command_test.go index 76515e07c21..239b4330b30 100644 --- a/integration/v6/isolated/restart_command_test.go +++ b/integration/v6/isolated/restart_command_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/run_task_command_test.go b/integration/v6/isolated/run_task_command_test.go index 4b73d201715..4e5814d340a 100644 --- a/integration/v6/isolated/run_task_command_test.go +++ b/integration/v6/isolated/run_task_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/scale_command_test.go b/integration/v6/isolated/scale_command_test.go index 330e523db19..50d5993140b 100644 --- a/integration/v6/isolated/scale_command_test.go +++ b/integration/v6/isolated/scale_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/security_groups_command_test.go b/integration/v6/isolated/security_groups_command_test.go index ab851b96c91..05450e6478e 100644 --- a/integration/v6/isolated/security_groups_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/service_access_command_test.go b/integration/v6/isolated/service_access_command_test.go index feb1c04d49b..7afa0240c03 100644 --- a/integration/v6/isolated/service_access_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/service_brokers_command_test.go b/integration/v6/isolated/service_brokers_command_test.go index 66253e504bb..ce625b48f80 100644 --- a/integration/v6/isolated/service_brokers_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/set_env_command_test.go b/integration/v6/isolated/set_env_command_test.go index d69947c5350..27a098d17b4 100644 --- a/integration/v6/isolated/set_env_command_test.go +++ b/integration/v6/isolated/set_env_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/set_health_check_command_test.go b/integration/v6/isolated/set_health_check_command_test.go index ac153d290d4..908ed7802b1 100644 --- a/integration/v6/isolated/set_health_check_command_test.go +++ b/integration/v6/isolated/set_health_check_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/set_org_default_isolation_segment_command_test.go b/integration/v6/isolated/set_org_default_isolation_segment_command_test.go index 82a5118613e..37ddcfb78cd 100644 --- a/integration/v6/isolated/set_org_default_isolation_segment_command_test.go +++ b/integration/v6/isolated/set_org_default_isolation_segment_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/set_org_role_command_test.go b/integration/v6/isolated/set_org_role_command_test.go index ba4bccd9095..48f5375201e 100644 --- a/integration/v6/isolated/set_org_role_command_test.go +++ b/integration/v6/isolated/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/v7/integration/helpers" ) var _ = Describe("set-org-role command", func() { diff --git a/integration/v6/isolated/set_quota_command_test.go b/integration/v6/isolated/set_quota_command_test.go index 922dd91e2ec..d2414b8df84 100644 --- a/integration/v6/isolated/set_quota_command_test.go +++ b/integration/v6/isolated/set_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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/set_space_isolation_segment_command_test.go b/integration/v6/isolated/set_space_isolation_segment_command_test.go index 6f96e8a2c11..1996d757bb1 100644 --- a/integration/v6/isolated/set_space_isolation_segment_command_test.go +++ b/integration/v6/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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/set_space_quota_command_test.go b/integration/v6/isolated/set_space_quota_command_test.go index 11c730b9a93..4c5605f2c8a 100644 --- a/integration/v6/isolated/set_space_quota_command_test.go +++ b/integration/v6/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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -57,7 +57,7 @@ var _ = Describe("set-space-quota command", func() { Eventually(session).Should(Say("FAILED")) Eventually(session.Out).Should(Say("No org targeted, use 'cf target -o ORG' to target an org\\.")) Eventually(session).Should(Exit(1)) - //helpers.CheckEnvironmentTargetedCorrectly(true, false, orgName, "set-space-quota", spaceName, quotaName) + // helpers.CheckEnvironmentTargetedCorrectly(true, false, orgName, "set-space-quota", spaceName, quotaName) }) }) diff --git a/integration/v6/isolated/set_space_role_command_test.go b/integration/v6/isolated/set_space_role_command_test.go index 2621a77c6bb..cd37205cd58 100644 --- a/integration/v6/isolated/set_space_role_command_test.go +++ b/integration/v6/isolated/set_space_role_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/space_command_test.go b/integration/v6/isolated/space_command_test.go index dbe82254d03..11b2197e1fb 100644 --- a/integration/v6/isolated/space_command_test.go +++ b/integration/v6/isolated/space_command_test.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/space_quotas_command_test.go b/integration/v6/isolated/space_quotas_command_test.go index dcc9899736f..2c4b736531f 100644 --- a/integration/v6/isolated/space_quotas_command_test.go +++ b/integration/v6/isolated/space_quotas_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/space_ssh_allowed_command_test.go b/integration/v6/isolated/space_ssh_allowed_command_test.go index 369682bd864..110d5dae5ef 100644 --- a/integration/v6/isolated/space_ssh_allowed_command_test.go +++ b/integration/v6/isolated/space_ssh_allowed_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/space_users_command_test.go b/integration/v6/isolated/space_users_command_test.go index 1e66051d74a..730bded6f41 100644 --- a/integration/v6/isolated/space_users_command_test.go +++ b/integration/v6/isolated/space_users_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/v7/integration/helpers" ) var _ = Describe("space-users command", func() { diff --git a/integration/v6/isolated/spaces_command_test.go b/integration/v6/isolated/spaces_command_test.go index d5dd929c90a..d162b18e29e 100644 --- a/integration/v6/isolated/spaces_command_test.go +++ b/integration/v6/isolated/spaces_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/ssh_code_command_test.go b/integration/v6/isolated/ssh_code_command_test.go index 2866e47d449..f3c99d45f70 100644 --- a/integration/v6/isolated/ssh_code_command_test.go +++ b/integration/v6/isolated/ssh_code_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/isolated/ssh_command_test.go b/integration/v6/isolated/ssh_command_test.go index c90d54ac05f..134969823b1 100644 --- a/integration/v6/isolated/ssh_command_test.go +++ b/integration/v6/isolated/ssh_command_test.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/ssh_enabled_command_test.go b/integration/v6/isolated/ssh_enabled_command_test.go index 48d402fd003..782ad6e3aa7 100644 --- a/integration/v6/isolated/ssh_enabled_command_test.go +++ b/integration/v6/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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/start_command_test.go b/integration/v6/isolated/start_command_test.go index fbf09745c18..bb002b346be 100644 --- a/integration/v6/isolated/start_command_test.go +++ b/integration/v6/isolated/start_command_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/table_alignment_test.go b/integration/v6/isolated/table_alignment_test.go index 7c4bfe71872..19d526bc6d9 100644 --- a/integration/v6/isolated/table_alignment_test.go +++ b/integration/v6/isolated/table_alignment_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/target_command_test.go b/integration/v6/isolated/target_command_test.go index da13fa77e03..4610c05f190 100644 --- a/integration/v6/isolated/target_command_test.go +++ b/integration/v6/isolated/target_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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/tasks_command_test.go b/integration/v6/isolated/tasks_command_test.go index a93130e1377..51562b05ad2 100644 --- a/integration/v6/isolated/tasks_command_test.go +++ b/integration/v6/isolated/tasks_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/terminate_task_command_test.go b/integration/v6/isolated/terminate_task_command_test.go index 8c67f11547a..d0ebae89ac8 100644 --- a/integration/v6/isolated/terminate_task_command_test.go +++ b/integration/v6/isolated/terminate_task_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/token_refresh_test.go b/integration/v6/isolated/token_refresh_test.go index 48cc4fd94dd..417eb42fcb8 100644 --- a/integration/v6/isolated/token_refresh_test.go +++ b/integration/v6/isolated/token_refresh_test.go @@ -3,8 +3,8 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/isolated/unbind_running_security_group_command_test.go b/integration/v6/isolated/unbind_running_security_group_command_test.go index 617f8990e14..de3e267c155 100644 --- a/integration/v6/isolated/unbind_running_security_group_command_test.go +++ b/integration/v6/isolated/unbind_running_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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/unbind_security_group_command_test.go b/integration/v6/isolated/unbind_security_group_command_test.go index 67463dceedb..094bdc85cf2 100644 --- a/integration/v6/isolated/unbind_security_group_command_test.go +++ b/integration/v6/isolated/unbind_security_group_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/unset_env_command_test.go b/integration/v6/isolated/unset_env_command_test.go index 8b62f7dfaa4..ff88cc9035e 100644 --- a/integration/v6/isolated/unset_env_command_test.go +++ b/integration/v6/isolated/unset_env_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/unset_space_quota_command_test.go b/integration/v6/isolated/unset_space_quota_command_test.go index de96ab6e036..3f7be59423c 100644 --- a/integration/v6/isolated/unset_space_quota_command_test.go +++ b/integration/v6/isolated/unset_space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/update_quota_command_test.go b/integration/v6/isolated/update_quota_command_test.go index ae886317c28..58dc734ee6a 100644 --- a/integration/v6/isolated/update_quota_command_test.go +++ b/integration/v6/isolated/update_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/update_security_group_command_test.go b/integration/v6/isolated/update_security_group_command_test.go index 29276d5aa40..348043dbd94 100644 --- a/integration/v6/isolated/update_security_group_command_test.go +++ b/integration/v6/isolated/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/update_service_broker_command_test.go b/integration/v6/isolated/update_service_broker_command_test.go index c8ac2bc145e..2d0d503d7f9 100644 --- a/integration/v6/isolated/update_service_broker_command_test.go +++ b/integration/v6/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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/isolated/update_space_quota_command_test.go b/integration/v6/isolated/update_space_quota_command_test.go index 530db843195..70e9026064e 100644 --- a/integration/v6/isolated/update_space_quota_command_test.go +++ b/integration/v6/isolated/update_space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -49,7 +49,7 @@ var _ = Describe("update-space-quota command", func() { Eventually(session).Should(Say(`instance memory limit\s+%s`, instanceMemory)) Eventually(session).Should(Say(`routes\s+%s`, "8")) Eventually(session).Should(Say(`services\s+%s`, serviceInstances)) - //TODO: Uncomment when #134821331 is complete + // TODO: Uncomment when #134821331 is complete // Eventually(session).Should(Say(`Paid service plans\s+%s`, "allowed")) Eventually(session).Should(Say(`app instance limit\s+%s`, appInstances)) Eventually(session).Should(Say(`reserved route ports\s+%s`, reservedRoutePorts)) diff --git a/integration/v6/isolated/verbose_flag_test.go b/integration/v6/isolated/verbose_flag_test.go index 8566b519019..eeb339b0093 100644 --- a/integration/v6/isolated/verbose_flag_test.go +++ b/integration/v6/isolated/verbose_flag_test.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/util/configv3" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -230,7 +230,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:")) // actual request Eventually(session).Should(Say("REQUEST:")) diff --git a/integration/v6/push/app_flags_test.go b/integration/v6/push/app_flags_test.go index a584d3e38c5..6e91e9773d0 100644 --- a/integration/v6/push/app_flags_test.go +++ b/integration/v6/push/app_flags_test.go @@ -5,7 +5,7 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -29,7 +29,7 @@ var _ = Describe("push with various flags and no manifest", func() { PushCommandName, appName, "-b", "staticfile_buildpack", "-c", fmt.Sprintf("echo 'hi' && %s", helpers.StaticfileBuildpackStartCommand), - "-u", "port", //works if this stuff is commentted out + "-u", "port", // works if this stuff is commentted out "-k", "300M", "-i", "2", "-m", "70M", diff --git a/integration/v6/push/bind_to_services_in_manifest_test.go b/integration/v6/push/bind_to_services_in_manifest_test.go index ec88c04e577..8198dc76d17 100644 --- a/integration/v6/push/bind_to_services_in_manifest_test.go +++ b/integration/v6/push/bind_to_services_in_manifest_test.go @@ -3,9 +3,9 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/buildpack_test.go b/integration/v6/push/buildpack_test.go index 4d0fd9ecd52..52552d448de 100644 --- a/integration/v6/push/buildpack_test.go +++ b/integration/v6/push/buildpack_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/combination_manifest_and_flag_test.go b/integration/v6/push/combination_manifest_and_flag_test.go index 0a00ca1a521..53664a7ceea 100644 --- a/integration/v6/push/combination_manifest_and_flag_test.go +++ b/integration/v6/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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/deprecated_route_flags_test.go b/integration/v6/push/deprecated_route_flags_test.go index cb7d79b1716..092a0d272af 100644 --- a/integration/v6/push/deprecated_route_flags_test.go +++ b/integration/v6/push/deprecated_route_flags_test.go @@ -3,7 +3,7 @@ package push import ( "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/docker_test.go b/integration/v6/push/docker_test.go index 490e51b7830..e182ac15bc0 100644 --- a/integration/v6/push/docker_test.go +++ b/integration/v6/push/docker_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/domain_test.go b/integration/v6/push/domain_test.go index c63496520ea..3d533dd3a77 100644 --- a/integration/v6/push/domain_test.go +++ b/integration/v6/push/domain_test.go @@ -3,7 +3,7 @@ package push import ( "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/droplet_test.go b/integration/v6/push/droplet_test.go index e4b4ff3e769..a67317c47c3 100644 --- a/integration/v6/push/droplet_test.go +++ b/integration/v6/push/droplet_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/flag_error_test.go b/integration/v6/push/flag_error_test.go index dd01d80e8e1..6fbbec4b048 100644 --- a/integration/v6/push/flag_error_test.go +++ b/integration/v6/push/flag_error_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/health_check_test.go b/integration/v6/push/health_check_test.go index 88f14dc4350..4ba8c9fb2db 100644 --- a/integration/v6/push/health_check_test.go +++ b/integration/v6/push/health_check_test.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/help_test.go b/integration/v6/push/help_test.go index 35bbed869b5..3f66afd26ce 100644 --- a/integration/v6/push/help_test.go +++ b/integration/v6/push/help_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/hostname_only_routing_test.go b/integration/v6/push/hostname_only_routing_test.go index ec62123b922..a3e70cca892 100644 --- a/integration/v6/push/hostname_only_routing_test.go +++ b/integration/v6/push/hostname_only_routing_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/http_random_route_test.go b/integration/v6/push/http_random_route_test.go index 77157d05536..0614def387e 100644 --- a/integration/v6/push/http_random_route_test.go +++ b/integration/v6/push/http_random_route_test.go @@ -3,7 +3,7 @@ package push import ( "path" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/http_routes_in_manifest_test.go b/integration/v6/push/http_routes_in_manifest_test.go index 21de195c1ec..0d3c7d8f751 100644 --- a/integration/v6/push/http_routes_in_manifest_test.go +++ b/integration/v6/push/http_routes_in_manifest_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/ignore_app_files_test.go b/integration/v6/push/ignore_app_files_test.go index 566f7b264ae..2af37f7d27f 100644 --- a/integration/v6/push/ignore_app_files_test.go +++ b/integration/v6/push/ignore_app_files_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/instances_test.go b/integration/v6/push/instances_test.go index 5be4717cf01..4f5cffe411c 100644 --- a/integration/v6/push/instances_test.go +++ b/integration/v6/push/instances_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/interpolate_manifest_test.go b/integration/v6/push/interpolate_manifest_test.go index f08705ffa26..2828a52126e 100644 --- a/integration/v6/push/interpolate_manifest_test.go +++ b/integration/v6/push/interpolate_manifest_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/interpolate_manifest_unix_test.go b/integration/v6/push/interpolate_manifest_unix_test.go index ef91f7cfe0a..b680216165c 100644 --- a/integration/v6/push/interpolate_manifest_unix_test.go +++ b/integration/v6/push/interpolate_manifest_unix_test.go @@ -9,7 +9,7 @@ import ( "os/exec" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/multiple_apps_in_manifest_test.go b/integration/v6/push/multiple_apps_in_manifest_test.go index 6b9ec708312..a7af7fbb20b 100644 --- a/integration/v6/push/multiple_apps_in_manifest_test.go +++ b/integration/v6/push/multiple_apps_in_manifest_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/name_only_client_credentials_test.go b/integration/v6/push/name_only_client_credentials_test.go index f22d7d36fd8..80f56d49dce 100644 --- a/integration/v6/push/name_only_client_credentials_test.go +++ b/integration/v6/push/name_only_client_credentials_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/name_only_test.go b/integration/v6/push/name_only_test.go index c28cac2b7e2..24d8cdcf0aa 100644 --- a/integration/v6/push/name_only_test.go +++ b/integration/v6/push/name_only_test.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/no_hostname_test.go b/integration/v6/push/no_hostname_test.go index 338ade6adda..4a1953de8aa 100644 --- a/integration/v6/push/no_hostname_test.go +++ b/integration/v6/push/no_hostname_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/no_route_test.go b/integration/v6/push/no_route_test.go index f94197f239c..6677be73452 100644 --- a/integration/v6/push/no_route_test.go +++ b/integration/v6/push/no_route_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/no_start_test.go b/integration/v6/push/no_start_test.go index 6f1813fc032..f2020d62768 100644 --- a/integration/v6/push/no_start_test.go +++ b/integration/v6/push/no_start_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/path_only_routing_test.go b/integration/v6/push/path_only_routing_test.go index 0ed7414acc1..099bf0a28cc 100644 --- a/integration/v6/push/path_only_routing_test.go +++ b/integration/v6/push/path_only_routing_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/path_test.go b/integration/v6/push/path_test.go index 63efdb3f5df..cb7b65fb33c 100644 --- a/integration/v6/push/path_test.go +++ b/integration/v6/push/path_test.go @@ -3,7 +3,7 @@ package push import ( "os" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/path_windows_test.go b/integration/v6/push/path_windows_test.go index 3a93eac0d7a..e8e0d5a72af 100644 --- a/integration/v6/push/path_windows_test.go +++ b/integration/v6/push/path_windows_test.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/push_suite_test.go b/integration/v6/push/push_suite_test.go index 0874089f7c0..c1119f76b66 100644 --- a/integration/v6/push/push_suite_test.go +++ b/integration/v6/push/push_suite_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v6/push/resource_matching_test.go b/integration/v6/push/resource_matching_test.go index 387151b61f8..fd224bf4bae 100644 --- a/integration/v6/push/resource_matching_test.go +++ b/integration/v6/push/resource_matching_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/select_app_to_push_from_manifest_test.go b/integration/v6/push/select_app_to_push_from_manifest_test.go index 17f39686985..b0cea9a174d 100644 --- a/integration/v6/push/select_app_to_push_from_manifest_test.go +++ b/integration/v6/push/select_app_to_push_from_manifest_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/simple_manifest_only_test.go b/integration/v6/push/simple_manifest_only_test.go index 1fce4441236..9f4fe8da4e7 100644 --- a/integration/v6/push/simple_manifest_only_test.go +++ b/integration/v6/push/simple_manifest_only_test.go @@ -6,7 +6,7 @@ import ( "regexp" "time" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/start_command_test.go b/integration/v6/push/start_command_test.go index ada96735017..85726a2397c 100644 --- a/integration/v6/push/start_command_test.go +++ b/integration/v6/push/start_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/symlink_resources_test.go b/integration/v6/push/symlink_resources_test.go index f79ef305b2b..7e28c903a77 100644 --- a/integration/v6/push/symlink_resources_test.go +++ b/integration/v6/push/symlink_resources_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v6/push/symlink_test.go b/integration/v6/push/symlink_test.go index 0392dc15923..4b472a5191c 100644 --- a/integration/v6/push/symlink_test.go +++ b/integration/v6/push/symlink_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/target_check_test.go b/integration/v6/push/target_check_test.go index f920006eff3..da735774e02 100644 --- a/integration/v6/push/target_check_test.go +++ b/integration/v6/push/target_check_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/tcp_random_route_test.go b/integration/v6/push/tcp_random_route_test.go index 3b5f74d42c0..305d9edc95a 100644 --- a/integration/v6/push/tcp_random_route_test.go +++ b/integration/v6/push/tcp_random_route_test.go @@ -1,7 +1,7 @@ package push import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/tcp_routes_in_manifest_test.go b/integration/v6/push/tcp_routes_in_manifest_test.go index f84f908cea0..e94da851682 100644 --- a/integration/v6/push/tcp_routes_in_manifest_test.go +++ b/integration/v6/push/tcp_routes_in_manifest_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v6/push/trigger_legacy_push_test.go b/integration/v6/push/trigger_legacy_push_test.go index 91e1caf69a6..7b24c965860 100644 --- a/integration/v6/push/trigger_legacy_push_test.go +++ b/integration/v6/push/trigger_legacy_push_test.go @@ -3,7 +3,7 @@ package push import ( "path/filepath" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "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 081d4407c99..65e096c8fae 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 efba3e4f316..475d143c78a 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 ea120e6e91b..befa2a870ab 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 474dab02cfd..cf30b670ceb 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/v7/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 d701ce2a853..94bf0c6034e 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 b00775a7ce4..b9033494129 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/v7/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 646f7063b41..475f10cb03d 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/v7/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 fcda96b1789..aac87378698 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/v7/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 bc029321593..2290462f8d8 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/v7/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 d049a732d40..2349f56aa85 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/v7/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 371d9d1aec8..a8b7c149cac 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/v7/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 3cdabe5f66e..917966d9561 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/v7/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 6da1c04182d..b102bcfbc26 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/v7/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 e253e821d98..cac6dd9c6cb 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 782d05fe036..1c1a01199a1 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/service_command_test.go b/integration/v7/global/service_command_test.go index 56910161b06..fcb39ae4c72 100644 --- a/integration/v7/global/service_command_test.go +++ b/integration/v7/global/service_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "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 12a5739aed0..7758aa71985 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/v7/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 eef6f8c5867..a31205ca2b3 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/v7/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 9e2f99df4e2..75bd9935f07 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/v7/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 05a1e79aa2b..9080cf7f69a 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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/share_service_command_test.go b/integration/v7/global/share_service_command_test.go index 6168ff719fe..af92cd958c0 100644 --- a/integration/v7/global/share_service_command_test.go +++ b/integration/v7/global/share_service_command_test.go @@ -3,9 +3,9 @@ package global import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 bb03b84dcf8..d53d234b706 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/v7/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 49049c28379..02913ec87dd 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 ef2c8a4b5fd..9e3dcb98709 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 18af34f653d..d4b643c1e62 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/v7/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 9a28ea277c4..8f1a0892f24 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/global/unshare_service_command_test.go b/integration/v7/global/unshare_service_command_test.go index d20ca2c4c04..1067fb898a3 100644 --- a/integration/v7/global/unshare_service_command_test.go +++ b/integration/v7/global/unshare_service_command_test.go @@ -1,8 +1,8 @@ package global import ( - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "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 8409fd6c447..1757911079b 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/v7/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 5f86b6710f5..0b4d9ee5b94 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 db2da6cb241..79b65275759 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/v7/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 c7fcabe338a..f7c58d7b71e 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 b61f63f5375..cb6afc0d3d3 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 66bf2707779..aa8de889aa8 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 30f2b724c8f..ffcb102b55b 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 d7ca99920f4..a8d91a136ff 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 fce6f1c01bf..4ffa518ac85 100644 --- a/integration/v7/isolated/auth_command_test.go +++ b/integration/v7/isolated/auth_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "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 0c046dd144f..4e9385c7028 100644 --- a/integration/v7/isolated/bind_service_command_test.go +++ b/integration/v7/isolated/bind_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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "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 9ddcd47bd9e..79bde11ebdb 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 7b0d4dc01ec..83f59fa5b76 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/v7/integration/helpers" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/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 70067930741..081ff3da5ec 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 549af21a49f..3a49f91c9d2 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/v7/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 985e3e40808..52cad456fce 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "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 c44701a6090..241044bd2a2 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 e10dc1872ea..5748f0b6691 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 f008e45d10f..725caf59489 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 5ed9ed9bd4b..bce5d8b6a8f 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/v7/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 3c6b1e2a14b..23757d9adf7 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 033b0aaca9b..0b4505f362e 100644 --- a/integration/v7/isolated/create_org_quota_command_test.go +++ b/integration/v7/isolated/create_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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 a1ebe0b89c6..8457a827502 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/v7/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 3342faceabd..a0e4d6cf75b 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 84bb1ff88f9..ea973d93235 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 60e64ba82a6..e1d647135ce 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 0507aed6319..fe1310c7a55 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/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/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 02479c677c1..bc1101113a3 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 a93bc5901a8..8066ae9c180 100644 --- a/integration/v7/isolated/create_service_key_command_test.go +++ b/integration/v7/isolated/create_service_key_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "os" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "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 c16129dadef..9904bbdd5ae 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 7bb6115720a..8d07cbf6f8a 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 ae4413b1a42..712f288accb 100644 --- a/integration/v7/isolated/create_space_quota_command_test.go +++ b/integration/v7/isolated/create_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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 6cda9958ee9..fd67ff0ce8c 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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/integration/v7/isolated/curl_command_test.go b/integration/v7/isolated/curl_command_test.go index 0f921520e2a..0cf7ab893bd 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 829ab4f2515..0639aff175a 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 d6869e814bb..365c5bb8b8a 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/v7/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 f8134fd3d73..1d256736010 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 c0b613497af..ed29d1249b0 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/v7/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 ca34b582531..c65e6168944 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 af707bd6a9a..38db83d4dc8 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 dbe2d96d61c..55a99c191c9 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 5a902dad8d9..5a60dd47a38 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 a1808622113..b8bb2b30ff8 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 665ef4b9a68..01affe0babe 100644 --- a/integration/v7/isolated/delete_service_command_test.go +++ b/integration/v7/isolated/delete_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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 8740084568c..ecc6c9b9aa5 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 6538dcb2991..22a9fe45695 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/v7/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 bc5d0c884a5..43e5608ed0d 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/v7/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 c5740557daf..290c17588d4 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/v7/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 bb47b2d7571..732ea5e93bc 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/v7/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 5fc0453f30b..ffbc8bc4b10 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 9de1ddbbafe..dabd7576768 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 cc1f3502e36..d37ec02ba5a 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 39ec17e2f41..988c59f4531 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 8fbe350ea71..cfb58f2abea 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 186700f08b5..44e8d34476a 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 5f8ded92b22..5cdcf803cd1 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/v7/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 b315d00e10b..d064f3d6fed 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 014791f83b6..ab9f1a073a4 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 712f9036f21..ea4e0b3c820 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/v7/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 9b6ddb295c5..169f8824212 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 bcec97a4bd6..979094e4ffd 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 26f7c7e4c43..b9ed86c4642 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 a1b64a9f566..d43727bbe42 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 43991701ea0..5c0ac50cc98 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 dc376ee9eff..1ddf102bbc7 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/v7/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 bb5243e785a..40e15ca6f73 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/v7/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 c2475a41e42..77fd1c00624 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/v7/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 b78eb664c6a..63d43ffc108 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -624,7 +624,7 @@ var _ = Describe("login command", func() { Eventually(session.Err).Should(Say("Service account currently logged in. Use 'cf logout' to log out service account and try again.")) Eventually(session).Should(Exit(1)) - //And I am still logged in + // And I am still logged in targetSession := helpers.CF("target") Eventually(targetSession).Should(Exit(0)) }) diff --git a/integration/v7/isolated/logout_command_test.go b/integration/v7/isolated/logout_command_test.go index e275aaed577..aa44aacb990 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 a04ba1800c9..f25fc439ef1 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 42be3469785..f7ffa0cfbf6 100644 --- a/integration/v7/isolated/map_route_command_test.go +++ b/integration/v7/isolated/map_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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 85f68089608..fbfb822c413 100644 --- a/integration/v7/isolated/marketplace_command_test.go +++ b/integration/v7/isolated/marketplace_command_test.go @@ -4,13 +4,9 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/onsi/gomega/gbytes" - . "github.com/onsi/gomega/gexec" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" ) var _ = Describe("marketplace command", func() { diff --git a/integration/v7/isolated/network_policies_command_test.go b/integration/v7/isolated/network_policies_command_test.go index 05469eccd89..db4dce108b7 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/v7/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 9d7e9ee834b..2a4a5e9526a 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 8cabb8b142b..4b9bfc5ef4d 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 ddfece678e6..8491c923234 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/v7/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 f2f6ec63871..8ac51ed6b35 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/v7/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 db77e0eac99..0735e9980d3 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/v7/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 f81f6b47dcf..c018c44c103 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 f5caa3685fd..85b58f9bd1e 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 afabd756184..d5468e63b8f 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/v7/integration/helpers" . "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 38ee9f9a5c2..735b45a9d4d 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 22c3871f7a0..fabdb320f46 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/v7/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 29e5d58eb2e..c39ba0894c2 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 ad5accf8993..16f615ffaff 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 bac5aa88f2e..b977e5ce0f4 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 29a9e789ec0..dd775633adf 100644 --- a/integration/v7/isolated/rename_service_command_test.go +++ b/integration/v7/isolated/rename_service_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 3360df69e44..503fbc2c3f1 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 2cd88a1505d..6f671f4c0a9 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/v7/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 effd49f7260..30f3ec89b7e 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/v7/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 483eb7b2994..66523888f25 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/v7/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 0958599b94a..e84f08d9c83 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/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 c0b52489dc9..358a2db61e3 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 47cf099fc4f..aaa2b648fed 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 952654b1b7a..af3421ec164 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 8a4f75bc598..9ef637e3aa1 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 b49a79cf088..52c6072b876 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/v7/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 07ab5e1dc91..27b72a99e24 100644 --- a/integration/v7/isolated/routes_command_test.go +++ b/integration/v7/isolated/routes_command_test.go @@ -1,9 +1,9 @@ package isolated import ( - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 c3da508db9e..750a92a6f7e 100644 --- a/integration/v7/isolated/run_task_command_test.go +++ b/integration/v7/isolated/run_task_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "path" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 65c9c8e2449..65d34284e62 100644 --- a/integration/v7/isolated/scale_command_test.go +++ b/integration/v7/isolated/scale_command_test.go @@ -5,9 +5,9 @@ import ( "strings" "time" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" @@ -269,7 +269,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") @@ -281,7 +281,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 8581aa8f1db..5bf7551ad2d 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 3cd24fc51a4..dbb2e21b9cc 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 b27126d02f9..41f23d300a7 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 a89e7f5a0f5..54a86dab01c 100644 --- a/integration/v7/isolated/service_command_test.go +++ b/integration/v7/isolated/service_command_test.go @@ -1,14 +1,10 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/onsi/gomega/gbytes" - . "github.com/onsi/gomega/gexec" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" ) var _ = Describe("service command", func() { diff --git a/integration/v7/isolated/service_key_command_test.go b/integration/v7/isolated/service_key_command_test.go index 71487602674..de5636b7db7 100644 --- a/integration/v7/isolated/service_key_command_test.go +++ b/integration/v7/isolated/service_key_command_test.go @@ -3,9 +3,9 @@ package isolated import ( "fmt" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "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 1c19de89ed1..7af622e7c2d 100644 --- a/integration/v7/isolated/services_command_test.go +++ b/integration/v7/isolated/services_command_test.go @@ -1,14 +1,10 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/onsi/gomega/gbytes" - . "github.com/onsi/gomega/gexec" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" ) var _ = Describe("services command", func() { diff --git a/integration/v7/isolated/set_droplet_command_test.go b/integration/v7/isolated/set_droplet_command_test.go index a5db7cbdf74..602ef7226fb 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 1e3a71fa642..5dcf9c41276 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 5d9d48b054a..5338b7334a3 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 194a5dfff65..c7074f7754e 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/v7/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 3c00315471d..a5074beec34 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/v7/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 0288818c69b..71c720aa440 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 60967ccef8e..652fc3c488a 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 64915b1890a..bd3d04420dd 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/v7/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 19f2f451c66..f304602aa0a 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 f488745720e..d73c424c1ac 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/v7/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 e9e62700353..36e4047875f 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/integration/v7/isolated/space_command_test.go b/integration/v7/isolated/space_command_test.go index 86a786222e0..369c31c9a2d 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/v7/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/resources" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 db38d337086..0900a060e50 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/v7/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 5729bf34cbb..aa9accff972 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/v7/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 f2bdc27eb8b..3722eae4e98 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/v7/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 1cbb0e41026..654dd9da0d2 100644 --- a/integration/v7/isolated/space_users_command_test.go +++ b/integration/v7/isolated/space_users_command_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 5ae047e821c..0d8ce3ed4c5 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/v7/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 2866e47d449..f3c99d45f70 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/v7/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 e7eeefd58a8..5b4764c50d7 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 0c920497b87..0e1e8ee3c53 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 dde2aadfa4e..cca2d1f3eca 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 3403d3cda63..44842718857 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 51080f94746..0cb82e3a828 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 4ec6f1c8946..3007c368ffe 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 698d51a6e1b..b5cc6ebb613 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 0bd51ca4cd1..83f907c00aa 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/v7/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 24ce9aa0085..f92602cf3e3 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 8d1bb2d23da..c766d4d5cb6 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/v7/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 8214016dc13..2323899f39f 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/v7/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 17bdbf10e6e..9c00332ad43 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 3e9d45bb2fe..fef79770f42 100644 --- a/integration/v7/isolated/unbind_route_service_command_test.go +++ b/integration/v7/isolated/unbind_route_service_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "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 00e8e66fe9f..94f887989ed 100644 --- a/integration/v7/isolated/unbind_service_command_test.go +++ b/integration/v7/isolated/unbind_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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" . "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 7143031a98b..c3c73d3e8f4 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 b1f1a2ea4a1..ea08cd34f8d 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/v7/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 bfec66787c1..872764b46ea 100644 --- a/integration/v7/isolated/unset_label_command_test.go +++ b/integration/v7/isolated/unset_label_command_test.go @@ -4,10 +4,10 @@ import ( "fmt" "regexp" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" - . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - "code.cloudfoundry.org/cli/integration/helpers" + . "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/integration/helpers" . "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 c8710d15e57..ebc6a43affc 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/v7/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 54eea9df6d4..b50a9e85979 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 1b26ff90467..32aff26aa74 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/v7/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 aa30eea5552..4f3c07d82ec 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/v7/cf/util/testhelpers/matchers" + "code.cloudfoundry.org/cli/v7/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 eaf408b4a57..93c8dd9e775 100644 --- a/integration/v7/isolated/update_org_quota_command_test.go +++ b/integration/v7/isolated/update_org_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 0dbbdfa2adf..1ce3ff92af7 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 a48d0241c26..248008fcb5a 100644 --- a/integration/v7/isolated/update_service_command_test.go +++ b/integration/v7/isolated/update_service_command_test.go @@ -1,15 +1,10 @@ package isolated import ( - "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - "code.cloudfoundry.org/cli/integration/helpers" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/onsi/gomega/gbytes" - . "github.com/onsi/gomega/gexec" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" ) var _ = Describe("update-service command", func() { diff --git a/integration/v7/isolated/update_space_quota_command_test.go b/integration/v7/isolated/update_space_quota_command_test.go index 48d5d07ee29..137066d7784 100644 --- a/integration/v7/isolated/update_space_quota_command_test.go +++ b/integration/v7/isolated/update_space_quota_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - "code.cloudfoundry.org/cli/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 3622b18269c..2c740497851 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/v7/integration/helpers" . "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 191b1e9334b..2998c196140 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/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/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 0317157618e..8dcaf2d9ddd 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/v7/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 3a9ab46d746..c9dbdc45b94 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/v7/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 0e676f96dae..9995953562e 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/v7/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 4ef425fa18d..dbddcfdd8df 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/v7/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 c53fb699453..98bfdb9f2b5 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/v7/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 6cdce941a64..d9ea2a5cec2 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/v7/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 cf7378bc802..94bf249ea35 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/v7/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 0e60a5ebe6e..19d16bb84db 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/v7/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 997b048908a..c67ad1d618e 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/v7/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 877a33f89c0..377b7dc769d 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/v7/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 3384ad5b230..2d29864ca91 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/v7/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 d4387b2b328..e652ef4bccd 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/v7/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 2564e031d6a..51c41b03ad5 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/v7/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 7390c4cc64b..3a98e52f6aa 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/v7/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 c26a7d71be6..161e234bd1b 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/v7/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 0b577371f7f..10680d2b940 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/v7/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 28fbe161965..3c8baa07dca 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/v7/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 a776ee0eb50..a898fc8fb17 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/v7/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 e95975427cc..5fb1db54a14 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/v7/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 b17fd4fd01b..1d8c2ccea0f 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/v7/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 06eebc8b5fe..bf62e49e6df 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/v7/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 03224742ce9..9beb6bf9637 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/v7/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 ebd30ce219f..cb372043038 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/v7/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 f50d7e4c2a4..5035ed34cad 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/v7/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 9364f9c3424..9a643483991 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/v7/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 689faf5244f..af9b2a82d3e 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/v7/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 3b94b4496cd..ce5e48ad52b 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/v7/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 9fc5a0e378b..61fe458bcd0 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/v7/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 efe675f513f..35dfefdaba2 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/v7/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 f79ef305b2b..7e28c903a77 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/v7/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 37339d753fd..749853eb8d4 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/v7/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 e109f058eb8..c1cbc699c56 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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" ) diff --git a/integration/v7/push/tasks_test.go b/integration/v7/push/tasks_test.go index 4b85976ea2a..0dbd8ab23b9 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/v7/integration/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/main.go b/main.go index 1347aff23b8..6f550e99fcc 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/v7/cf/cmd" + "code.cloudfoundry.org/cli/v7/command/common" + "code.cloudfoundry.org/cli/v7/util/command_parser" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/panichandler" + plugin_util "code.cloudfoundry.org/cli/v7/util/plugin" + "code.cloudfoundry.org/cli/v7/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 d1a902997d8..9523dc7e213 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/v7/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 b2f1f8113ac..8527c4ae3a4 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/v7/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 b3662d08644..2d89661a90f 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/v7/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/v7/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/v7/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 3a0e8f46215..f9cbf9290e9 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/v7/plugin" ) type PluginDemonstratingParams struct { diff --git a/plugin/plugin_examples/interactive.go b/plugin/plugin_examples/interactive.go index 3f45d0983f2..c1fe16da863 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/v7/plugin" ) type Interactive struct{} diff --git a/plugin/plugin_examples/multiple_commands.go b/plugin/plugin_examples/multiple_commands.go index d74b7026f49..db9ea0efef2 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/v7/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 bda8800a64b..058d73e1058 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 @@ -9,8 +9,8 @@ import ( "fmt" "os" - "code.cloudfoundry.org/cli/cf/flags" - "code.cloudfoundry.org/cli/plugin" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/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 182bf14c795..ac55bb4dcdb 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/v7/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 26bf1c7ed4c..55a467817f1 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/v7/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/v7/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v7/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 24b49226655..33c7ca804a2 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/v7/cf/util/testhelpers/rpcserver" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/rpcserver/rpcserverfakes" + "code.cloudfoundry.org/cli/v7/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 8076cb8955e..ae2cdd50316 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/v7/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 2c439c1a8cc..310e915c645 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/v7/plugin" + plugin_models "code.cloudfoundry.org/cli/v7/plugin/models" ) type FakeCliConnection struct { diff --git a/plugin/rpc/call_command_registry.go b/plugin/rpc/call_command_registry.go index cb83f95e9d9..7afb828728d 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/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 6d21be85aa9..8fcd60a2a61 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/terminal/terminalfakes" + "code.cloudfoundry.org/cli/v7/cf/trace/tracefakes" + . "code.cloudfoundry.org/cli/v7/plugin/rpc" + . "code.cloudfoundry.org/cli/v7/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 34241693b2c..e093661de33 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/terminal" + "code.cloudfoundry.org/cli/v7/plugin" + plugin_models "code.cloudfoundry.org/cli/v7/plugin/models" + "code.cloudfoundry.org/cli/v7/version" "github.com/blang/semver/v4" - "code.cloudfoundry.org/cli/cf/trace" + "code.cloudfoundry.org/cli/v7/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 5f55b1594d3..dc4921ca61e 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/v7/cf/api" + "code.cloudfoundry.org/cli/v7/cf/api/authentication/authenticationfakes" + "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" + "code.cloudfoundry.org/cli/v7/cf/models" + "code.cloudfoundry.org/cli/v7/cf/terminal" + testconfig "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/configuration" + "code.cloudfoundry.org/cli/v7/plugin" + plugin_models "code.cloudfoundry.org/cli/v7/plugin/models" + . "code.cloudfoundry.org/cli/v7/plugin/rpc" + cmdRunner "code.cloudfoundry.org/cli/v7/plugin/rpc" + . "code.cloudfoundry.org/cli/v7/plugin/rpc/fakecommand" + "code.cloudfoundry.org/cli/v7/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 a154ebde385..a8577e45d88 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type FakeCommand1 struct { diff --git a/plugin/rpc/fakecommand/fake_command2.go b/plugin/rpc/fakecommand/fake_command2.go index d329e6c3c4f..a09c497e2fe 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" + "code.cloudfoundry.org/cli/v7/cf/terminal" ) type FakeCommand2 struct { diff --git a/plugin/rpc/fakecommand/fake_command3.go b/plugin/rpc/fakecommand/fake_command3.go index b13505d7b29..03f78a0fab6 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/cf/requirements" ) type FakeCommand3 struct { diff --git a/plugin/rpc/fakecommand/fake_command4.go b/plugin/rpc/fakecommand/fake_command4.go index e5b11eb8863..70c41853bdd 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/cf/flags" + "code.cloudfoundry.org/cli/v7/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 e67a82a6263..c2695062d53 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/v7/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 fa70fde8646..b50ed8307bf 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/v7/cf/commandregistry" + "code.cloudfoundry.org/cli/v7/plugin/rpc" ) type FakeCommandRunner struct { diff --git a/plugin/rpc/rpcfakes/fake_output_capture.go b/plugin/rpc/rpcfakes/fake_output_capture.go index 9d37d2ef93d..ed508b1cc75 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/v7/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 58e4cf01e7e..c1bccddae71 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/v7/plugin/rpc" ) type FakeTerminalOutputSwitch struct { diff --git a/plugin/rpc/run_plugin.go b/plugin/rpc/run_plugin.go index 295184628f7..15548747055 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/v7/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 ffac5683f3a..90cf4ee8a0d 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/v7/cf/cmd" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/util/configv3" ) func RunPlugin(plugin configv3.Plugin, _ command.UI) error { diff --git a/resources/application_resource.go b/resources/application_resource.go index b7b5c782557..6b31908c1a2 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" ) // Application represents a Cloud Controller V3 Application. diff --git a/resources/build_resource.go b/resources/build_resource.go index e190de90a6a..67f3e3aba2e 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/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 04d29e271c2..3bfb4255e51 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/types" ) // Buildpack represents a Cloud Controller V3 buildpack. diff --git a/resources/deployment_resource.go b/resources/deployment_resource.go index 144ac076426..7612347dca3 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" ) type Deployment struct { diff --git a/resources/domain_resource.go b/resources/domain_resource.go index 35dda7d0d7b..dc8ae6ab5f8 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/v7/types" "code.cloudfoundry.org/jsonry" ) diff --git a/resources/droplet_resource.go b/resources/droplet_resource.go index 27dc2574f3f..00235febc22 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/v7/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 357641d2260..18c5fb9cd71 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/types" ) type EnvironmentVariables map[string]types.FilteredString diff --git a/resources/metadata_resource.go b/resources/metadata_resource.go index 414fe1427de..58b6e7bc2da 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/v7/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 c17e66a5fe7..06c853dac41 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" ) // Package represents a Cloud Controller V3 Package. diff --git a/resources/process_resource.go b/resources/process_resource.go index 5376f8e6ab6..9e4760c47ac 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/types" ) type Process struct { diff --git a/resources/process_resource_test.go b/resources/process_resource_test.go index 2baed2ad7ad..3f784eb871b 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/v7/api/cloudcontroller/ccv3/constant" + "code.cloudfoundry.org/cli/v7/resources" + "code.cloudfoundry.org/cli/v7/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 f78ec80699b..2ae988c4848 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/v7/types" ) type Quota struct { diff --git a/resources/quota_resource_test.go b/resources/quota_resource_test.go index 503130bbd6d..5744cb96f7b 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/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/relationship_resource.go b/resources/relationship_resource.go index 322fe2a2b4a..151bf53118c 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/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 48963678a61..747de6dbf9f 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/v7/api/cloudcontroller" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" ) // IncludedUsers represent a set of users included on an API response. diff --git a/resources/route_resource.go b/resources/route_resource.go index 1a7d20f2d1e..9bd53a31fa1 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/v7/api/cloudcontroller" ) type RouteDestinationApp struct { diff --git a/resources/security_group_resource_test.go b/resources/security_group_resource_test.go index b4e5e284f0c..d129034cfcc 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/v7/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 024346b08d3..4f81bdb48cf 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/v7/resources" + "code.cloudfoundry.org/cli/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_instance_resource_test.go b/resources/service_instance_resource_test.go index 78c1480ea6e..9fd2fa39e4d 100644 --- a/resources/service_instance_resource_test.go +++ b/resources/service_instance_resource_test.go @@ -3,7 +3,7 @@ package resources_test import ( "encoding/json" - . "code.cloudfoundry.org/cli/resources" + . "code.cloudfoundry.org/cli/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_offering_resource_test.go b/resources/service_offering_resource_test.go index c999a4a1664..28ee47837da 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/v7/resources" + "code.cloudfoundry.org/cli/v7/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 8e51b8e05a6..ab2c1ce024d 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/v7/resources" + "code.cloudfoundry.org/cli/v7/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 7661b0f9a3a..8ed2dfc23f6 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/v7/resources" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/sidecar_resource.go b/resources/sidecar_resource.go index fc3c53fcea1..da22a0e3609 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/v7/types" type Sidecar struct { GUID string `json:"guid"` diff --git a/resources/task_resource.go b/resources/task_resource.go index 4bc1f96f012..0ee45918ded 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/v7/api/cloudcontroller/ccv3/constant" ) // Task represents a Cloud Controller V3 Task. diff --git a/scripts/fly-execute-windows-integration.sh b/scripts/fly-execute-windows-integration.sh index a31ca2a625e..5c12b3782b6 100755 --- a/scripts/fly-execute-windows-integration.sh +++ b/scripts/fly-execute-windows-integration.sh @@ -15,7 +15,7 @@ CERT_DIR=cf-credentials/cert_dir source ~/workspace/cli-private/set_int_test_foundation.sh $ENV -cd $GOPATH/src/code.cloudfoundry.org/cli +cd $GOPATH/src/code.cloudfoundry.org/cli/v7 echo "Making windows..." make out/cf-cli_winx64.exe diff --git a/types/filtered_interface_test.go b/types/filtered_interface_test.go index 09da42ec708..c1fdd3fa229 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/v7/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 bb0dd23090f..7c9fe3149d2 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/v7/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 9e73bcbc917..9541f3f7f73 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/v7/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 f713e3d270a..52837cb6862 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/v7/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 455a9eec1d6..a47820b6949 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/v7/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 ddeca89c2be..23095f18044 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/v7/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 884a69d3113..ba7a39de3a3 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/v7/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/batcher/batcher.go b/util/batcher/batcher.go index ad5ad47e8d3..e92de0097eb 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/v7/api/cloudcontroller/ccv3" const BatchSize = 200 diff --git a/util/batcher/batcher_test.go b/util/batcher/batcher_test.go index dc25ff98ff0..ac75f1ac920 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/v7/cf/errors" - "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - "code.cloudfoundry.org/cli/util/batcher" + "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" + "code.cloudfoundry.org/cli/v7/util/batcher" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/checksum_test.go b/util/checksum_test.go index 4dcade05947..80981a26e33 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/v7/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 dbd41adab16..5a8b58109bf 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/v7/util/clissh" ) type FakeListenerFactory struct { diff --git a/util/clissh/clisshfakes/fake_secure_client.go b/util/clissh/clisshfakes/fake_secure_client.go index f4643d96839..f2b5238af46 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/v7/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 18d537a5448..1efb6ee95be 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/v7/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 9c9f57c01b7..e13197cc1b9 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/v7/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 3128914d983..09091440d55 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/v7/util/clissh" "github.com/moby/term" ) diff --git a/util/clissh/ssh.go b/util/clissh/ssh.go index a6f32ce7115..65ef74467c7 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/v7/cf/ssh/sigwinch" + "code.cloudfoundry.org/cli/v7/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 5b7a2a7c2a9..ba48a0f1566 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/v7/util/clissh" + "code.cloudfoundry.org/cli/v7/util/clissh/clisshfakes" + "code.cloudfoundry.org/cli/v7/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 01edba4f87d..637fe3250fd 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/v7/cf/cmd" + "code.cloudfoundry.org/cli/v7/command" + "code.cloudfoundry.org/cli/v7/command/common" + "code.cloudfoundry.org/cli/v7/command/flag" + "code.cloudfoundry.org/cli/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" "github.com/jessevdk/go-flags" log "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" @@ -224,7 +224,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 e12c3735297..949626a3de2 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/v7/command/common" + "code.cloudfoundry.org/cli/v7/util/command_parser" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/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 1f1800dd2d1..e5238bb55ce 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/v7/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 72374f060e3..b4675fe4a0d 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/v7/cf/util/spellcheck" + "code.cloudfoundry.org/cli/v7/command/common" ) type UnknownCommandError struct { diff --git a/util/configv3/color_test.go b/util/configv3/color_test.go index d3ae227e00a..ce53ce55c40 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/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config.go b/util/configv3/config.go index eeb6da99ea9..65f303606b6 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/v7/version" ) // Config combines the settings taken from the .cf/config.json, os.ENV, and the diff --git a/util/configv3/config_suite_test.go b/util/configv3/config_suite_test.go index cb2416295a2..a35702dcd4b 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/v7/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 8a13fd6baf6..d0f747200f0 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/v7/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 1d06e71acc2..c06a856127a 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/v7/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 e478e4da39a..8aa292dcddb 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/v7/util/configv3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/configv3/env_test.go b/util/configv3/env_test.go index 0f7a060f6cd..a11a192c325 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/v7/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 10f148c97ea..7517cb98f32 100644 --- a/util/configv3/json_config_test.go +++ b/util/configv3/json_config_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - . "code.cloudfoundry.org/cli/util/configv3" + . "code.cloudfoundry.org/cli/v7/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 2134f94ca89..e66cccf9c2c 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/v7/command/translatableerror" "golang.org/x/term" ) diff --git a/util/configv3/load_config_test.go b/util/configv3/load_config_test.go index b8321eea92f..cb490dc8769 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/integration/helpers" + "code.cloudfoundry.org/cli/v7/util/configv3" + . "code.cloudfoundry.org/cli/v7/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 53d2c3b77c8..eb2b6e6f1fc 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/v7/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 4ed60b41e41..391cf57f320 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/v7/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 a084b71f563..eb2afe35574 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/v7/util" ) const notApplicable = "N/A" diff --git a/util/configv3/plugins_config_test.go b/util/configv3/plugins_config_test.go index 7a5ce1a0d2b..427f07e172a 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/v7/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 3b8760de7e9..9b250727d93 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/v7/util/configv3" "gopkg.in/yaml.v2" . "github.com/onsi/ginkgo/v2" diff --git a/util/download/downloader.go b/util/download/downloader.go index e779e84c6d7..56c9c217831 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/v7/util" ) type Downloader struct { diff --git a/util/download/downloader_test.go b/util/download/downloader_test.go index 44dbfc550c2..0fe718a7680 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/v7/util/download" + "code.cloudfoundry.org/cli/v7/util/download/downloadfakes" ) var _ = Describe("Downloader", func() { diff --git a/util/download/downloadfakes/fake_httpclient.go b/util/download/downloadfakes/fake_httpclient.go index 1d37dec2fd4..786a66d75f0 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/v7/util/download" ) type FakeHTTPClient struct { diff --git a/util/download/downloadfakes/fake_progress_bar.go b/util/download/downloadfakes/fake_progress_bar.go index c23e09c6012..4d10ec678c4 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/v7/util/download" pb "gopkg.in/cheggaaa/pb.v1" ) diff --git a/util/generic/architecture_test.go b/util/generic/architecture_test.go index 1dc8775d3dd..18f9f1d13e2 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/v7/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 d6700b0456d..4378b640420 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/v7/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 95fd6a4b8d2..2587b71942e 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/v7/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 9b51c82a3d6..fef76fca410 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/v7/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 48403e9b3ba..f2c22cd0fe4 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/v7/util/generic" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/manifest/application.go b/util/manifest/application.go index b748c1753f0..f83c25909fb 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/v7/types" ) type Application struct { diff --git a/util/manifest/manifest_test.go b/util/manifest/manifest_test.go index fbbe5f419bc..0147ab10087 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/v7/types" + . "code.cloudfoundry.org/cli/v7/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 e4a5db67e55..5e640466166 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/v7/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 d425c419208..33122a34add 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/v7/util/manifest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/manifestparser/application.go b/util/manifestparser/application.go index 8d5c96fde0a..f7e363b98b8 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/v7/api/cloudcontroller/ccv3/constant" ) type Docker struct { diff --git a/util/manifestparser/application_test.go b/util/manifestparser/application_test.go index 530ee8e6800..de24a6a0b94 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/v7/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 120a28fa3c2..7b998b720c2 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/v7/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 0a8fcde3db9..6f346bfa37a 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/v7/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 7005a2b36fd..eb6715d373b 100644 --- a/util/manifestparser/parser_test.go +++ b/util/manifestparser/parser_test.go @@ -7,7 +7,7 @@ import ( "gopkg.in/yaml.v2" - . "code.cloudfoundry.org/cli/util/manifestparser" + . "code.cloudfoundry.org/cli/v7/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" diff --git a/util/manifestparser/process.go b/util/manifestparser/process.go index 426c7d0270c..c74005a30e9 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/v7/api/cloudcontroller/ccv3/constant" ) type Process struct { diff --git a/util/manifestparser/process_test.go b/util/manifestparser/process_test.go index b41a4b11276..af520026aad 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/v7/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 73e0c1faddb..c8f4aa31e1f 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/v7/version" ) const maxStackSizeLimit = 1024 * 1024 @@ -26,9 +26,9 @@ func HandlePanic() { variable CF_TRACE set to true. Also, please update to the latest cli and try the command again: - https://code.cloudfoundry.org/cli/releases + https://code.cloudfoundry.org/cli/v7/releases - Please create an issue at: https://code.cloudfoundry.org/cli/issues + Please create an issue at: https://code.cloudfoundry.org/cli/v7/issues Include the below information when creating the issue: diff --git a/util/plugin/plugin.go b/util/plugin/plugin.go index b184d598df6..9b0eefcb8c0 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/v7/plugin/transition" + "code.cloudfoundry.org/cli/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" - "code.cloudfoundry.org/cli/command/common" - "code.cloudfoundry.org/cli/command/translatableerror" + "code.cloudfoundry.org/cli/v7/command/common" + "code.cloudfoundry.org/cli/v7/command/translatableerror" ) var ErrFailed = errors.New("command failed") diff --git a/util/randomword/generator_test.go b/util/randomword/generator_test.go index 944d4abe51d..61f4fe3f651 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/v7/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 14756731ac8..eea6498781b 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/v7/util/sorting" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/tls_test.go b/util/tls_test.go index 6ca055dda20..70a1de448f5 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/v7/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/ui/config.go b/util/ui/config.go index f17cd6e3802..b35aa8eb392 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/v7/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 559a0e6db22..d345271cbf8 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/v7/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 01f85f7d09b..3b37e8c952c 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/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 66790b582c7..ef1e22475e1 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/v7/util/configv3" + . "code.cloudfoundry.org/cli/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 1234e003aa7..04ea5b036cf 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/v7/util/configv3" + . "code.cloudfoundry.org/cli/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 780497bec0d..2c336dadd38 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/v7/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 77b780954f3..ce0783edcac 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/v7/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 bf8a1085582..e2c63ac2909 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/v7/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 aeef5fe9578..ca0fb9ffad3 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/v7/util/configv3" + . "code.cloudfoundry.org/cli/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 b4d7cd7b383..44526d15096 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/v7/command/translatableerror" + "code.cloudfoundry.org/cli/v7/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 7051f807698..f50f845d4f9 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/v7/util/configv3" + . "code.cloudfoundry.org/cli/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 1cffd9deb51..c63c2cf9869 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/v7/types" "github.com/fatih/color" ) diff --git a/util/ui/ui_for_push_test.go b/util/ui/ui_for_push_test.go index 92738b8b40e..c2a5f28325a 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/v7/types" + "code.cloudfoundry.org/cli/v7/util/configv3" + . "code.cloudfoundry.org/cli/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 da63a0449d0..b2b8df804d2 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/v7/command/translatableerror/translatableerrorfakes" + "code.cloudfoundry.org/cli/v7/util/configv3" + . "code.cloudfoundry.org/cli/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 f33445c1a60..d4bb7947869 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/v7/util/configv3" + . "code.cloudfoundry.org/cli/v7/util/ui" + "code.cloudfoundry.org/cli/v7/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 5655557c2c2..749a0d312df 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/v7/util/configv3" + "code.cloudfoundry.org/cli/v7/util/ui" ) type FakeConfig struct { diff --git a/util/ui/uifakes/fake_exiter.go b/util/ui/uifakes/fake_exiter.go index 378af6b6419..ecb7eda5890 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/v7/util/ui" ) type FakeExiter struct { diff --git a/util/ui/uifakes/fake_interactor.go b/util/ui/uifakes/fake_interactor.go index 3f2d8ca5e34..5b53fb095b5 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/v7/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 6bd60bc2bd9..603ffc7c9d4 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/v7/util/ui" ) type FakeLogMessage struct { diff --git a/util/ui/uifakes/fake_resolver.go b/util/ui/uifakes/fake_resolver.go index 9285aeff036..54a16395e40 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/v7/util/ui" ) type FakeResolver struct { diff --git a/util/url_test.go b/util/url_test.go index 2a4cf89d2e8..f070d4f02c6 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/v7/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 b26eeb24fdd..2acb609042f 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/v7/util" ) type FakeSha1Checksum struct { diff --git a/util/v6manifestparser/application_test.go b/util/v6manifestparser/application_test.go index c07f3a9298f..cb89c2d4c3a 100644 --- a/util/v6manifestparser/application_test.go +++ b/util/v6manifestparser/application_test.go @@ -1,7 +1,7 @@ package v6manifestparser_test import ( - . "code.cloudfoundry.org/cli/util/v6manifestparser" + . "code.cloudfoundry.org/cli/v7/util/v6manifestparser" "gopkg.in/yaml.v2" . "github.com/onsi/ginkgo/v2" diff --git a/util/v6manifestparser/locator_test.go b/util/v6manifestparser/locator_test.go index 4b83aeda0a2..573171f7746 100644 --- a/util/v6manifestparser/locator_test.go +++ b/util/v6manifestparser/locator_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - . "code.cloudfoundry.org/cli/util/v6manifestparser" + . "code.cloudfoundry.org/cli/v7/util/v6manifestparser" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/v6manifestparser/parser_test.go b/util/v6manifestparser/parser_test.go index f7703ffbdb5..a34ce94cff8 100644 --- a/util/v6manifestparser/parser_test.go +++ b/util/v6manifestparser/parser_test.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "code.cloudfoundry.org/cli/util/v6manifestparser" + "code.cloudfoundry.org/cli/v7/cf/util/testhelpers/matchers" + . "code.cloudfoundry.org/cli/v7/util/v6manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/version/version_test.go b/version/version_test.go index 2d1c3337403..03b7220eb1f 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/v7/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) From 537bc3dc5b5a1a562963df2e901881f759d9ea9a Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:21:31 +0200 Subject: [PATCH 2/4] revert import cleanup from IDE tidying up --- integration/helpers/servicebrokerstub/app_config.go | 1 + integration/v7/isolated/marketplace_command_test.go | 5 +++++ integration/v7/isolated/service_command_test.go | 5 +++++ integration/v7/isolated/services_command_test.go | 5 +++++ integration/v7/isolated/update_service_command_test.go | 5 +++++ 5 files changed, 21 insertions(+) diff --git a/integration/helpers/servicebrokerstub/app_config.go b/integration/helpers/servicebrokerstub/app_config.go index 08f62acc2cc..5e55f1da7af 100644 --- a/integration/helpers/servicebrokerstub/app_config.go +++ b/integration/helpers/servicebrokerstub/app_config.go @@ -9,6 +9,7 @@ import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" "code.cloudfoundry.org/cli/v7/integration/helpers" + . "github.com/onsi/gomega" ) func newDefaultConfig() *ServiceBrokerStub { diff --git a/integration/v7/isolated/marketplace_command_test.go b/integration/v7/isolated/marketplace_command_test.go index fbfb822c413..1b91edaf6b5 100644 --- a/integration/v7/isolated/marketplace_command_test.go +++ b/integration/v7/isolated/marketplace_command_test.go @@ -7,6 +7,11 @@ import ( "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gbytes" + . "github.com/onsi/gomega/gexec" ) var _ = Describe("marketplace command", func() { diff --git a/integration/v7/isolated/service_command_test.go b/integration/v7/isolated/service_command_test.go index 54a86dab01c..56dbc3db494 100644 --- a/integration/v7/isolated/service_command_test.go +++ b/integration/v7/isolated/service_command_test.go @@ -5,6 +5,11 @@ import ( "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gbytes" + . "github.com/onsi/gomega/gexec" ) var _ = Describe("service command", func() { diff --git a/integration/v7/isolated/services_command_test.go b/integration/v7/isolated/services_command_test.go index 7af622e7c2d..6309a0ea89b 100644 --- a/integration/v7/isolated/services_command_test.go +++ b/integration/v7/isolated/services_command_test.go @@ -5,6 +5,11 @@ import ( "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gbytes" + . "github.com/onsi/gomega/gexec" ) var _ = Describe("services command", func() { diff --git a/integration/v7/isolated/update_service_command_test.go b/integration/v7/isolated/update_service_command_test.go index 248008fcb5a..5399686e737 100644 --- a/integration/v7/isolated/update_service_command_test.go +++ b/integration/v7/isolated/update_service_command_test.go @@ -5,6 +5,11 @@ import ( "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/v7/integration/helpers" "code.cloudfoundry.org/cli/v7/integration/helpers/servicebrokerstub" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gbytes" + . "github.com/onsi/gomega/gexec" ) var _ = Describe("update-service command", func() { From 3fcb4222dcf1138bfca7bb4dfa3fa51200041c76 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:32:23 +0100 Subject: [PATCH 3/4] merge cfnetworking updates from main and regenerate fakes with new package version --- .github/license/CF_NOTICE | 2 +- .../fake_cloud_controller_client.go | 28 +- .../fake_networking_client.go | 23 +- actor/cfnetworkingaction/networking_client.go | 2 +- actor/cfnetworkingaction/policy.go | 2 +- actor/cfnetworkingaction/policy_test.go | 2 +- .../pluginactionfakes/fake_command_list.go | 14 +- .../pluginactionfakes/fake_config.go | 51 +- .../pluginactionfakes/fake_plugin_client.go | 14 +- .../pluginactionfakes/fake_plugin_metadata.go | 7 +- .../fake_plugin_uninstaller.go | 7 +- .../pushactionfakes/fake_progress_bar.go | 7 +- .../fake_random_word_generator.go | 21 +- .../pushactionfakes/fake_read_closer.go | 14 +- .../pushactionfakes/fake_shared_actor.go | 35 +- .../pushactionfakes/fake_v2actor.go | 140 +- .../pushactionfakes/fake_v3actor.go | 70 +- .../sharedactionfakes/fake_config.go | 56 +- .../fake_log_cache_client.go | 7 +- .../fake_secure_shell_client.go | 35 +- .../compositefakes/fake_broker_actor.go | 14 +- .../fake_get_apiversion_actor.go | 7 +- .../fake_get_service_instance_actor.go | 7 +- .../fake_get_service_plan_actor.go | 7 +- .../compositefakes/fake_organization_actor.go | 14 +- .../compositefakes/fake_service_actor.go | 14 +- ...service_instance_maintenance_info_actor.go | 7 +- .../compositefakes/fake_visibility_actor.go | 7 +- .../fake_cloud_controller_client.go | 693 ++++---- actor/v2action/v2actionfakes/fake_config.go | 108 +- .../v2action/v2actionfakes/fake_downloader.go | 7 +- .../v2action/v2actionfakes/fake_noaaclient.go | 24 +- .../v2actionfakes/fake_router_client.go | 7 +- .../v2actionfakes/fake_simple_progress_bar.go | 10 +- .../v2action/v2actionfakes/fake_uaaclient.go | 42 +- .../v2v3actionfakes/fake_v2actor.go | 56 +- .../v2v3actionfakes/fake_v3actor.go | 42 +- .../fake_cloud_controller_client.go | 399 +++-- actor/v3action/v3actionfakes/fake_config.go | 78 +- .../v3actionfakes/fake_manifest_parser.go | 14 +- .../v3action/v3actionfakes/fake_noaaclient.go | 24 +- .../v3actionfakes/fake_shared_actor.go | 28 +- actor/v3action/v3actionfakes/fake_sshactor.go | 7 +- .../v3action/v3actionfakes/fake_uaaclient.go | 21 +- .../fake_cloud_controller_client.go | 1120 +++++++------ actor/v7action/v7actionfakes/fake_config.go | 98 +- .../v7action/v7actionfakes/fake_downloader.go | 7 +- .../v7actionfakes/fake_manifest_parser.go | 14 +- .../v7actionfakes/fake_routing_client.go | 14 +- .../v7actionfakes/fake_shared_actor.go | 28 +- .../v7actionfakes/fake_simple_progress_bar.go | 10 +- actor/v7action/v7actionfakes/fake_sshactor.go | 7 +- .../v7action/v7actionfakes/fake_uaaclient.go | 77 +- .../v7pushactionfakes/fake_progress_bar.go | 7 +- .../v7pushactionfakes/fake_read_closer.go | 14 +- .../v7pushactionfakes/fake_shared_actor.go | 35 +- .../v7pushactionfakes/fake_v2actor.go | 35 +- .../v7pushactionfakes/fake_v7actor.go | 224 +-- .../cfnetv1/cfnetv1_suite_test.go | 55 + .../cfnetv1fakes/fake_connection_wrapper.go | 188 +++ api/cfnetworking/cfnetv1/cfvnetv1.go | 3 + api/cfnetworking/cfnetv1/client.go | 138 ++ .../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.go | 6 + api/cfnetworking/cfnetworking_suite_test.go | 35 + .../cfnetworkingfakes/fake_connection.go | 113 ++ .../cfnetworkingfakes/fake_read_seeker.go | 202 +++ api/cfnetworking/connection.go | 8 + api/cfnetworking/errors.go | 64 + api/cfnetworking/errors_test.go | 36 + .../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 | 127 ++ .../networking_connection_test.go | 251 +++ api/cfnetworking/request.go | 34 + 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 | 110 ++ .../wrapper/uaa_authentication.go | 81 + .../wrapper/uaa_authentication_test.go | 174 ++ .../wrapper/util/in_memory_cache.go | 26 + api/cfnetworking/wrapper/wrapper.go | 3 + .../wrapper/wrapper_suite_test.go | 35 + .../fake_request_logger_output.go | 740 +++++++++ .../wrapper/wrapperfakes/fake_token_cache.go | 245 +++ .../wrapper/wrapperfakes/fake_uaaclient.go | 117 ++ .../ccv2/ccv2fakes/fake_connection_wrapper.go | 14 +- .../ccv2/ccv2fakes/fake_reader.go | 7 +- .../ccv3/ccv3fakes/fake_clock.go | 7 +- .../ccv3/ccv3fakes/fake_connection_wrapper.go | 14 +- .../ccv3/ccv3fakes/fake_reader.go | 7 +- .../ccv3/ccv3fakes/fake_requester.go | 44 +- .../cloudcontrollerfakes/fake_connection.go | 7 +- .../fake_request_logger_output.go | 66 +- .../wrapper/wrapperfakes/fake_token_cache.go | 20 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 7 +- api/plugin/pluginfakes/fake_connection.go | 7 +- .../pluginfakes/fake_connection_wrapper.go | 14 +- api/plugin/pluginfakes/fake_proxy_reader.go | 13 +- .../fake_request_logger_output.go | 66 +- api/router/routerfakes/fake_connection.go | 7 +- .../routerfakes/fake_connection_wrapper.go | 14 +- .../fake_request_logger_output.go | 66 +- .../wrapper/wrapperfakes/fake_token_cache.go | 20 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 7 +- api/uaa/client.go | 9 - .../noaabridgefakes/fake_token_cache.go | 13 +- .../noaabridgefakes/fake_uaaclient.go | 7 +- api/uaa/uaafakes/fake_config.go | 59 +- api/uaa/uaafakes/fake_connection.go | 7 +- api/uaa/uaafakes/fake_connection_wrapper.go | 14 +- .../fake_request_logger_output.go | 66 +- .../wrapper/wrapperfakes/fake_token_cache.go | 20 +- .../wrapper/wrapperfakes/fake_uaaclient.go | 7 +- cf/actors/actorsfakes/fake_push_actor.go | 35 +- cf/actors/actorsfakes/fake_route_actor.go | 56 +- cf/actors/actorsfakes/fake_service_actor.go | 7 +- .../actorsfakes/fake_service_plan_actor.go | 35 +- .../brokerbuilderfakes/fake_broker_builder.go | 35 +- .../planbuilderfakes/fake_plan_builder.go | 49 +- .../fake_plugin_installer.go | 7 +- .../fake_service_builder.go | 98 +- .../userprintfakes/fake_user_printer.go | 3 +- .../apifakes/fake_app_summary_repository.go | 14 +- .../fake_buildpack_bits_repository.go | 14 +- cf/api/apifakes/fake_buildpack_repository.go | 49 +- cf/api/apifakes/fake_client_repository.go | 7 +- cf/api/apifakes/fake_curl_repository.go | 7 +- cf/api/apifakes/fake_domain_repository.go | 63 +- cf/api/apifakes/fake_route_repository.go | 63 +- .../fake_route_service_binding_repository.go | 14 +- cf/api/apifakes/fake_routing_apirepository.go | 7 +- .../fake_service_auth_token_repository.go | 35 +- .../fake_service_binding_repository.go | 21 +- .../fake_service_broker_repository.go | 49 +- .../apifakes/fake_service_key_repository.go | 28 +- .../apifakes/fake_service_plan_repository.go | 21 +- ...fake_service_plan_visibility_repository.go | 28 +- cf/api/apifakes/fake_service_repository.go | 126 +- .../fake_service_summary_repository.go | 7 +- ...er_provided_service_instance_repository.go | 21 +- cf/api/apifakes/fake_user_repository.go | 98 +- .../appeventsfakes/fake_repository.go | 7 +- .../appfiles/appfilesfakes/fake_repository.go | 7 +- .../appinstancesfakes/fake_repository.go | 14 +- .../applicationbitsfakes/fake_repository.go | 14 +- .../applicationsfakes/fake_repository.go | 63 +- .../authenticationfakes/fake_repository.go | 41 +- .../fake_token_refresher.go | 7 +- .../fake_repository.go | 7 +- .../fake_repository.go | 28 +- .../fake_feature_flag_repository.go | 21 +- cf/api/logs/logsfakes/fake_color_logger.go | 21 +- cf/api/logs/logsfakes/fake_loggable.go | 21 +- cf/api/logs/logsfakes/fake_repository.go | 13 +- .../fake_organization_repository.go | 56 +- .../password/passwordfakes/fake_repository.go | 7 +- .../quotasfakes/fake_quota_repository.go | 42 +- .../runningfakes/fake_security_groups_repo.go | 21 +- .../stagingfakes/fake_security_groups_repo.go | 21 +- .../fake_security_group_repo.go | 35 +- .../fake_security_group_space_binder.go | 14 +- .../fake_space_quota_repository.go | 63 +- .../spacesfakes/fake_space_repository.go | 56 +- .../stacksfakes/fake_stack_repository.go | 21 +- cf/appfiles/appfilesfakes/fake_app_files.go | 28 +- cf/appfiles/appfilesfakes/fake_cf_ignore.go | 7 +- cf/appfiles/appfilesfakes/fake_zipper.go | 28 +- .../commandregistryfakes/fake_command.go | 28 +- .../fake_random_word_generator.go | 7 +- .../applicationfakes/fake_displayer.go | 7 +- .../applicationfakes/fake_restarter.go | 35 +- .../applicationfakes/fake_staging_watcher.go | 7 +- .../applicationfakes/fake_starter.go | 38 +- .../applicationfakes/fake_stopper.go | 35 +- .../commandsfakes/fake_sshcode_getter.go | 35 +- cf/commands/route/routefakes/fake_creator.go | 7 +- .../service/servicefakes/fake_binder.go | 7 +- .../fake_route_service_unbinder.go | 7 +- .../user/userfakes/fake_org_role_setter.go | 35 +- .../user/userfakes/fake_space_role_setter.go | 35 +- .../configurationfakes/fake_data_interface.go | 14 +- .../configurationfakes/fake_persistor.go | 24 +- .../fake_endpoint_repository.go | 7 +- .../coreconfigfakes/fake_read_writer.go | 311 ++-- .../coreconfigfakes/fake_repository.go | 314 ++-- .../fake_plugin_configuration.go | 27 +- cf/errors/errorsfakes/fake_httperror.go | 21 +- cf/manifest/manifestfakes/fake_app.go | 50 +- cf/manifest/manifestfakes/fake_repository.go | 7 +- cf/net/netfakes/fake_httpclient_interface.go | 20 +- .../netfakes/fake_request_dumper_interface.go | 6 +- cf/net/netfakes/fake_warning_producer.go | 7 +- .../fake_application_requirement.go | 14 +- .../fake_buildpack_requirement.go | 14 +- .../fake_config_refresher.go | 7 +- .../fake_deaapplication_requirement.go | 14 +- .../fake_domain_requirement.go | 14 +- .../requirementsfakes/fake_factory.go | 128 +- .../fake_organization_requirement.go | 17 +- .../requirementsfakes/fake_requirement.go | 7 +- .../fake_service_instance_requirement.go | 14 +- .../fake_space_requirement.go | 17 +- .../fake_targeted_org_requirement.go | 14 +- .../fake_user_requirement.go | 14 +- cf/ssh/sshfakes/fake_listener_factory.go | 7 +- cf/ssh/sshfakes/fake_secure_client.go | 35 +- cf/ssh/sshfakes/fake_secure_dialer.go | 7 +- cf/ssh/sshfakes/fake_secure_session.go | 63 +- cf/ssh/sshfakes/fake_secure_shell.go | 35 +- .../terminalfakes/fake_terminal_helper.go | 42 +- cf/terminal/terminalfakes/fake_ui.go | 80 +- cf/trace/tracefakes/fake_printer.go | 16 +- .../rpcserver/rpcserverfakes/fake_handlers.go | 210 +-- command/commandfakes/fake_config.go | 371 +++-- command/commandfakes/fake_shared_actor.go | 42 +- command/commandfakes/fake_ui.go | 159 +- command/common/commonfakes/fake_help_actor.go | 14 +- .../commonfakes/fake_install_plugin_actor.go | 70 +- .../pluginfakes/fake_add_plugin_repo_actor.go | 7 +- .../plugin/pluginfakes/fake_plugins_actor.go | 7 +- .../fake_uninstall_plugin_actor.go | 7 +- .../fake_translatable_error.go | 14 +- command/v6/shared/new_networking_client.go | 6 +- .../fake_application_summary_actor.go | 14 +- .../v6/shared/sharedfakes/fake_v2app_actor.go | 14 +- .../sharedfakes/fake_v3app_summary_actor.go | 7 +- command/v6/v6fakes/fake_bind_service_actor.go | 14 +- .../v6/v6fakes/fake_create_service_actor.go | 7 +- .../v6fakes/fake_create_service_key_actor.go | 7 +- command/v6/v6fakes/fake_service_actor.go | 21 +- .../v6fakes/fake_service_instances_actor.go | 14 +- .../v6/v6fakes/fake_share_service_actor.go | 21 +- .../v6/v6fakes/fake_unbind_service_actor.go | 7 +- .../v6/v6fakes/fake_unshare_service_actor.go | 14 +- .../v6/v6fakes/fake_update_service_actor.go | 21 +- ...fake_update_user_provided_service_actor.go | 14 +- .../v6fakes/fake_v3cancel_zdt_push_actor.go | 7 +- .../fake_v3zero_downtime_restart_actor.go | 35 +- command/v7/shared/new_networking_client.go | 6 +- .../v7/shared/sharedfakes/fake_app_stager.go | 21 +- command/v7/v7fakes/fake_actor.go | 1438 ++++++++++------- command/v7/v7fakes/fake_actor_reloader.go | 7 +- command/v7/v7fakes/fake_label_setter.go | 7 +- command/v7/v7fakes/fake_label_unsetter.go | 7 +- command/v7/v7fakes/fake_manifest_locator.go | 7 +- command/v7/v7fakes/fake_manifest_parser.go | 14 +- .../v7/v7fakes/fake_network_policies_actor.go | 14 +- command/v7/v7fakes/fake_networking_actor.go | 7 +- command/v7/v7fakes/fake_progress_bar.go | 13 +- command/v7/v7fakes/fake_push_actor.go | 21 +- .../fake_remove_network_policy_actor.go | 7 +- command/v7/v7fakes/fake_revisions_actor.go | 7 +- command/v7/v7fakes/fake_set_label_actor.go | 70 +- command/v7/v7fakes/fake_shared_sshactor.go | 7 +- command/v7/v7fakes/fake_v7actor_for_push.go | 35 +- go.mod | 2 - go.sum | 4 - plugin/pluginfakes/fake_cli_connection.go | 189 ++- plugin/rpc/rpcfakes/fake_command_runner.go | 7 +- plugin/rpc/rpcfakes/fake_output_capture.go | 3 +- .../rpcfakes/fake_terminal_output_switch.go | 3 +- .../clisshfakes/fake_listener_factory.go | 7 +- util/clissh/clisshfakes/fake_secure_client.go | 35 +- util/clissh/clisshfakes/fake_secure_dialer.go | 7 +- .../clissh/clisshfakes/fake_secure_session.go | 63 +- .../clisshfakes/fake_terminal_helper.go | 35 +- .../download/downloadfakes/fake_httpclient.go | 7 +- .../downloadfakes/fake_progress_bar.go | 24 +- util/ui/uifakes/fake_config.go | 28 +- util/ui/uifakes/fake_exiter.go | 3 +- util/ui/uifakes/fake_interactor.go | 7 +- util/ui/uifakes/fake_log_message.go | 35 +- util/ui/uifakes/fake_resolver.go | 13 +- util/utilfakes/fake_sha1checksum.go | 17 +- 293 files changed, 10435 insertions(+), 4708 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/cfvnetv1.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.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.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/.github/license/CF_NOTICE b/.github/license/CF_NOTICE index f923bec85c3..40c80314a7b 100644 --- a/.github/license/CF_NOTICE +++ b/.github/license/CF_NOTICE @@ -18,7 +18,7 @@ This product includes software from https://github.com/code.cloudfoundry.org/cli Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. and is licensed under the Apache License, Version 2.0. -This product includes software from https://github.com/code.cloudfoundry.org/cli/v7/tree/main/vendor/code.cloudfoundry.org/cfnetworking-cli-api that is: +This product includes software from https://github.com/code.cloudfoundry.org/cli/v7/tree/main/vendor/code.cloudfoundry.org/cli/v7/api that is: Copyright (c) 2016-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. and is licensed under the Apache License, Version 2.0. diff --git a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go index 66adc82d0af..f697d108d1c 100644 --- a/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go +++ b/actor/cfnetworkingaction/cfnetworkingactionfakes/fake_cloud_controller_client.go @@ -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 1c29a4d6798..9b594aaee1b 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/v7/actor/cfnetworkingaction" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1" ) 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/networking_client.go b/actor/cfnetworkingaction/networking_client.go index 46fe668573a..edff7cddae2 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/v7/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 d9f92bf4171..4c2049f4703 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/v7/actor/actionerror" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1" "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/v7/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/v7/resources" diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go index 7cd57eeba8d..56e0042d17a 100644 --- a/actor/cfnetworkingaction/policy_test.go +++ b/actor/cfnetworkingaction/policy_test.go @@ -9,10 +9,10 @@ import ( "code.cloudfoundry.org/cli/v7/resources" "code.cloudfoundry.org/cli/v7/util/batcher" - "code.cloudfoundry.org/cfnetworking-cli-api/cfnetworking/cfnetv1" "code.cloudfoundry.org/cli/v7/actor/actionerror" . "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction" "code.cloudfoundry.org/cli/v7/actor/cfnetworkingaction/cfnetworkingactionfakes" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1" . "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 f1a29831233..f4ef98b50ac 100644 --- a/actor/pluginaction/pluginactionfakes/fake_command_list.go +++ b/actor/pluginaction/pluginactionfakes/fake_command_list.go @@ -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 cccd4fd3f32..4e7eb88a7bd 100644 --- a/actor/pluginaction/pluginactionfakes/fake_config.go +++ b/actor/pluginaction/pluginactionfakes/fake_config.go @@ -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 18e4e7697a7..665ad65e468 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_client.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_client.go @@ -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 610d2a67cb7..cd9ee5d9110 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_metadata.go @@ -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 fbce35bb711..8189a587840 100644 --- a/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go +++ b/actor/pluginaction/pluginactionfakes/fake_plugin_uninstaller.go @@ -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/pushaction/pushactionfakes/fake_progress_bar.go b/actor/pushaction/pushactionfakes/fake_progress_bar.go index feba810ab13..fa132152e0d 100644 --- a/actor/pushaction/pushactionfakes/fake_progress_bar.go +++ b/actor/pushaction/pushactionfakes/fake_progress_bar.go @@ -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/pushaction/pushactionfakes/fake_random_word_generator.go b/actor/pushaction/pushactionfakes/fake_random_word_generator.go index 5f254f82d04..27786301b94 100644 --- a/actor/pushaction/pushactionfakes/fake_random_word_generator.go +++ b/actor/pushaction/pushactionfakes/fake_random_word_generator.go @@ -47,15 +47,16 @@ func (fake *FakeRandomWordGenerator) RandomAdjective() string { ret, specificReturn := fake.randomAdjectiveReturnsOnCall[len(fake.randomAdjectiveArgsForCall)] fake.randomAdjectiveArgsForCall = append(fake.randomAdjectiveArgsForCall, struct { }{}) + stub := fake.RandomAdjectiveStub + fakeReturns := fake.randomAdjectiveReturns fake.recordInvocation("RandomAdjective", []interface{}{}) fake.randomAdjectiveMutex.Unlock() - if fake.RandomAdjectiveStub != nil { - return fake.RandomAdjectiveStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.randomAdjectiveReturns return fakeReturns.result1 } @@ -99,15 +100,16 @@ func (fake *FakeRandomWordGenerator) RandomNoun() string { ret, specificReturn := fake.randomNounReturnsOnCall[len(fake.randomNounArgsForCall)] fake.randomNounArgsForCall = append(fake.randomNounArgsForCall, struct { }{}) + stub := fake.RandomNounStub + fakeReturns := fake.randomNounReturns fake.recordInvocation("RandomNoun", []interface{}{}) fake.randomNounMutex.Unlock() - if fake.RandomNounStub != nil { - return fake.RandomNounStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.randomNounReturns return fakeReturns.result1 } @@ -151,15 +153,16 @@ func (fake *FakeRandomWordGenerator) RandomTwoLetters() string { ret, specificReturn := fake.randomTwoLettersReturnsOnCall[len(fake.randomTwoLettersArgsForCall)] fake.randomTwoLettersArgsForCall = append(fake.randomTwoLettersArgsForCall, struct { }{}) + stub := fake.RandomTwoLettersStub + fakeReturns := fake.randomTwoLettersReturns fake.recordInvocation("RandomTwoLetters", []interface{}{}) fake.randomTwoLettersMutex.Unlock() - if fake.RandomTwoLettersStub != nil { - return fake.RandomTwoLettersStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.randomTwoLettersReturns return fakeReturns.result1 } diff --git a/actor/pushaction/pushactionfakes/fake_read_closer.go b/actor/pushaction/pushactionfakes/fake_read_closer.go index 69057530874..f42facbae7f 100644 --- a/actor/pushaction/pushactionfakes/fake_read_closer.go +++ b/actor/pushaction/pushactionfakes/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/pushaction/pushactionfakes/fake_shared_actor.go b/actor/pushaction/pushactionfakes/fake_shared_actor.go index 1b8c5819905..893dcff2d7b 100644 --- a/actor/pushaction/pushactionfakes/fake_shared_actor.go +++ b/actor/pushaction/pushactionfakes/fake_shared_actor.go @@ -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/pushaction/pushactionfakes/fake_v2actor.go b/actor/pushaction/pushactionfakes/fake_v2actor.go index 0512f6b575b..5836593c0a6 100644 --- a/actor/pushaction/pushactionfakes/fake_v2actor.go +++ b/actor/pushaction/pushactionfakes/fake_v2actor.go @@ -322,15 +322,16 @@ func (fake *FakeV2Actor) BindServiceByApplicationAndServiceInstance(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.BindServiceByApplicationAndServiceInstanceStub + fakeReturns := fake.bindServiceByApplicationAndServiceInstanceReturns fake.recordInvocation("BindServiceByApplicationAndServiceInstance", []interface{}{arg1, arg2}) fake.bindServiceByApplicationAndServiceInstanceMutex.Unlock() - if fake.BindServiceByApplicationAndServiceInstanceStub != nil { - return fake.BindServiceByApplicationAndServiceInstanceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.bindServiceByApplicationAndServiceInstanceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -384,15 +385,16 @@ func (fake *FakeV2Actor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -437,15 +439,16 @@ func (fake *FakeV2Actor) CreateApplication(arg1 v2action.Application) (v2action. fake.createApplicationArgsForCall = append(fake.createApplicationArgsForCall, struct { arg1 v2action.Application }{arg1}) + stub := fake.CreateApplicationStub + fakeReturns := fake.createApplicationReturns fake.recordInvocation("CreateApplication", []interface{}{arg1}) fake.createApplicationMutex.Unlock() - if fake.CreateApplicationStub != nil { - return fake.CreateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -504,15 +507,16 @@ func (fake *FakeV2Actor) CreateRoute(arg1 v2action.Route, arg2 bool) (v2action.R arg1 v2action.Route arg2 bool }{arg1, arg2}) + stub := fake.CreateRouteStub + fakeReturns := fake.createRouteReturns fake.recordInvocation("CreateRoute", []interface{}{arg1, arg2}) fake.createRouteMutex.Unlock() - if fake.CreateRouteStub != nil { - return fake.CreateRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -570,15 +574,16 @@ func (fake *FakeV2Actor) FindRouteBoundToSpaceWithSettings(arg1 v2action.Route) fake.findRouteBoundToSpaceWithSettingsArgsForCall = append(fake.findRouteBoundToSpaceWithSettingsArgsForCall, struct { arg1 v2action.Route }{arg1}) + stub := fake.FindRouteBoundToSpaceWithSettingsStub + fakeReturns := fake.findRouteBoundToSpaceWithSettingsReturns fake.recordInvocation("FindRouteBoundToSpaceWithSettings", []interface{}{arg1}) fake.findRouteBoundToSpaceWithSettingsMutex.Unlock() - if fake.FindRouteBoundToSpaceWithSettingsStub != nil { - return fake.FindRouteBoundToSpaceWithSettingsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.findRouteBoundToSpaceWithSettingsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -637,15 +642,16 @@ func (fake *FakeV2Actor) GetApplicationByNameAndSpace(arg1 string, arg2 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 } @@ -703,15 +709,16 @@ func (fake *FakeV2Actor) GetApplicationRoutes(arg1 string) (v2action.Routes, v2a fake.getApplicationRoutesArgsForCall = append(fake.getApplicationRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRoutesStub + fakeReturns := fake.getApplicationRoutesReturns fake.recordInvocation("GetApplicationRoutes", []interface{}{arg1}) fake.getApplicationRoutesMutex.Unlock() - if fake.GetApplicationRoutesStub != nil { - return fake.GetApplicationRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -775,15 +782,16 @@ func (fake *FakeV2Actor) GetDomainsByNameAndOrganization(arg1 []string, arg2 str arg1 []string arg2 string }{arg1Copy, arg2}) + stub := fake.GetDomainsByNameAndOrganizationStub + fakeReturns := fake.getDomainsByNameAndOrganizationReturns fake.recordInvocation("GetDomainsByNameAndOrganization", []interface{}{arg1Copy, arg2}) fake.getDomainsByNameAndOrganizationMutex.Unlock() - if fake.GetDomainsByNameAndOrganizationStub != nil { - return fake.GetDomainsByNameAndOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDomainsByNameAndOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -841,15 +849,16 @@ func (fake *FakeV2Actor) GetOrganizationDomains(arg1 string) ([]v2action.Domain, fake.getOrganizationDomainsArgsForCall = append(fake.getOrganizationDomainsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationDomainsStub + fakeReturns := fake.getOrganizationDomainsReturns fake.recordInvocation("GetOrganizationDomains", []interface{}{arg1}) fake.getOrganizationDomainsMutex.Unlock() - if fake.GetOrganizationDomainsStub != nil { - return fake.GetOrganizationDomainsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationDomainsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -908,15 +917,16 @@ func (fake *FakeV2Actor) GetServiceInstanceByNameAndSpace(arg1 string, arg2 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceInstanceByNameAndSpaceStub + fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns fake.recordInvocation("GetServiceInstanceByNameAndSpace", []interface{}{arg1, arg2}) fake.getServiceInstanceByNameAndSpaceMutex.Unlock() - if fake.GetServiceInstanceByNameAndSpaceStub != nil { - return fake.GetServiceInstanceByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -974,15 +984,16 @@ func (fake *FakeV2Actor) GetServiceInstancesByApplication(arg1 string) ([]v2acti fake.getServiceInstancesByApplicationArgsForCall = append(fake.getServiceInstancesByApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstancesByApplicationStub + fakeReturns := fake.getServiceInstancesByApplicationReturns fake.recordInvocation("GetServiceInstancesByApplication", []interface{}{arg1}) fake.getServiceInstancesByApplicationMutex.Unlock() - if fake.GetServiceInstancesByApplicationStub != nil { - return fake.GetServiceInstancesByApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstancesByApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1040,15 +1051,16 @@ func (fake *FakeV2Actor) GetStack(arg1 string) (v2action.Stack, v2action.Warning fake.getStackArgsForCall = append(fake.getStackArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetStackStub + fakeReturns := fake.getStackReturns fake.recordInvocation("GetStack", []interface{}{arg1}) fake.getStackMutex.Unlock() - if fake.GetStackStub != nil { - return fake.GetStackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1106,15 +1118,16 @@ func (fake *FakeV2Actor) GetStackByName(arg1 string) (v2action.Stack, v2action.W fake.getStackByNameArgsForCall = append(fake.getStackByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetStackByNameStub + fakeReturns := fake.getStackByNameReturns fake.recordInvocation("GetStackByName", []interface{}{arg1}) fake.getStackByNameMutex.Unlock() - if fake.GetStackByNameStub != nil { - return fake.GetStackByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStackByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1173,15 +1186,16 @@ func (fake *FakeV2Actor) MapRouteToApplication(arg1 string, arg2 string) (v2acti arg1 string arg2 string }{arg1, arg2}) + stub := fake.MapRouteToApplicationStub + fakeReturns := fake.mapRouteToApplicationReturns fake.recordInvocation("MapRouteToApplication", []interface{}{arg1, arg2}) fake.mapRouteToApplicationMutex.Unlock() - if fake.MapRouteToApplicationStub != nil { - return fake.MapRouteToApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.mapRouteToApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1236,15 +1250,16 @@ func (fake *FakeV2Actor) PollJob(arg1 v2action.Job) (v2action.Warnings, error) { fake.pollJobArgsForCall = append(fake.pollJobArgsForCall, struct { arg1 v2action.Job }{arg1}) + stub := fake.PollJobStub + fakeReturns := fake.pollJobReturns fake.recordInvocation("PollJob", []interface{}{arg1}) fake.pollJobMutex.Unlock() - if fake.PollJobStub != nil { - return fake.PollJobStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollJobReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1304,15 +1319,16 @@ func (fake *FakeV2Actor) ResourceMatch(arg1 []v2action.Resource) ([]v2action.Res fake.resourceMatchArgsForCall = append(fake.resourceMatchArgsForCall, struct { arg1 []v2action.Resource }{arg1Copy}) + stub := fake.ResourceMatchStub + fakeReturns := fake.resourceMatchReturns fake.recordInvocation("ResourceMatch", []interface{}{arg1Copy}) fake.resourceMatchMutex.Unlock() - if fake.ResourceMatchStub != nil { - return fake.ResourceMatchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4 } - fakeReturns := fake.resourceMatchReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4 } @@ -1374,15 +1390,16 @@ func (fake *FakeV2Actor) UnmapRouteFromApplication(arg1 string, arg2 string) (v2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnmapRouteFromApplicationStub + fakeReturns := fake.unmapRouteFromApplicationReturns fake.recordInvocation("UnmapRouteFromApplication", []interface{}{arg1, arg2}) fake.unmapRouteFromApplicationMutex.Unlock() - if fake.UnmapRouteFromApplicationStub != nil { - return fake.UnmapRouteFromApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unmapRouteFromApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1437,15 +1454,16 @@ func (fake *FakeV2Actor) UpdateApplication(arg1 v2action.Application) (v2action. fake.updateApplicationArgsForCall = append(fake.updateApplicationArgsForCall, struct { arg1 v2action.Application }{arg1}) + stub := fake.UpdateApplicationStub + fakeReturns := fake.updateApplicationReturns fake.recordInvocation("UpdateApplication", []interface{}{arg1}) fake.updateApplicationMutex.Unlock() - if fake.UpdateApplicationStub != nil { - return fake.UpdateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1511,15 +1529,16 @@ func (fake *FakeV2Actor) UploadApplicationPackage(arg1 string, arg2 []v2action.R arg3 io.Reader arg4 int64 }{arg1, arg2Copy, arg3, arg4}) + stub := fake.UploadApplicationPackageStub + fakeReturns := fake.uploadApplicationPackageReturns fake.recordInvocation("UploadApplicationPackage", []interface{}{arg1, arg2Copy, arg3, arg4}) fake.uploadApplicationPackageMutex.Unlock() - if fake.UploadApplicationPackageStub != nil { - return fake.UploadApplicationPackageStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadApplicationPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1579,15 +1598,16 @@ func (fake *FakeV2Actor) UploadDroplet(arg1 string, arg2 io.Reader, arg3 int64) arg2 io.Reader arg3 int64 }{arg1, arg2, arg3}) + stub := fake.UploadDropletStub + fakeReturns := fake.uploadDropletReturns fake.recordInvocation("UploadDroplet", []interface{}{arg1, arg2, arg3}) fake.uploadDropletMutex.Unlock() - if fake.UploadDropletStub != nil { - return fake.UploadDropletStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/pushaction/pushactionfakes/fake_v3actor.go b/actor/pushaction/pushactionfakes/fake_v3actor.go index 73312d78f78..d0fc64097df 100644 --- a/actor/pushaction/pushactionfakes/fake_v3actor.go +++ b/actor/pushaction/pushactionfakes/fake_v3actor.go @@ -170,15 +170,16 @@ func (fake *FakeV3Actor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -224,15 +225,16 @@ func (fake *FakeV3Actor) CreateApplicationInSpace(arg1 v3action.Application, arg arg1 v3action.Application arg2 string }{arg1, arg2}) + stub := fake.CreateApplicationInSpaceStub + fakeReturns := fake.createApplicationInSpaceReturns fake.recordInvocation("CreateApplicationInSpace", []interface{}{arg1, arg2}) fake.createApplicationInSpaceMutex.Unlock() - if fake.CreateApplicationInSpaceStub != nil { - return fake.CreateApplicationInSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationInSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -290,15 +292,16 @@ func (fake *FakeV3Actor) CreateBitsPackageByApplication(arg1 string) (v3action.P fake.createBitsPackageByApplicationArgsForCall = append(fake.createBitsPackageByApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateBitsPackageByApplicationStub + fakeReturns := fake.createBitsPackageByApplicationReturns fake.recordInvocation("CreateBitsPackageByApplication", []interface{}{arg1}) fake.createBitsPackageByApplicationMutex.Unlock() - if fake.CreateBitsPackageByApplicationStub != nil { - return fake.CreateBitsPackageByApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBitsPackageByApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -357,15 +360,16 @@ func (fake *FakeV3Actor) GetApplicationByNameAndSpace(arg1 string, arg2 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 } @@ -424,15 +428,16 @@ func (fake *FakeV3Actor) PollBuild(arg1 string, arg2 string) (v3action.Droplet, arg1 string arg2 string }{arg1, arg2}) + stub := fake.PollBuildStub + fakeReturns := fake.pollBuildReturns fake.recordInvocation("PollBuild", []interface{}{arg1, arg2}) fake.pollBuildMutex.Unlock() - if fake.PollBuildStub != nil { - return fake.PollBuildStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pollBuildReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -490,15 +495,16 @@ func (fake *FakeV3Actor) PollPackage(arg1 v3action.Package) (v3action.Package, v fake.pollPackageArgsForCall = append(fake.pollPackageArgsForCall, struct { arg1 v3action.Package }{arg1}) + stub := fake.PollPackageStub + fakeReturns := fake.pollPackageReturns fake.recordInvocation("PollPackage", []interface{}{arg1}) fake.pollPackageMutex.Unlock() - if fake.PollPackageStub != nil { - return fake.PollPackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pollPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -557,15 +563,16 @@ func (fake *FakeV3Actor) SetApplicationDroplet(arg1 string, arg2 string) (v3acti arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetApplicationDropletStub + fakeReturns := fake.setApplicationDropletReturns fake.recordInvocation("SetApplicationDroplet", []interface{}{arg1, arg2}) fake.setApplicationDropletMutex.Unlock() - if fake.SetApplicationDropletStub != nil { - return fake.SetApplicationDropletStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setApplicationDropletReturns return fakeReturns.result1, fakeReturns.result2 } @@ -620,15 +627,16 @@ func (fake *FakeV3Actor) StageApplicationPackage(arg1 string) (v3action.Build, v fake.stageApplicationPackageArgsForCall = append(fake.stageApplicationPackageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StageApplicationPackageStub + fakeReturns := fake.stageApplicationPackageReturns fake.recordInvocation("StageApplicationPackage", []interface{}{arg1}) fake.stageApplicationPackageMutex.Unlock() - if fake.StageApplicationPackageStub != nil { - return fake.StageApplicationPackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.stageApplicationPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -686,15 +694,16 @@ func (fake *FakeV3Actor) UpdateApplication(arg1 v3action.Application) (v3action. fake.updateApplicationArgsForCall = append(fake.updateApplicationArgsForCall, struct { arg1 v3action.Application }{arg1}) + stub := fake.UpdateApplicationStub + fakeReturns := fake.updateApplicationReturns fake.recordInvocation("UpdateApplication", []interface{}{arg1}) fake.updateApplicationMutex.Unlock() - if fake.UpdateApplicationStub != nil { - return fake.UpdateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -760,15 +769,16 @@ func (fake *FakeV3Actor) UploadBitsPackage(arg1 v3action.Package, arg2 []shareda arg3 io.Reader arg4 int64 }{arg1, arg2Copy, arg3, arg4}) + stub := fake.UploadBitsPackageStub + fakeReturns := fake.uploadBitsPackageReturns fake.recordInvocation("UploadBitsPackage", []interface{}{arg1, arg2Copy, arg3, arg4}) fake.uploadBitsPackageMutex.Unlock() - if fake.UploadBitsPackageStub != nil { - return fake.UploadBitsPackageStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadBitsPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/sharedaction/sharedactionfakes/fake_config.go b/actor/sharedaction/sharedactionfakes/fake_config.go index c58fe25e73f..a360722eff2 100644 --- a/actor/sharedaction/sharedactionfakes/fake_config.go +++ b/actor/sharedaction/sharedactionfakes/fake_config.go @@ -101,15 +101,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 } @@ -153,15 +154,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 } @@ -205,15 +207,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 } @@ -260,15 +263,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 } @@ -312,15 +316,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 } @@ -364,15 +369,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 } @@ -416,15 +422,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 } @@ -468,15 +475,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 84ce92518a9..9b67d7cd0f7 100644 --- a/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go +++ b/actor/sharedaction/sharedactionfakes/fake_log_cache_client.go @@ -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 909a661aeec..c60e1cc2bd9 100644 --- a/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go +++ b/actor/sharedaction/sharedactionfakes/fake_secure_shell_client.go @@ -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/v2action/composite/compositefakes/fake_broker_actor.go b/actor/v2action/composite/compositefakes/fake_broker_actor.go index f630661ff74..0cf071eb8bb 100644 --- a/actor/v2action/composite/compositefakes/fake_broker_actor.go +++ b/actor/v2action/composite/compositefakes/fake_broker_actor.go @@ -48,15 +48,16 @@ func (fake *FakeBrokerActor) GetServiceBrokerByName(arg1 string) (v2action.Servi fake.getServiceBrokerByNameArgsForCall = append(fake.getServiceBrokerByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceBrokerByNameStub + fakeReturns := fake.getServiceBrokerByNameReturns fake.recordInvocation("GetServiceBrokerByName", []interface{}{arg1}) fake.getServiceBrokerByNameMutex.Unlock() - if fake.GetServiceBrokerByNameStub != nil { - return fake.GetServiceBrokerByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceBrokerByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -113,15 +114,16 @@ func (fake *FakeBrokerActor) GetServiceBrokers() ([]v2action.ServiceBroker, v2ac ret, specificReturn := fake.getServiceBrokersReturnsOnCall[len(fake.getServiceBrokersArgsForCall)] fake.getServiceBrokersArgsForCall = append(fake.getServiceBrokersArgsForCall, struct { }{}) + stub := fake.GetServiceBrokersStub + fakeReturns := fake.getServiceBrokersReturns fake.recordInvocation("GetServiceBrokers", []interface{}{}) fake.getServiceBrokersMutex.Unlock() - if fake.GetServiceBrokersStub != nil { - return fake.GetServiceBrokersStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceBrokersReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v2action/composite/compositefakes/fake_get_apiversion_actor.go b/actor/v2action/composite/compositefakes/fake_get_apiversion_actor.go index 2bdb0dffbc3..0d3367a7827 100644 --- a/actor/v2action/composite/compositefakes/fake_get_apiversion_actor.go +++ b/actor/v2action/composite/compositefakes/fake_get_apiversion_actor.go @@ -27,15 +27,16 @@ func (fake *FakeGetAPIVersionActor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } diff --git a/actor/v2action/composite/compositefakes/fake_get_service_instance_actor.go b/actor/v2action/composite/compositefakes/fake_get_service_instance_actor.go index 9b3a5c661bb..0b2d3e24e06 100644 --- a/actor/v2action/composite/compositefakes/fake_get_service_instance_actor.go +++ b/actor/v2action/composite/compositefakes/fake_get_service_instance_actor.go @@ -36,15 +36,16 @@ func (fake *FakeGetServiceInstanceActor) GetServiceInstanceByNameAndSpace(arg1 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceInstanceByNameAndSpaceStub + fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns fake.recordInvocation("GetServiceInstanceByNameAndSpace", []interface{}{arg1, arg2}) fake.getServiceInstanceByNameAndSpaceMutex.Unlock() - if fake.GetServiceInstanceByNameAndSpaceStub != nil { - return fake.GetServiceInstanceByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v2action/composite/compositefakes/fake_get_service_plan_actor.go b/actor/v2action/composite/compositefakes/fake_get_service_plan_actor.go index 8909be8803a..d33c7ea29de 100644 --- a/actor/v2action/composite/compositefakes/fake_get_service_plan_actor.go +++ b/actor/v2action/composite/compositefakes/fake_get_service_plan_actor.go @@ -34,15 +34,16 @@ func (fake *FakeGetServicePlanActor) GetServicePlan(arg1 string) (v2action.Servi fake.getServicePlanArgsForCall = append(fake.getServicePlanArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicePlanStub + fakeReturns := fake.getServicePlanReturns fake.recordInvocation("GetServicePlan", []interface{}{arg1}) fake.getServicePlanMutex.Unlock() - if fake.GetServicePlanStub != nil { - return fake.GetServicePlanStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlanReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v2action/composite/compositefakes/fake_organization_actor.go b/actor/v2action/composite/compositefakes/fake_organization_actor.go index 4c6863221b7..84a79bc1924 100644 --- a/actor/v2action/composite/compositefakes/fake_organization_actor.go +++ b/actor/v2action/composite/compositefakes/fake_organization_actor.go @@ -49,15 +49,16 @@ func (fake *FakeOrganizationActor) GetOrganization(arg1 string) (v2action.Organi fake.getOrganizationArgsForCall = append(fake.getOrganizationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationStub + fakeReturns := fake.getOrganizationReturns fake.recordInvocation("GetOrganization", []interface{}{arg1}) fake.getOrganizationMutex.Unlock() - if fake.GetOrganizationStub != nil { - return fake.GetOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -115,15 +116,16 @@ func (fake *FakeOrganizationActor) OrganizationExistsWithName(arg1 string) (bool fake.organizationExistsWithNameArgsForCall = append(fake.organizationExistsWithNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.OrganizationExistsWithNameStub + fakeReturns := fake.organizationExistsWithNameReturns fake.recordInvocation("OrganizationExistsWithName", []interface{}{arg1}) fake.organizationExistsWithNameMutex.Unlock() - if fake.OrganizationExistsWithNameStub != nil { - return fake.OrganizationExistsWithNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.organizationExistsWithNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v2action/composite/compositefakes/fake_service_actor.go b/actor/v2action/composite/compositefakes/fake_service_actor.go index 4bc1c668ba7..b55b32d83fd 100644 --- a/actor/v2action/composite/compositefakes/fake_service_actor.go +++ b/actor/v2action/composite/compositefakes/fake_service_actor.go @@ -49,15 +49,16 @@ func (fake *FakeServiceActor) GetServicesWithPlans(arg1 ...v2action.Filter) (v2a fake.getServicesWithPlansArgsForCall = append(fake.getServicesWithPlansArgsForCall, struct { arg1 []v2action.Filter }{arg1}) + stub := fake.GetServicesWithPlansStub + fakeReturns := fake.getServicesWithPlansReturns fake.recordInvocation("GetServicesWithPlans", []interface{}{arg1}) fake.getServicesWithPlansMutex.Unlock() - if fake.GetServicesWithPlansStub != nil { - return fake.GetServicesWithPlansStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicesWithPlansReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -115,15 +116,16 @@ func (fake *FakeServiceActor) ServiceExistsWithName(arg1 string) (bool, v2action fake.serviceExistsWithNameArgsForCall = append(fake.serviceExistsWithNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ServiceExistsWithNameStub + fakeReturns := fake.serviceExistsWithNameReturns fake.recordInvocation("ServiceExistsWithName", []interface{}{arg1}) fake.serviceExistsWithNameMutex.Unlock() - if fake.ServiceExistsWithNameStub != nil { - return fake.ServiceExistsWithNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.serviceExistsWithNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v2action/composite/compositefakes/fake_update_service_instance_maintenance_info_actor.go b/actor/v2action/composite/compositefakes/fake_update_service_instance_maintenance_info_actor.go index 57e4acfc1fd..51d29589403 100644 --- a/actor/v2action/composite/compositefakes/fake_update_service_instance_maintenance_info_actor.go +++ b/actor/v2action/composite/compositefakes/fake_update_service_instance_maintenance_info_actor.go @@ -34,15 +34,16 @@ func (fake *FakeUpdateServiceInstanceMaintenanceInfoActor) UpdateServiceInstance arg1 string arg2 v2action.MaintenanceInfo }{arg1, arg2}) + stub := fake.UpdateServiceInstanceMaintenanceInfoStub + fakeReturns := fake.updateServiceInstanceMaintenanceInfoReturns fake.recordInvocation("UpdateServiceInstanceMaintenanceInfo", []interface{}{arg1, arg2}) fake.updateServiceInstanceMaintenanceInfoMutex.Unlock() - if fake.UpdateServiceInstanceMaintenanceInfoStub != nil { - return fake.UpdateServiceInstanceMaintenanceInfoStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceInstanceMaintenanceInfoReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v2action/composite/compositefakes/fake_visibility_actor.go b/actor/v2action/composite/compositefakes/fake_visibility_actor.go index 5282d2d7d4f..1c0d19965be 100644 --- a/actor/v2action/composite/compositefakes/fake_visibility_actor.go +++ b/actor/v2action/composite/compositefakes/fake_visibility_actor.go @@ -34,15 +34,16 @@ func (fake *FakeVisibilityActor) GetServicePlanVisibilities(arg1 string) ([]v2ac fake.getServicePlanVisibilitiesArgsForCall = append(fake.getServicePlanVisibilitiesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicePlanVisibilitiesStub + fakeReturns := fake.getServicePlanVisibilitiesReturns fake.recordInvocation("GetServicePlanVisibilities", []interface{}{arg1}) fake.getServicePlanVisibilitiesMutex.Unlock() - if fake.GetServicePlanVisibilitiesStub != nil { - return fake.GetServicePlanVisibilitiesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlanVisibilitiesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v2action/v2actionfakes/fake_cloud_controller_client.go b/actor/v2action/v2actionfakes/fake_cloud_controller_client.go index 93c91cb7dd9..3a791f8d0ad 100644 --- a/actor/v2action/v2actionfakes/fake_cloud_controller_client.go +++ b/actor/v2action/v2actionfakes/fake_cloud_controller_client.go @@ -1475,15 +1475,16 @@ func (fake *FakeCloudControllerClient) API() string { ret, specificReturn := fake.aPIReturnsOnCall[len(fake.aPIArgsForCall)] fake.aPIArgsForCall = append(fake.aPIArgsForCall, struct { }{}) + stub := fake.APIStub + fakeReturns := fake.aPIReturns fake.recordInvocation("API", []interface{}{}) fake.aPIMutex.Unlock() - if fake.APIStub != nil { - return fake.APIStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.aPIReturns return fakeReturns.result1 } @@ -1527,15 +1528,16 @@ func (fake *FakeCloudControllerClient) 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 } @@ -1579,15 +1581,16 @@ func (fake *FakeCloudControllerClient) AuthorizationEndpoint() string { ret, specificReturn := fake.authorizationEndpointReturnsOnCall[len(fake.authorizationEndpointArgsForCall)] fake.authorizationEndpointArgsForCall = append(fake.authorizationEndpointArgsForCall, struct { }{}) + stub := fake.AuthorizationEndpointStub + fakeReturns := fake.authorizationEndpointReturns fake.recordInvocation("AuthorizationEndpoint", []interface{}{}) fake.authorizationEndpointMutex.Unlock() - if fake.AuthorizationEndpointStub != nil { - return fake.AuthorizationEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.authorizationEndpointReturns return fakeReturns.result1 } @@ -1632,15 +1635,16 @@ func (fake *FakeCloudControllerClient) CheckRoute(arg1 ccv2.Route) (bool, ccv2.W fake.checkRouteArgsForCall = append(fake.checkRouteArgsForCall, struct { arg1 ccv2.Route }{arg1}) + stub := fake.CheckRouteStub + fakeReturns := fake.checkRouteReturns fake.recordInvocation("CheckRoute", []interface{}{arg1}) fake.checkRouteMutex.Unlock() - if fake.CheckRouteStub != nil { - return fake.CheckRouteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.checkRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1698,15 +1702,16 @@ func (fake *FakeCloudControllerClient) CreateApplication(arg1 ccv2.Application) fake.createApplicationArgsForCall = append(fake.createApplicationArgsForCall, struct { arg1 ccv2.Application }{arg1}) + stub := fake.CreateApplicationStub + fakeReturns := fake.createApplicationReturns fake.recordInvocation("CreateApplication", []interface{}{arg1}) fake.createApplicationMutex.Unlock() - if fake.CreateApplicationStub != nil { - return fake.CreateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1764,15 +1769,16 @@ func (fake *FakeCloudControllerClient) CreateBuildpack(arg1 ccv2.Buildpack) (ccv fake.createBuildpackArgsForCall = append(fake.createBuildpackArgsForCall, struct { arg1 ccv2.Buildpack }{arg1}) + stub := fake.CreateBuildpackStub + fakeReturns := fake.createBuildpackReturns fake.recordInvocation("CreateBuildpack", []interface{}{arg1}) fake.createBuildpackMutex.Unlock() - if fake.CreateBuildpackStub != nil { - return fake.CreateBuildpackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBuildpackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1831,15 +1837,16 @@ func (fake *FakeCloudControllerClient) CreateOrganization(arg1 string, arg2 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateOrganizationStub + fakeReturns := fake.createOrganizationReturns fake.recordInvocation("CreateOrganization", []interface{}{arg1, arg2}) fake.createOrganizationMutex.Unlock() - if fake.CreateOrganizationStub != nil { - return fake.CreateOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1898,15 +1905,16 @@ func (fake *FakeCloudControllerClient) CreateRoute(arg1 ccv2.Route, arg2 bool) ( arg1 ccv2.Route arg2 bool }{arg1, arg2}) + stub := fake.CreateRouteStub + fakeReturns := fake.createRouteReturns fake.recordInvocation("CreateRoute", []interface{}{arg1, arg2}) fake.createRouteMutex.Unlock() - if fake.CreateRouteStub != nil { - return fake.CreateRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1968,15 +1976,16 @@ func (fake *FakeCloudControllerClient) CreateServiceBinding(arg1 string, arg2 st arg4 bool arg5 map[string]interface{} }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateServiceBindingStub + fakeReturns := fake.createServiceBindingReturns fake.recordInvocation("CreateServiceBinding", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createServiceBindingMutex.Unlock() - if fake.CreateServiceBindingStub != nil { - return fake.CreateServiceBindingStub(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.createServiceBindingReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2038,15 +2047,16 @@ func (fake *FakeCloudControllerClient) CreateServiceBroker(arg1 string, arg2 str arg4 string arg5 string }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateServiceBrokerStub + fakeReturns := fake.createServiceBrokerReturns fake.recordInvocation("CreateServiceBroker", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createServiceBrokerMutex.Unlock() - if fake.CreateServiceBrokerStub != nil { - return fake.CreateServiceBrokerStub(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.createServiceBrokerReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2113,15 +2123,16 @@ func (fake *FakeCloudControllerClient) CreateServiceInstance(arg1 string, arg2 s arg4 map[string]interface{} arg5 []string }{arg1, arg2, arg3, arg4, arg5Copy}) + stub := fake.CreateServiceInstanceStub + fakeReturns := fake.createServiceInstanceReturns fake.recordInvocation("CreateServiceInstance", []interface{}{arg1, arg2, arg3, arg4, arg5Copy}) fake.createServiceInstanceMutex.Unlock() - if fake.CreateServiceInstanceStub != nil { - return fake.CreateServiceInstanceStub(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.createServiceInstanceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2181,15 +2192,16 @@ func (fake *FakeCloudControllerClient) 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, ret.result2, ret.result3 } - fakeReturns := fake.createServiceKeyReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2248,15 +2260,16 @@ func (fake *FakeCloudControllerClient) CreateServicePlanVisibility(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateServicePlanVisibilityStub + fakeReturns := fake.createServicePlanVisibilityReturns fake.recordInvocation("CreateServicePlanVisibility", []interface{}{arg1, arg2}) fake.createServicePlanVisibilityMutex.Unlock() - if fake.CreateServicePlanVisibilityStub != nil { - return fake.CreateServicePlanVisibilityStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createServicePlanVisibilityReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2316,15 +2329,16 @@ func (fake *FakeCloudControllerClient) CreateSharedDomain(arg1 string, arg2 stri arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.CreateSharedDomainStub + fakeReturns := fake.createSharedDomainReturns fake.recordInvocation("CreateSharedDomain", []interface{}{arg1, arg2, arg3}) fake.createSharedDomainMutex.Unlock() - if fake.CreateSharedDomainStub != nil { - return fake.CreateSharedDomainStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createSharedDomainReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2380,15 +2394,16 @@ func (fake *FakeCloudControllerClient) CreateSpace(arg1 string, arg2 string) (cc arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateSpaceStub + fakeReturns := fake.createSpaceReturns fake.recordInvocation("CreateSpace", []interface{}{arg1, arg2}) fake.createSpaceMutex.Unlock() - if fake.CreateSpaceStub != nil { - return fake.CreateSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2446,15 +2461,16 @@ func (fake *FakeCloudControllerClient) CreateUser(arg1 string) (ccv2.User, ccv2. fake.createUserArgsForCall = append(fake.createUserArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateUserStub + fakeReturns := fake.createUserReturns fake.recordInvocation("CreateUser", []interface{}{arg1}) fake.createUserMutex.Unlock() - if fake.CreateUserStub != nil { - return fake.CreateUserStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createUserReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2512,15 +2528,16 @@ func (fake *FakeCloudControllerClient) DeleteOrganizationJob(arg1 string) (ccv2. fake.deleteOrganizationJobArgsForCall = append(fake.deleteOrganizationJobArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteOrganizationJobStub + fakeReturns := fake.deleteOrganizationJobReturns fake.recordInvocation("DeleteOrganizationJob", []interface{}{arg1}) fake.deleteOrganizationJobMutex.Unlock() - if fake.DeleteOrganizationJobStub != nil { - return fake.DeleteOrganizationJobStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteOrganizationJobReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2578,15 +2595,16 @@ func (fake *FakeCloudControllerClient) DeleteRoute(arg1 string) (ccv2.Warnings, fake.deleteRouteArgsForCall = append(fake.deleteRouteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteRouteStub + fakeReturns := fake.deleteRouteReturns fake.recordInvocation("DeleteRoute", []interface{}{arg1}) fake.deleteRouteMutex.Unlock() - if fake.DeleteRouteStub != nil { - return fake.DeleteRouteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2642,15 +2660,16 @@ func (fake *FakeCloudControllerClient) DeleteRouteApplication(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteRouteApplicationStub + fakeReturns := fake.deleteRouteApplicationReturns fake.recordInvocation("DeleteRouteApplication", []interface{}{arg1, arg2}) fake.deleteRouteApplicationMutex.Unlock() - if fake.DeleteRouteApplicationStub != nil { - return fake.DeleteRouteApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteRouteApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2706,15 +2725,16 @@ func (fake *FakeCloudControllerClient) DeleteSecurityGroupSpace(arg1 string, arg arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteSecurityGroupSpaceStub + fakeReturns := fake.deleteSecurityGroupSpaceReturns fake.recordInvocation("DeleteSecurityGroupSpace", []interface{}{arg1, arg2}) fake.deleteSecurityGroupSpaceMutex.Unlock() - if fake.DeleteSecurityGroupSpaceStub != nil { - return fake.DeleteSecurityGroupSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteSecurityGroupSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2770,15 +2790,16 @@ func (fake *FakeCloudControllerClient) DeleteSecurityGroupStagingSpace(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteSecurityGroupStagingSpaceStub + fakeReturns := fake.deleteSecurityGroupStagingSpaceReturns fake.recordInvocation("DeleteSecurityGroupStagingSpace", []interface{}{arg1, arg2}) fake.deleteSecurityGroupStagingSpaceMutex.Unlock() - if fake.DeleteSecurityGroupStagingSpaceStub != nil { - return fake.DeleteSecurityGroupStagingSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteSecurityGroupStagingSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2834,15 +2855,16 @@ func (fake *FakeCloudControllerClient) DeleteService(arg1 string, arg2 bool) (cc arg1 string arg2 bool }{arg1, arg2}) + stub := fake.DeleteServiceStub + fakeReturns := fake.deleteServiceReturns fake.recordInvocation("DeleteService", []interface{}{arg1, arg2}) fake.deleteServiceMutex.Unlock() - if fake.DeleteServiceStub != nil { - return fake.DeleteServiceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteServiceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2898,15 +2920,16 @@ func (fake *FakeCloudControllerClient) DeleteServiceBinding(arg1 string, arg2 bo arg1 string arg2 bool }{arg1, arg2}) + stub := fake.DeleteServiceBindingStub + fakeReturns := fake.deleteServiceBindingReturns fake.recordInvocation("DeleteServiceBinding", []interface{}{arg1, arg2}) fake.deleteServiceBindingMutex.Unlock() - if fake.DeleteServiceBindingStub != nil { - return fake.DeleteServiceBindingStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteServiceBindingReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2964,15 +2987,16 @@ func (fake *FakeCloudControllerClient) DeleteServicePlanVisibility(arg1 string) fake.deleteServicePlanVisibilityArgsForCall = append(fake.deleteServicePlanVisibilityArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteServicePlanVisibilityStub + fakeReturns := fake.deleteServicePlanVisibilityReturns fake.recordInvocation("DeleteServicePlanVisibility", []interface{}{arg1}) fake.deleteServicePlanVisibilityMutex.Unlock() - if fake.DeleteServicePlanVisibilityStub != nil { - return fake.DeleteServicePlanVisibilityStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteServicePlanVisibilityReturns return fakeReturns.result1, fakeReturns.result2 } @@ -3027,15 +3051,16 @@ func (fake *FakeCloudControllerClient) DeleteSpaceJob(arg1 string) (ccv2.Job, cc fake.deleteSpaceJobArgsForCall = append(fake.deleteSpaceJobArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteSpaceJobStub + fakeReturns := fake.deleteSpaceJobReturns fake.recordInvocation("DeleteSpaceJob", []interface{}{arg1}) fake.deleteSpaceJobMutex.Unlock() - if fake.DeleteSpaceJobStub != nil { - return fake.DeleteSpaceJobStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteSpaceJobReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3093,15 +3118,16 @@ func (fake *FakeCloudControllerClient) DeleteSpaceUnmappedRoutes(arg1 string) (c fake.deleteSpaceUnmappedRoutesArgsForCall = append(fake.deleteSpaceUnmappedRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteSpaceUnmappedRoutesStub + fakeReturns := fake.deleteSpaceUnmappedRoutesReturns fake.recordInvocation("DeleteSpaceUnmappedRoutes", []interface{}{arg1}) fake.deleteSpaceUnmappedRoutesMutex.Unlock() - if fake.DeleteSpaceUnmappedRoutesStub != nil { - return fake.DeleteSpaceUnmappedRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteSpaceUnmappedRoutesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -3155,15 +3181,16 @@ func (fake *FakeCloudControllerClient) 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 } @@ -3208,15 +3235,16 @@ func (fake *FakeCloudControllerClient) GetApplication(arg1 string) (ccv2.Applica fake.getApplicationArgsForCall = append(fake.getApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationStub + fakeReturns := fake.getApplicationReturns fake.recordInvocation("GetApplication", []interface{}{arg1}) fake.getApplicationMutex.Unlock() - if fake.GetApplicationStub != nil { - return fake.GetApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3274,15 +3302,16 @@ func (fake *FakeCloudControllerClient) GetApplicationApplicationInstanceStatuses fake.getApplicationApplicationInstanceStatusesArgsForCall = append(fake.getApplicationApplicationInstanceStatusesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationApplicationInstanceStatusesStub + fakeReturns := fake.getApplicationApplicationInstanceStatusesReturns fake.recordInvocation("GetApplicationApplicationInstanceStatuses", []interface{}{arg1}) fake.getApplicationApplicationInstanceStatusesMutex.Unlock() - if fake.GetApplicationApplicationInstanceStatusesStub != nil { - return fake.GetApplicationApplicationInstanceStatusesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationApplicationInstanceStatusesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3340,15 +3369,16 @@ func (fake *FakeCloudControllerClient) GetApplicationApplicationInstances(arg1 s fake.getApplicationApplicationInstancesArgsForCall = append(fake.getApplicationApplicationInstancesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationApplicationInstancesStub + fakeReturns := fake.getApplicationApplicationInstancesReturns fake.recordInvocation("GetApplicationApplicationInstances", []interface{}{arg1}) fake.getApplicationApplicationInstancesMutex.Unlock() - if fake.GetApplicationApplicationInstancesStub != nil { - return fake.GetApplicationApplicationInstancesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationApplicationInstancesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3407,15 +3437,16 @@ func (fake *FakeCloudControllerClient) GetApplicationRoutes(arg1 string, arg2 .. arg1 string arg2 []ccv2.Filter }{arg1, arg2}) + stub := fake.GetApplicationRoutesStub + fakeReturns := fake.getApplicationRoutesReturns fake.recordInvocation("GetApplicationRoutes", []interface{}{arg1, arg2}) fake.getApplicationRoutesMutex.Unlock() - if fake.GetApplicationRoutesStub != nil { - return fake.GetApplicationRoutesStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3473,15 +3504,16 @@ func (fake *FakeCloudControllerClient) GetApplications(arg1 ...ccv2.Filter) ([]c fake.getApplicationsArgsForCall = append(fake.getApplicationsArgsForCall, struct { arg1 []ccv2.Filter }{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 } @@ -3539,15 +3571,16 @@ func (fake *FakeCloudControllerClient) GetBuildpacks(arg1 ...ccv2.Filter) ([]ccv fake.getBuildpacksArgsForCall = append(fake.getBuildpacksArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetBuildpacksStub + fakeReturns := fake.getBuildpacksReturns fake.recordInvocation("GetBuildpacks", []interface{}{arg1}) fake.getBuildpacksMutex.Unlock() - if fake.GetBuildpacksStub != nil { - return fake.GetBuildpacksStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getBuildpacksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3604,15 +3637,16 @@ func (fake *FakeCloudControllerClient) GetConfigFeatureFlags() ([]ccv2.FeatureFl ret, specificReturn := fake.getConfigFeatureFlagsReturnsOnCall[len(fake.getConfigFeatureFlagsArgsForCall)] fake.getConfigFeatureFlagsArgsForCall = append(fake.getConfigFeatureFlagsArgsForCall, struct { }{}) + stub := fake.GetConfigFeatureFlagsStub + fakeReturns := fake.getConfigFeatureFlagsReturns fake.recordInvocation("GetConfigFeatureFlags", []interface{}{}) fake.getConfigFeatureFlagsMutex.Unlock() - if fake.GetConfigFeatureFlagsStub != nil { - return fake.GetConfigFeatureFlagsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getConfigFeatureFlagsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3663,15 +3697,16 @@ func (fake *FakeCloudControllerClient) GetJob(arg1 string) (ccv2.Job, ccv2.Warni fake.getJobArgsForCall = append(fake.getJobArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetJobStub + fakeReturns := fake.getJobReturns fake.recordInvocation("GetJob", []interface{}{arg1}) fake.getJobMutex.Unlock() - if fake.GetJobStub != nil { - return fake.GetJobStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getJobReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3729,15 +3764,16 @@ func (fake *FakeCloudControllerClient) GetOrganization(arg1 string) (ccv2.Organi fake.getOrganizationArgsForCall = append(fake.getOrganizationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationStub + fakeReturns := fake.getOrganizationReturns fake.recordInvocation("GetOrganization", []interface{}{arg1}) fake.getOrganizationMutex.Unlock() - if fake.GetOrganizationStub != nil { - return fake.GetOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3796,15 +3832,16 @@ func (fake *FakeCloudControllerClient) GetOrganizationPrivateDomains(arg1 string arg1 string arg2 []ccv2.Filter }{arg1, arg2}) + stub := fake.GetOrganizationPrivateDomainsStub + fakeReturns := fake.getOrganizationPrivateDomainsReturns fake.recordInvocation("GetOrganizationPrivateDomains", []interface{}{arg1, arg2}) fake.getOrganizationPrivateDomainsMutex.Unlock() - if fake.GetOrganizationPrivateDomainsStub != nil { - return fake.GetOrganizationPrivateDomainsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationPrivateDomainsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3862,15 +3899,16 @@ func (fake *FakeCloudControllerClient) GetOrganizationQuota(arg1 string) (ccv2.O fake.getOrganizationQuotaArgsForCall = append(fake.getOrganizationQuotaArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationQuotaStub + fakeReturns := fake.getOrganizationQuotaReturns fake.recordInvocation("GetOrganizationQuota", []interface{}{arg1}) fake.getOrganizationQuotaMutex.Unlock() - if fake.GetOrganizationQuotaStub != nil { - return fake.GetOrganizationQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3928,15 +3966,16 @@ func (fake *FakeCloudControllerClient) GetOrganizationQuotas(arg1 ...ccv2.Filter fake.getOrganizationQuotasArgsForCall = append(fake.getOrganizationQuotasArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetOrganizationQuotasStub + fakeReturns := fake.getOrganizationQuotasReturns fake.recordInvocation("GetOrganizationQuotas", []interface{}{arg1}) fake.getOrganizationQuotasMutex.Unlock() - if fake.GetOrganizationQuotasStub != nil { - return fake.GetOrganizationQuotasStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationQuotasReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3994,15 +4033,16 @@ func (fake *FakeCloudControllerClient) GetOrganizations(arg1 ...ccv2.Filter) ([] fake.getOrganizationsArgsForCall = append(fake.getOrganizationsArgsForCall, struct { arg1 []ccv2.Filter }{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 } @@ -4060,15 +4100,16 @@ func (fake *FakeCloudControllerClient) GetPrivateDomain(arg1 string) (ccv2.Domai fake.getPrivateDomainArgsForCall = append(fake.getPrivateDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPrivateDomainStub + fakeReturns := fake.getPrivateDomainReturns fake.recordInvocation("GetPrivateDomain", []interface{}{arg1}) fake.getPrivateDomainMutex.Unlock() - if fake.GetPrivateDomainStub != nil { - return fake.GetPrivateDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getPrivateDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4127,15 +4168,16 @@ func (fake *FakeCloudControllerClient) GetRouteApplications(arg1 string, arg2 .. arg1 string arg2 []ccv2.Filter }{arg1, arg2}) + stub := fake.GetRouteApplicationsStub + fakeReturns := fake.getRouteApplicationsReturns fake.recordInvocation("GetRouteApplications", []interface{}{arg1, arg2}) fake.getRouteApplicationsMutex.Unlock() - if fake.GetRouteApplicationsStub != nil { - return fake.GetRouteApplicationsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRouteApplicationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4193,15 +4235,16 @@ func (fake *FakeCloudControllerClient) GetRoutes(arg1 ...ccv2.Filter) ([]ccv2.Ro fake.getRoutesArgsForCall = append(fake.getRoutesArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetRoutesStub + fakeReturns := fake.getRoutesReturns fake.recordInvocation("GetRoutes", []interface{}{arg1}) fake.getRoutesMutex.Unlock() - if fake.GetRoutesStub != nil { - return fake.GetRoutesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4259,15 +4302,16 @@ func (fake *FakeCloudControllerClient) GetSecurityGroupSpaces(arg1 string) ([]cc fake.getSecurityGroupSpacesArgsForCall = append(fake.getSecurityGroupSpacesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSecurityGroupSpacesStub + fakeReturns := fake.getSecurityGroupSpacesReturns fake.recordInvocation("GetSecurityGroupSpaces", []interface{}{arg1}) fake.getSecurityGroupSpacesMutex.Unlock() - if fake.GetSecurityGroupSpacesStub != nil { - return fake.GetSecurityGroupSpacesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSecurityGroupSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4325,15 +4369,16 @@ func (fake *FakeCloudControllerClient) GetSecurityGroupStagingSpaces(arg1 string fake.getSecurityGroupStagingSpacesArgsForCall = append(fake.getSecurityGroupStagingSpacesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSecurityGroupStagingSpacesStub + fakeReturns := fake.getSecurityGroupStagingSpacesReturns fake.recordInvocation("GetSecurityGroupStagingSpaces", []interface{}{arg1}) fake.getSecurityGroupStagingSpacesMutex.Unlock() - if fake.GetSecurityGroupStagingSpacesStub != nil { - return fake.GetSecurityGroupStagingSpacesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSecurityGroupStagingSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4391,15 +4436,16 @@ func (fake *FakeCloudControllerClient) GetSecurityGroups(arg1 ...ccv2.Filter) ([ fake.getSecurityGroupsArgsForCall = append(fake.getSecurityGroupsArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetSecurityGroupsStub + fakeReturns := fake.getSecurityGroupsReturns fake.recordInvocation("GetSecurityGroups", []interface{}{arg1}) fake.getSecurityGroupsMutex.Unlock() - if fake.GetSecurityGroupsStub != nil { - return fake.GetSecurityGroupsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4457,15 +4503,16 @@ func (fake *FakeCloudControllerClient) GetService(arg1 string) (ccv2.Service, cc 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, ret.result3 } - fakeReturns := fake.getServiceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4523,15 +4570,16 @@ func (fake *FakeCloudControllerClient) GetServiceBindings(arg1 ...ccv2.Filter) ( fake.getServiceBindingsArgsForCall = append(fake.getServiceBindingsArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetServiceBindingsStub + fakeReturns := fake.getServiceBindingsReturns fake.recordInvocation("GetServiceBindings", []interface{}{arg1}) fake.getServiceBindingsMutex.Unlock() - if fake.GetServiceBindingsStub != nil { - return fake.GetServiceBindingsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceBindingsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4589,15 +4637,16 @@ func (fake *FakeCloudControllerClient) GetServiceBrokers(arg1 ...ccv2.Filter) ([ fake.getServiceBrokersArgsForCall = append(fake.getServiceBrokersArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetServiceBrokersStub + fakeReturns := fake.getServiceBrokersReturns fake.recordInvocation("GetServiceBrokers", []interface{}{arg1}) fake.getServiceBrokersMutex.Unlock() - if fake.GetServiceBrokersStub != nil { - return fake.GetServiceBrokersStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceBrokersReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4655,15 +4704,16 @@ func (fake *FakeCloudControllerClient) GetServiceInstance(arg1 string) (ccv2.Ser fake.getServiceInstanceArgsForCall = append(fake.getServiceInstanceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstanceStub + fakeReturns := fake.getServiceInstanceReturns fake.recordInvocation("GetServiceInstance", []interface{}{arg1}) fake.getServiceInstanceMutex.Unlock() - if fake.GetServiceInstanceStub != nil { - return fake.GetServiceInstanceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4721,15 +4771,16 @@ func (fake *FakeCloudControllerClient) GetServiceInstanceServiceBindings(arg1 st fake.getServiceInstanceServiceBindingsArgsForCall = append(fake.getServiceInstanceServiceBindingsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstanceServiceBindingsStub + fakeReturns := fake.getServiceInstanceServiceBindingsReturns fake.recordInvocation("GetServiceInstanceServiceBindings", []interface{}{arg1}) fake.getServiceInstanceServiceBindingsMutex.Unlock() - if fake.GetServiceInstanceServiceBindingsStub != nil { - return fake.GetServiceInstanceServiceBindingsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceServiceBindingsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4787,15 +4838,16 @@ func (fake *FakeCloudControllerClient) GetServiceInstanceSharedFrom(arg1 string) fake.getServiceInstanceSharedFromArgsForCall = append(fake.getServiceInstanceSharedFromArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstanceSharedFromStub + fakeReturns := fake.getServiceInstanceSharedFromReturns fake.recordInvocation("GetServiceInstanceSharedFrom", []interface{}{arg1}) fake.getServiceInstanceSharedFromMutex.Unlock() - if fake.GetServiceInstanceSharedFromStub != nil { - return fake.GetServiceInstanceSharedFromStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceSharedFromReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4853,15 +4905,16 @@ func (fake *FakeCloudControllerClient) GetServiceInstanceSharedTos(arg1 string) fake.getServiceInstanceSharedTosArgsForCall = append(fake.getServiceInstanceSharedTosArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstanceSharedTosStub + fakeReturns := fake.getServiceInstanceSharedTosReturns fake.recordInvocation("GetServiceInstanceSharedTos", []interface{}{arg1}) fake.getServiceInstanceSharedTosMutex.Unlock() - if fake.GetServiceInstanceSharedTosStub != nil { - return fake.GetServiceInstanceSharedTosStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceSharedTosReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4919,15 +4972,16 @@ func (fake *FakeCloudControllerClient) GetServiceInstances(arg1 ...ccv2.Filter) fake.getServiceInstancesArgsForCall = append(fake.getServiceInstancesArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetServiceInstancesStub + fakeReturns := fake.getServiceInstancesReturns fake.recordInvocation("GetServiceInstances", []interface{}{arg1}) fake.getServiceInstancesMutex.Unlock() - if fake.GetServiceInstancesStub != nil { - return fake.GetServiceInstancesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstancesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4985,15 +5039,16 @@ func (fake *FakeCloudControllerClient) GetServicePlan(arg1 string) (ccv2.Service fake.getServicePlanArgsForCall = append(fake.getServicePlanArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicePlanStub + fakeReturns := fake.getServicePlanReturns fake.recordInvocation("GetServicePlan", []interface{}{arg1}) fake.getServicePlanMutex.Unlock() - if fake.GetServicePlanStub != nil { - return fake.GetServicePlanStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlanReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5051,15 +5106,16 @@ func (fake *FakeCloudControllerClient) GetServicePlanVisibilities(arg1 ...ccv2.F fake.getServicePlanVisibilitiesArgsForCall = append(fake.getServicePlanVisibilitiesArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetServicePlanVisibilitiesStub + fakeReturns := fake.getServicePlanVisibilitiesReturns fake.recordInvocation("GetServicePlanVisibilities", []interface{}{arg1}) fake.getServicePlanVisibilitiesMutex.Unlock() - if fake.GetServicePlanVisibilitiesStub != nil { - return fake.GetServicePlanVisibilitiesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlanVisibilitiesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5117,15 +5173,16 @@ func (fake *FakeCloudControllerClient) GetServicePlans(arg1 ...ccv2.Filter) ([]c fake.getServicePlansArgsForCall = append(fake.getServicePlansArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetServicePlansStub + fakeReturns := fake.getServicePlansReturns fake.recordInvocation("GetServicePlans", []interface{}{arg1}) fake.getServicePlansMutex.Unlock() - if fake.GetServicePlansStub != nil { - return fake.GetServicePlansStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlansReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5183,15 +5240,16 @@ func (fake *FakeCloudControllerClient) GetServices(arg1 ...ccv2.Filter) ([]ccv2. fake.getServicesArgsForCall = append(fake.getServicesArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetServicesStub + fakeReturns := fake.getServicesReturns fake.recordInvocation("GetServices", []interface{}{arg1}) fake.getServicesMutex.Unlock() - if fake.GetServicesStub != nil { - return fake.GetServicesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5249,15 +5307,16 @@ func (fake *FakeCloudControllerClient) GetSharedDomain(arg1 string) (ccv2.Domain fake.getSharedDomainArgsForCall = append(fake.getSharedDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSharedDomainStub + fakeReturns := fake.getSharedDomainReturns fake.recordInvocation("GetSharedDomain", []interface{}{arg1}) fake.getSharedDomainMutex.Unlock() - if fake.GetSharedDomainStub != nil { - return fake.GetSharedDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSharedDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5315,15 +5374,16 @@ func (fake *FakeCloudControllerClient) GetSharedDomains(arg1 ...ccv2.Filter) ([] fake.getSharedDomainsArgsForCall = append(fake.getSharedDomainsArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetSharedDomainsStub + fakeReturns := fake.getSharedDomainsReturns fake.recordInvocation("GetSharedDomains", []interface{}{arg1}) fake.getSharedDomainsMutex.Unlock() - if fake.GetSharedDomainsStub != nil { - return fake.GetSharedDomainsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSharedDomainsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5381,15 +5441,16 @@ func (fake *FakeCloudControllerClient) GetSpaceQuotaDefinition(arg1 string) (ccv fake.getSpaceQuotaDefinitionArgsForCall = append(fake.getSpaceQuotaDefinitionArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceQuotaDefinitionStub + fakeReturns := fake.getSpaceQuotaDefinitionReturns fake.recordInvocation("GetSpaceQuotaDefinition", []interface{}{arg1}) fake.getSpaceQuotaDefinitionMutex.Unlock() - if fake.GetSpaceQuotaDefinitionStub != nil { - return fake.GetSpaceQuotaDefinitionStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceQuotaDefinitionReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5447,15 +5508,16 @@ func (fake *FakeCloudControllerClient) GetSpaceQuotas(arg1 string) ([]ccv2.Space fake.getSpaceQuotasArgsForCall = append(fake.getSpaceQuotasArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceQuotasStub + fakeReturns := fake.getSpaceQuotasReturns fake.recordInvocation("GetSpaceQuotas", []interface{}{arg1}) fake.getSpaceQuotasMutex.Unlock() - if fake.GetSpaceQuotasStub != nil { - return fake.GetSpaceQuotasStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceQuotasReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5514,15 +5576,16 @@ func (fake *FakeCloudControllerClient) GetSpaceRoutes(arg1 string, arg2 ...ccv2. arg1 string arg2 []ccv2.Filter }{arg1, arg2}) + stub := fake.GetSpaceRoutesStub + fakeReturns := fake.getSpaceRoutesReturns fake.recordInvocation("GetSpaceRoutes", []interface{}{arg1, arg2}) fake.getSpaceRoutesMutex.Unlock() - if fake.GetSpaceRoutesStub != nil { - return fake.GetSpaceRoutesStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5581,15 +5644,16 @@ func (fake *FakeCloudControllerClient) GetSpaceSecurityGroups(arg1 string, arg2 arg1 string arg2 []ccv2.Filter }{arg1, arg2}) + stub := fake.GetSpaceSecurityGroupsStub + fakeReturns := fake.getSpaceSecurityGroupsReturns fake.recordInvocation("GetSpaceSecurityGroups", []interface{}{arg1, arg2}) fake.getSpaceSecurityGroupsMutex.Unlock() - if fake.GetSpaceSecurityGroupsStub != nil { - return fake.GetSpaceSecurityGroupsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5649,15 +5713,16 @@ func (fake *FakeCloudControllerClient) GetSpaceServiceInstances(arg1 string, arg arg2 bool arg3 []ccv2.Filter }{arg1, arg2, arg3}) + stub := fake.GetSpaceServiceInstancesStub + fakeReturns := fake.getSpaceServiceInstancesReturns fake.recordInvocation("GetSpaceServiceInstances", []interface{}{arg1, arg2, arg3}) fake.getSpaceServiceInstancesMutex.Unlock() - if fake.GetSpaceServiceInstancesStub != nil { - return fake.GetSpaceServiceInstancesStub(arg1, arg2, arg3...) + if stub != nil { + return stub(arg1, arg2, arg3...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceServiceInstancesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5716,15 +5781,16 @@ func (fake *FakeCloudControllerClient) GetSpaceServices(arg1 string, arg2 ...ccv arg1 string arg2 []ccv2.Filter }{arg1, arg2}) + stub := fake.GetSpaceServicesStub + fakeReturns := fake.getSpaceServicesReturns fake.recordInvocation("GetSpaceServices", []interface{}{arg1, arg2}) fake.getSpaceServicesMutex.Unlock() - if fake.GetSpaceServicesStub != nil { - return fake.GetSpaceServicesStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceServicesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5783,15 +5849,16 @@ func (fake *FakeCloudControllerClient) GetSpaceStagingSecurityGroups(arg1 string arg1 string arg2 []ccv2.Filter }{arg1, arg2}) + stub := fake.GetSpaceStagingSecurityGroupsStub + fakeReturns := fake.getSpaceStagingSecurityGroupsReturns fake.recordInvocation("GetSpaceStagingSecurityGroups", []interface{}{arg1, arg2}) fake.getSpaceStagingSecurityGroupsMutex.Unlock() - if fake.GetSpaceStagingSecurityGroupsStub != nil { - return fake.GetSpaceStagingSecurityGroupsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceStagingSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5849,15 +5916,16 @@ func (fake *FakeCloudControllerClient) GetSpaceSummary(arg1 string) (ccv2.SpaceS fake.getSpaceSummaryArgsForCall = append(fake.getSpaceSummaryArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceSummaryStub + fakeReturns := fake.getSpaceSummaryReturns fake.recordInvocation("GetSpaceSummary", []interface{}{arg1}) fake.getSpaceSummaryMutex.Unlock() - if fake.GetSpaceSummaryStub != nil { - return fake.GetSpaceSummaryStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceSummaryReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5915,15 +5983,16 @@ func (fake *FakeCloudControllerClient) GetSpaces(arg1 ...ccv2.Filter) ([]ccv2.Sp fake.getSpacesArgsForCall = append(fake.getSpacesArgsForCall, struct { arg1 []ccv2.Filter }{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 } - fakeReturns := fake.getSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5981,15 +6050,16 @@ func (fake *FakeCloudControllerClient) GetStack(arg1 string) (ccv2.Stack, ccv2.W fake.getStackArgsForCall = append(fake.getStackArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetStackStub + fakeReturns := fake.getStackReturns fake.recordInvocation("GetStack", []interface{}{arg1}) fake.getStackMutex.Unlock() - if fake.GetStackStub != nil { - return fake.GetStackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6047,15 +6117,16 @@ func (fake *FakeCloudControllerClient) GetStacks(arg1 ...ccv2.Filter) ([]ccv2.St fake.getStacksArgsForCall = append(fake.getStacksArgsForCall, struct { arg1 []ccv2.Filter }{arg1}) + stub := fake.GetStacksStub + fakeReturns := fake.getStacksReturns fake.recordInvocation("GetStacks", []interface{}{arg1}) fake.getStacksMutex.Unlock() - if fake.GetStacksStub != nil { - return fake.GetStacksStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStacksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6113,15 +6184,16 @@ func (fake *FakeCloudControllerClient) GetUserProvidedServiceInstanceServiceBind fake.getUserProvidedServiceInstanceServiceBindingsArgsForCall = append(fake.getUserProvidedServiceInstanceServiceBindingsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetUserProvidedServiceInstanceServiceBindingsStub + fakeReturns := fake.getUserProvidedServiceInstanceServiceBindingsReturns fake.recordInvocation("GetUserProvidedServiceInstanceServiceBindings", []interface{}{arg1}) fake.getUserProvidedServiceInstanceServiceBindingsMutex.Unlock() - if fake.GetUserProvidedServiceInstanceServiceBindingsStub != nil { - return fake.GetUserProvidedServiceInstanceServiceBindingsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getUserProvidedServiceInstanceServiceBindingsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6178,15 +6250,16 @@ func (fake *FakeCloudControllerClient) 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 } @@ -6230,15 +6303,16 @@ func (fake *FakeCloudControllerClient) 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 } @@ -6283,15 +6357,16 @@ func (fake *FakeCloudControllerClient) PollJob(arg1 ccv2.Job) (ccv2.Warnings, er fake.pollJobArgsForCall = append(fake.pollJobArgsForCall, struct { arg1 ccv2.Job }{arg1}) + stub := fake.PollJobStub + fakeReturns := fake.pollJobReturns fake.recordInvocation("PollJob", []interface{}{arg1}) fake.pollJobMutex.Unlock() - if fake.PollJobStub != nil { - return fake.PollJobStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollJobReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6346,15 +6421,16 @@ func (fake *FakeCloudControllerClient) RestageApplication(arg1 ccv2.Application) fake.restageApplicationArgsForCall = append(fake.restageApplicationArgsForCall, struct { arg1 ccv2.Application }{arg1}) + stub := fake.RestageApplicationStub + fakeReturns := fake.restageApplicationReturns fake.recordInvocation("RestageApplication", []interface{}{arg1}) fake.restageApplicationMutex.Unlock() - if fake.RestageApplicationStub != nil { - return fake.RestageApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.restageApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6411,15 +6487,16 @@ func (fake *FakeCloudControllerClient) RoutingEndpoint() string { ret, specificReturn := fake.routingEndpointReturnsOnCall[len(fake.routingEndpointArgsForCall)] fake.routingEndpointArgsForCall = append(fake.routingEndpointArgsForCall, struct { }{}) + stub := fake.RoutingEndpointStub + fakeReturns := fake.routingEndpointReturns fake.recordInvocation("RoutingEndpoint", []interface{}{}) fake.routingEndpointMutex.Unlock() - if fake.RoutingEndpointStub != nil { - return fake.RoutingEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.routingEndpointReturns return fakeReturns.result1 } @@ -6465,15 +6542,16 @@ func (fake *FakeCloudControllerClient) SetSpaceQuota(arg1 string, arg2 string) ( arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetSpaceQuotaStub + fakeReturns := fake.setSpaceQuotaReturns fake.recordInvocation("SetSpaceQuota", []interface{}{arg1, arg2}) fake.setSpaceQuotaMutex.Unlock() - if fake.SetSpaceQuotaStub != nil { - return fake.SetSpaceQuotaStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6528,15 +6606,16 @@ func (fake *FakeCloudControllerClient) TargetCF(arg1 ccv2.TargetSettings) (ccv2. fake.targetCFArgsForCall = append(fake.targetCFArgsForCall, struct { arg1 ccv2.TargetSettings }{arg1}) + stub := fake.TargetCFStub + fakeReturns := fake.targetCFReturns fake.recordInvocation("TargetCF", []interface{}{arg1}) fake.targetCFMutex.Unlock() - if fake.TargetCFStub != nil { - return fake.TargetCFStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.targetCFReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6591,15 +6670,16 @@ func (fake *FakeCloudControllerClient) UpdateApplication(arg1 ccv2.Application) fake.updateApplicationArgsForCall = append(fake.updateApplicationArgsForCall, struct { arg1 ccv2.Application }{arg1}) + stub := fake.UpdateApplicationStub + fakeReturns := fake.updateApplicationReturns fake.recordInvocation("UpdateApplication", []interface{}{arg1}) fake.updateApplicationMutex.Unlock() - if fake.UpdateApplicationStub != nil { - return fake.UpdateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6657,15 +6737,16 @@ func (fake *FakeCloudControllerClient) UpdateBuildpack(arg1 ccv2.Buildpack) (ccv fake.updateBuildpackArgsForCall = append(fake.updateBuildpackArgsForCall, struct { arg1 ccv2.Buildpack }{arg1}) + stub := fake.UpdateBuildpackStub + fakeReturns := fake.updateBuildpackReturns fake.recordInvocation("UpdateBuildpack", []interface{}{arg1}) fake.updateBuildpackMutex.Unlock() - if fake.UpdateBuildpackStub != nil { - return fake.UpdateBuildpackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateBuildpackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6724,15 +6805,16 @@ func (fake *FakeCloudControllerClient) UpdateOrganizationManager(arg1 string, ar arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateOrganizationManagerStub + fakeReturns := fake.updateOrganizationManagerReturns fake.recordInvocation("UpdateOrganizationManager", []interface{}{arg1, arg2}) fake.updateOrganizationManagerMutex.Unlock() - if fake.UpdateOrganizationManagerStub != nil { - return fake.UpdateOrganizationManagerStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateOrganizationManagerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6788,15 +6870,16 @@ func (fake *FakeCloudControllerClient) UpdateOrganizationManagerByUsername(arg1 arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateOrganizationManagerByUsernameStub + fakeReturns := fake.updateOrganizationManagerByUsernameReturns fake.recordInvocation("UpdateOrganizationManagerByUsername", []interface{}{arg1, arg2}) fake.updateOrganizationManagerByUsernameMutex.Unlock() - if fake.UpdateOrganizationManagerByUsernameStub != nil { - return fake.UpdateOrganizationManagerByUsernameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateOrganizationManagerByUsernameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6852,15 +6935,16 @@ func (fake *FakeCloudControllerClient) UpdateOrganizationUser(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateOrganizationUserStub + fakeReturns := fake.updateOrganizationUserReturns fake.recordInvocation("UpdateOrganizationUser", []interface{}{arg1, arg2}) fake.updateOrganizationUserMutex.Unlock() - if fake.UpdateOrganizationUserStub != nil { - return fake.UpdateOrganizationUserStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateOrganizationUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6916,15 +7000,16 @@ func (fake *FakeCloudControllerClient) UpdateOrganizationUserByUsername(arg1 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateOrganizationUserByUsernameStub + fakeReturns := fake.updateOrganizationUserByUsernameReturns fake.recordInvocation("UpdateOrganizationUserByUsername", []interface{}{arg1, arg2}) fake.updateOrganizationUserByUsernameMutex.Unlock() - if fake.UpdateOrganizationUserByUsernameStub != nil { - return fake.UpdateOrganizationUserByUsernameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateOrganizationUserByUsernameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6984,15 +7069,16 @@ func (fake *FakeCloudControllerClient) UpdateResourceMatch(arg1 []ccv2.Resource) fake.updateResourceMatchArgsForCall = append(fake.updateResourceMatchArgsForCall, struct { arg1 []ccv2.Resource }{arg1Copy}) + stub := fake.UpdateResourceMatchStub + fakeReturns := fake.updateResourceMatchReturns fake.recordInvocation("UpdateResourceMatch", []interface{}{arg1Copy}) fake.updateResourceMatchMutex.Unlock() - if fake.UpdateResourceMatchStub != nil { - return fake.UpdateResourceMatchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateResourceMatchReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7051,15 +7137,16 @@ func (fake *FakeCloudControllerClient) UpdateRouteApplication(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateRouteApplicationStub + fakeReturns := fake.updateRouteApplicationReturns fake.recordInvocation("UpdateRouteApplication", []interface{}{arg1, arg2}) fake.updateRouteApplicationMutex.Unlock() - if fake.UpdateRouteApplicationStub != nil { - return fake.UpdateRouteApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateRouteApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7118,15 +7205,16 @@ func (fake *FakeCloudControllerClient) UpdateSecurityGroupSpace(arg1 string, arg arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSecurityGroupSpaceStub + fakeReturns := fake.updateSecurityGroupSpaceReturns fake.recordInvocation("UpdateSecurityGroupSpace", []interface{}{arg1, arg2}) fake.updateSecurityGroupSpaceMutex.Unlock() - if fake.UpdateSecurityGroupSpaceStub != nil { - return fake.UpdateSecurityGroupSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSecurityGroupSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7182,15 +7270,16 @@ func (fake *FakeCloudControllerClient) UpdateSecurityGroupStagingSpace(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSecurityGroupStagingSpaceStub + fakeReturns := fake.updateSecurityGroupStagingSpaceReturns fake.recordInvocation("UpdateSecurityGroupStagingSpace", []interface{}{arg1, arg2}) fake.updateSecurityGroupStagingSpaceMutex.Unlock() - if fake.UpdateSecurityGroupStagingSpaceStub != nil { - return fake.UpdateSecurityGroupStagingSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSecurityGroupStagingSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7246,15 +7335,16 @@ func (fake *FakeCloudControllerClient) UpdateServiceInstanceMaintenanceInfo(arg1 arg1 string arg2 ccv2.MaintenanceInfo }{arg1, arg2}) + stub := fake.UpdateServiceInstanceMaintenanceInfoStub + fakeReturns := fake.updateServiceInstanceMaintenanceInfoReturns fake.recordInvocation("UpdateServiceInstanceMaintenanceInfo", []interface{}{arg1, arg2}) fake.updateServiceInstanceMaintenanceInfoMutex.Unlock() - if fake.UpdateServiceInstanceMaintenanceInfoStub != nil { - return fake.UpdateServiceInstanceMaintenanceInfoStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceInstanceMaintenanceInfoReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7310,15 +7400,16 @@ func (fake *FakeCloudControllerClient) UpdateServicePlan(arg1 string, arg2 bool) arg1 string arg2 bool }{arg1, arg2}) + stub := fake.UpdateServicePlanStub + fakeReturns := fake.updateServicePlanReturns fake.recordInvocation("UpdateServicePlan", []interface{}{arg1, arg2}) fake.updateServicePlanMutex.Unlock() - if fake.UpdateServicePlanStub != nil { - return fake.UpdateServicePlanStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServicePlanReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7374,15 +7465,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceDeveloper(arg1 string, arg2 st arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSpaceDeveloperStub + fakeReturns := fake.updateSpaceDeveloperReturns fake.recordInvocation("UpdateSpaceDeveloper", []interface{}{arg1, arg2}) fake.updateSpaceDeveloperMutex.Unlock() - if fake.UpdateSpaceDeveloperStub != nil { - return fake.UpdateSpaceDeveloperStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceDeveloperReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7438,15 +7530,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceDeveloperByUsername(arg1 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSpaceDeveloperByUsernameStub + fakeReturns := fake.updateSpaceDeveloperByUsernameReturns fake.recordInvocation("UpdateSpaceDeveloperByUsername", []interface{}{arg1, arg2}) fake.updateSpaceDeveloperByUsernameMutex.Unlock() - if fake.UpdateSpaceDeveloperByUsernameStub != nil { - return fake.UpdateSpaceDeveloperByUsernameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceDeveloperByUsernameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7502,15 +7595,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceManager(arg1 string, arg2 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSpaceManagerStub + fakeReturns := fake.updateSpaceManagerReturns fake.recordInvocation("UpdateSpaceManager", []interface{}{arg1, arg2}) fake.updateSpaceManagerMutex.Unlock() - if fake.UpdateSpaceManagerStub != nil { - return fake.UpdateSpaceManagerStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceManagerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7566,15 +7660,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceManagerByUsername(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSpaceManagerByUsernameStub + fakeReturns := fake.updateSpaceManagerByUsernameReturns fake.recordInvocation("UpdateSpaceManagerByUsername", []interface{}{arg1, arg2}) fake.updateSpaceManagerByUsernameMutex.Unlock() - if fake.UpdateSpaceManagerByUsernameStub != nil { - return fake.UpdateSpaceManagerByUsernameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceManagerByUsernameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7630,15 +7725,16 @@ func (fake *FakeCloudControllerClient) UpdateUserProvidedServiceInstance(arg1 st arg1 string arg2 ccv2.UserProvidedServiceInstance }{arg1, arg2}) + stub := fake.UpdateUserProvidedServiceInstanceStub + fakeReturns := fake.updateUserProvidedServiceInstanceReturns fake.recordInvocation("UpdateUserProvidedServiceInstance", []interface{}{arg1, arg2}) fake.updateUserProvidedServiceInstanceMutex.Unlock() - if fake.UpdateUserProvidedServiceInstanceStub != nil { - return fake.UpdateUserProvidedServiceInstanceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateUserProvidedServiceInstanceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7701,15 +7797,16 @@ func (fake *FakeCloudControllerClient) UploadApplicationPackage(arg1 string, arg arg3 ccv2.Reader arg4 int64 }{arg1, arg2Copy, arg3, arg4}) + stub := fake.UploadApplicationPackageStub + fakeReturns := fake.uploadApplicationPackageReturns fake.recordInvocation("UploadApplicationPackage", []interface{}{arg1, arg2Copy, arg3, arg4}) fake.uploadApplicationPackageMutex.Unlock() - if fake.UploadApplicationPackageStub != nil { - return fake.UploadApplicationPackageStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadApplicationPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7770,15 +7867,16 @@ func (fake *FakeCloudControllerClient) UploadBuildpack(arg1 string, arg2 string, arg3 io.Reader arg4 int64 }{arg1, arg2, arg3, arg4}) + stub := fake.UploadBuildpackStub + fakeReturns := fake.uploadBuildpackReturns fake.recordInvocation("UploadBuildpack", []interface{}{arg1, arg2, arg3, arg4}) fake.uploadBuildpackMutex.Unlock() - if fake.UploadBuildpackStub != nil { - return fake.UploadBuildpackStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.uploadBuildpackReturns return fakeReturns.result1, fakeReturns.result2 } @@ -7835,15 +7933,16 @@ func (fake *FakeCloudControllerClient) UploadDroplet(arg1 string, arg2 io.Reader arg2 io.Reader arg3 int64 }{arg1, arg2, arg3}) + stub := fake.UploadDropletStub + fakeReturns := fake.uploadDropletReturns fake.recordInvocation("UploadDroplet", []interface{}{arg1, arg2, arg3}) fake.uploadDropletMutex.Unlock() - if fake.UploadDropletStub != nil { - return fake.UploadDropletStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v2action/v2actionfakes/fake_config.go b/actor/v2action/v2actionfakes/fake_config.go index 9190ae0043d..1f9b153fd55 100644 --- a/actor/v2action/v2actionfakes/fake_config.go +++ b/actor/v2action/v2actionfakes/fake_config.go @@ -182,15 +182,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 } @@ -234,15 +235,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 } @@ -286,15 +288,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 } @@ -338,15 +341,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 } @@ -390,15 +394,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 } @@ -442,15 +447,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 } @@ -494,9 +500,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) } } @@ -525,9 +532,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) } } @@ -556,9 +564,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) } } @@ -589,9 +598,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) } } @@ -621,9 +631,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) } } @@ -652,9 +663,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) } } @@ -683,15 +695,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 } @@ -735,15 +748,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 } @@ -787,15 +801,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 } @@ -839,15 +854,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 } @@ -891,15 +907,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 } @@ -942,9 +959,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() } } @@ -965,9 +983,10 @@ func (fake *FakeConfig) UnsetSpaceInformation() { fake.unsetSpaceInformationMutex.Lock() fake.unsetSpaceInformationArgsForCall = append(fake.unsetSpaceInformationArgsForCall, struct { }{}) + stub := fake.UnsetSpaceInformationStub fake.recordInvocation("UnsetSpaceInformation", []interface{}{}) fake.unsetSpaceInformationMutex.Unlock() - if fake.UnsetSpaceInformationStub != nil { + if stub != nil { fake.UnsetSpaceInformationStub() } } @@ -989,15 +1008,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/v2action/v2actionfakes/fake_downloader.go b/actor/v2action/v2actionfakes/fake_downloader.go index 29ec4761a5f..896cea691a0 100644 --- a/actor/v2action/v2actionfakes/fake_downloader.go +++ b/actor/v2action/v2actionfakes/fake_downloader.go @@ -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/v2action/v2actionfakes/fake_noaaclient.go b/actor/v2action/v2actionfakes/fake_noaaclient.go index 93eb88895f4..388f05b9a75 100644 --- a/actor/v2action/v2actionfakes/fake_noaaclient.go +++ b/actor/v2action/v2actionfakes/fake_noaaclient.go @@ -61,15 +61,16 @@ func (fake *FakeNOAAClient) 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 } @@ -115,15 +116,16 @@ func (fake *FakeNOAAClient) RecentLogs(arg1 string, arg2 string) ([]*events.LogM arg1 string arg2 string }{arg1, arg2}) + stub := fake.RecentLogsStub + fakeReturns := fake.recentLogsReturns fake.recordInvocation("RecentLogs", []interface{}{arg1, arg2}) fake.recentLogsMutex.Unlock() - if fake.RecentLogsStub != nil { - return fake.RecentLogsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.recentLogsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -177,9 +179,10 @@ func (fake *FakeNOAAClient) SetOnConnectCallback(arg1 func()) { fake.setOnConnectCallbackArgsForCall = append(fake.setOnConnectCallbackArgsForCall, struct { arg1 func() }{arg1}) + stub := fake.SetOnConnectCallbackStub fake.recordInvocation("SetOnConnectCallback", []interface{}{arg1}) fake.setOnConnectCallbackMutex.Unlock() - if fake.SetOnConnectCallbackStub != nil { + if stub != nil { fake.SetOnConnectCallbackStub(arg1) } } @@ -210,15 +213,16 @@ func (fake *FakeNOAAClient) TailingLogs(arg1 string, arg2 string) (<-chan *event arg1 string arg2 string }{arg1, arg2}) + stub := fake.TailingLogsStub + fakeReturns := fake.tailingLogsReturns fake.recordInvocation("TailingLogs", []interface{}{arg1, arg2}) fake.tailingLogsMutex.Unlock() - if fake.TailingLogsStub != nil { - return fake.TailingLogsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.tailingLogsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v2action/v2actionfakes/fake_router_client.go b/actor/v2action/v2actionfakes/fake_router_client.go index ec15c3e56d7..4407bed2461 100644 --- a/actor/v2action/v2actionfakes/fake_router_client.go +++ b/actor/v2action/v2actionfakes/fake_router_client.go @@ -32,15 +32,16 @@ func (fake *FakeRouterClient) GetRouterGroupByName(arg1 string) (router.RouterGr 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 } diff --git a/actor/v2action/v2actionfakes/fake_simple_progress_bar.go b/actor/v2action/v2actionfakes/fake_simple_progress_bar.go index 926ca8ff62e..b34343705b3 100644 --- a/actor/v2action/v2actionfakes/fake_simple_progress_bar.go +++ b/actor/v2action/v2actionfakes/fake_simple_progress_bar.go @@ -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/v2action/v2actionfakes/fake_uaaclient.go b/actor/v2action/v2actionfakes/fake_uaaclient.go index b70282ff169..d0e1be04a92 100644 --- a/actor/v2action/v2actionfakes/fake_uaaclient.go +++ b/actor/v2action/v2actionfakes/fake_uaaclient.go @@ -98,15 +98,16 @@ func (fake *FakeUAAClient) 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 } @@ -153,15 +154,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 } @@ -221,15 +223,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 } @@ -285,15 +288,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 } @@ -347,15 +351,16 @@ func (fake *FakeUAAClient) LoginPrompts() map[string][]string { ret, specificReturn := fake.loginPromptsReturnsOnCall[len(fake.loginPromptsArgsForCall)] fake.loginPromptsArgsForCall = append(fake.loginPromptsArgsForCall, struct { }{}) + stub := fake.LoginPromptsStub + fakeReturns := fake.loginPromptsReturns fake.recordInvocation("LoginPrompts", []interface{}{}) fake.loginPromptsMutex.Unlock() - if fake.LoginPromptsStub != nil { - return fake.LoginPromptsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.loginPromptsReturns return fakeReturns.result1 } @@ -400,15 +405,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/actor/v2v3action/v2v3actionfakes/fake_v2actor.go b/actor/v2v3action/v2v3actionfakes/fake_v2actor.go index 7a1f92ebac1..6ba8ca62e1d 100644 --- a/actor/v2v3action/v2v3actionfakes/fake_v2actor.go +++ b/actor/v2v3action/v2v3actionfakes/fake_v2actor.go @@ -143,15 +143,16 @@ func (fake *FakeV2Actor) CreateApplicationManifestByNameAndSpace(arg1 string, ar arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateApplicationManifestByNameAndSpaceStub + fakeReturns := fake.createApplicationManifestByNameAndSpaceReturns fake.recordInvocation("CreateApplicationManifestByNameAndSpace", []interface{}{arg1, arg2}) fake.createApplicationManifestByNameAndSpaceMutex.Unlock() - if fake.CreateApplicationManifestByNameAndSpaceStub != nil { - return fake.CreateApplicationManifestByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationManifestByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -209,15 +210,16 @@ func (fake *FakeV2Actor) GetApplicationInstancesWithStatsByApplication(arg1 stri fake.getApplicationInstancesWithStatsByApplicationArgsForCall = append(fake.getApplicationInstancesWithStatsByApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationInstancesWithStatsByApplicationStub + fakeReturns := fake.getApplicationInstancesWithStatsByApplicationReturns fake.recordInvocation("GetApplicationInstancesWithStatsByApplication", []interface{}{arg1}) fake.getApplicationInstancesWithStatsByApplicationMutex.Unlock() - if fake.GetApplicationInstancesWithStatsByApplicationStub != nil { - return fake.GetApplicationInstancesWithStatsByApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationInstancesWithStatsByApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -275,15 +277,16 @@ func (fake *FakeV2Actor) GetApplicationRoutes(arg1 string) (v2action.Routes, v2a fake.getApplicationRoutesArgsForCall = append(fake.getApplicationRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRoutesStub + fakeReturns := fake.getApplicationRoutesReturns fake.recordInvocation("GetApplicationRoutes", []interface{}{arg1}) fake.getApplicationRoutesMutex.Unlock() - if fake.GetApplicationRoutesStub != nil { - return fake.GetApplicationRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -340,15 +343,16 @@ func (fake *FakeV2Actor) GetFeatureFlags() ([]v2action.FeatureFlag, v2action.War ret, specificReturn := fake.getFeatureFlagsReturnsOnCall[len(fake.getFeatureFlagsArgsForCall)] fake.getFeatureFlagsArgsForCall = append(fake.getFeatureFlagsArgsForCall, struct { }{}) + stub := fake.GetFeatureFlagsStub + fakeReturns := fake.getFeatureFlagsReturns fake.recordInvocation("GetFeatureFlags", []interface{}{}) fake.getFeatureFlagsMutex.Unlock() - if fake.GetFeatureFlagsStub != nil { - return fake.GetFeatureFlagsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getFeatureFlagsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -399,15 +403,16 @@ func (fake *FakeV2Actor) GetService(arg1 string) (v2action.Service, v2action.War 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, ret.result3 } - fakeReturns := fake.getServiceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -466,15 +471,16 @@ func (fake *FakeV2Actor) GetServiceInstanceByNameAndSpace(arg1 string, arg2 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceInstanceByNameAndSpaceStub + fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns fake.recordInvocation("GetServiceInstanceByNameAndSpace", []interface{}{arg1, arg2}) fake.getServiceInstanceByNameAndSpaceMutex.Unlock() - if fake.GetServiceInstanceByNameAndSpaceStub != nil { - return fake.GetServiceInstanceByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -532,15 +538,16 @@ func (fake *FakeV2Actor) GetServiceInstanceSharedTosByServiceInstance(arg1 strin fake.getServiceInstanceSharedTosByServiceInstanceArgsForCall = append(fake.getServiceInstanceSharedTosByServiceInstanceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstanceSharedTosByServiceInstanceStub + fakeReturns := fake.getServiceInstanceSharedTosByServiceInstanceReturns fake.recordInvocation("GetServiceInstanceSharedTosByServiceInstance", []interface{}{arg1}) fake.getServiceInstanceSharedTosByServiceInstanceMutex.Unlock() - if fake.GetServiceInstanceSharedTosByServiceInstanceStub != nil { - return fake.GetServiceInstanceSharedTosByServiceInstanceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceSharedTosByServiceInstanceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -599,15 +606,16 @@ func (fake *FakeV2Actor) GetSpaceByOrganizationAndName(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSpaceByOrganizationAndNameStub + fakeReturns := fake.getSpaceByOrganizationAndNameReturns fake.recordInvocation("GetSpaceByOrganizationAndName", []interface{}{arg1, arg2}) fake.getSpaceByOrganizationAndNameMutex.Unlock() - if fake.GetSpaceByOrganizationAndNameStub != nil { - return fake.GetSpaceByOrganizationAndNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceByOrganizationAndNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v2v3action/v2v3actionfakes/fake_v3actor.go b/actor/v2v3action/v2v3actionfakes/fake_v3actor.go index a66e776b674..12a13f977d9 100644 --- a/actor/v2v3action/v2v3actionfakes/fake_v3actor.go +++ b/actor/v2v3action/v2v3actionfakes/fake_v3actor.go @@ -107,15 +107,16 @@ func (fake *FakeV3Actor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -161,15 +162,16 @@ func (fake *FakeV3Actor) GetApplicationByNameAndSpace(arg1 string, arg2 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 } @@ -229,15 +231,16 @@ func (fake *FakeV3Actor) GetApplicationSummaryByNameAndSpace(arg1 string, arg2 s arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.GetApplicationSummaryByNameAndSpaceStub + fakeReturns := fake.getApplicationSummaryByNameAndSpaceReturns fake.recordInvocation("GetApplicationSummaryByNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.getApplicationSummaryByNameAndSpaceMutex.Unlock() - if fake.GetApplicationSummaryByNameAndSpaceStub != nil { - return fake.GetApplicationSummaryByNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationSummaryByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -295,15 +298,16 @@ func (fake *FakeV3Actor) GetOrganizationByName(arg1 string) (v3action.Organizati fake.getOrganizationByNameArgsForCall = append(fake.getOrganizationByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationByNameStub + fakeReturns := fake.getOrganizationByNameReturns fake.recordInvocation("GetOrganizationByName", []interface{}{arg1}) fake.getOrganizationByNameMutex.Unlock() - if fake.GetOrganizationByNameStub != nil { - return fake.GetOrganizationByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -367,15 +371,16 @@ func (fake *FakeV3Actor) ShareServiceInstanceToSpaces(arg1 string, arg2 []string arg1 string arg2 []string }{arg1, arg2Copy}) + stub := fake.ShareServiceInstanceToSpacesStub + fakeReturns := fake.shareServiceInstanceToSpacesReturns fake.recordInvocation("ShareServiceInstanceToSpaces", []interface{}{arg1, arg2Copy}) fake.shareServiceInstanceToSpacesMutex.Unlock() - if fake.ShareServiceInstanceToSpacesStub != nil { - return fake.ShareServiceInstanceToSpacesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.shareServiceInstanceToSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -434,15 +439,16 @@ func (fake *FakeV3Actor) UnshareServiceInstanceByServiceInstanceAndSpace(arg1 st arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnshareServiceInstanceByServiceInstanceAndSpaceStub + fakeReturns := fake.unshareServiceInstanceByServiceInstanceAndSpaceReturns fake.recordInvocation("UnshareServiceInstanceByServiceInstanceAndSpace", []interface{}{arg1, arg2}) fake.unshareServiceInstanceByServiceInstanceAndSpaceMutex.Unlock() - if fake.UnshareServiceInstanceByServiceInstanceAndSpaceStub != nil { - return fake.UnshareServiceInstanceByServiceInstanceAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unshareServiceInstanceByServiceInstanceAndSpaceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v3action/v3actionfakes/fake_cloud_controller_client.go b/actor/v3action/v3actionfakes/fake_cloud_controller_client.go index bc1d681cc20..f3fcd6aa620 100644 --- a/actor/v3action/v3actionfakes/fake_cloud_controller_client.go +++ b/actor/v3action/v3actionfakes/fake_cloud_controller_client.go @@ -874,15 +874,16 @@ func (fake *FakeCloudControllerClient) AppSSHEndpoint() string { ret, specificReturn := fake.appSSHEndpointReturnsOnCall[len(fake.appSSHEndpointArgsForCall)] fake.appSSHEndpointArgsForCall = append(fake.appSSHEndpointArgsForCall, struct { }{}) + stub := fake.AppSSHEndpointStub + fakeReturns := fake.appSSHEndpointReturns fake.recordInvocation("AppSSHEndpoint", []interface{}{}) fake.appSSHEndpointMutex.Unlock() - if fake.AppSSHEndpointStub != nil { - return fake.AppSSHEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.appSSHEndpointReturns return fakeReturns.result1 } @@ -926,15 +927,16 @@ func (fake *FakeCloudControllerClient) AppSSHHostKeyFingerprint() string { ret, specificReturn := fake.appSSHHostKeyFingerprintReturnsOnCall[len(fake.appSSHHostKeyFingerprintArgsForCall)] fake.appSSHHostKeyFingerprintArgsForCall = append(fake.appSSHHostKeyFingerprintArgsForCall, struct { }{}) + stub := fake.AppSSHHostKeyFingerprintStub + fakeReturns := fake.appSSHHostKeyFingerprintReturns fake.recordInvocation("AppSSHHostKeyFingerprint", []interface{}{}) fake.appSSHHostKeyFingerprintMutex.Unlock() - if fake.AppSSHHostKeyFingerprintStub != nil { - return fake.AppSSHHostKeyFingerprintStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.appSSHHostKeyFingerprintReturns return fakeReturns.result1 } @@ -979,15 +981,16 @@ func (fake *FakeCloudControllerClient) CancelDeployment(arg1 string) (ccv3.Warni fake.cancelDeploymentArgsForCall = append(fake.cancelDeploymentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CancelDeploymentStub + fakeReturns := fake.cancelDeploymentReturns fake.recordInvocation("CancelDeployment", []interface{}{arg1}) fake.cancelDeploymentMutex.Unlock() - if fake.CancelDeploymentStub != nil { - return fake.CancelDeploymentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.cancelDeploymentReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1041,15 +1044,16 @@ func (fake *FakeCloudControllerClient) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -1094,15 +1098,16 @@ func (fake *FakeCloudControllerClient) CreateApplication(arg1 resources.Applicat fake.createApplicationArgsForCall = append(fake.createApplicationArgsForCall, struct { arg1 resources.Application }{arg1}) + stub := fake.CreateApplicationStub + fakeReturns := fake.createApplicationReturns fake.recordInvocation("CreateApplication", []interface{}{arg1}) fake.createApplicationMutex.Unlock() - if fake.CreateApplicationStub != nil { - return fake.CreateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1161,15 +1166,16 @@ func (fake *FakeCloudControllerClient) CreateApplicationDeployment(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateApplicationDeploymentStub + fakeReturns := fake.createApplicationDeploymentReturns fake.recordInvocation("CreateApplicationDeployment", []interface{}{arg1, arg2}) fake.createApplicationDeploymentMutex.Unlock() - if fake.CreateApplicationDeploymentStub != nil { - return fake.CreateApplicationDeploymentStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationDeploymentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1228,15 +1234,16 @@ func (fake *FakeCloudControllerClient) CreateApplicationProcessScale(arg1 string arg1 string arg2 resources.Process }{arg1, arg2}) + stub := fake.CreateApplicationProcessScaleStub + fakeReturns := fake.createApplicationProcessScaleReturns fake.recordInvocation("CreateApplicationProcessScale", []interface{}{arg1, arg2}) fake.createApplicationProcessScaleMutex.Unlock() - if fake.CreateApplicationProcessScaleStub != nil { - return fake.CreateApplicationProcessScaleStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationProcessScaleReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1295,15 +1302,16 @@ func (fake *FakeCloudControllerClient) CreateApplicationTask(arg1 string, arg2 r arg1 string arg2 resources.Task }{arg1, arg2}) + stub := fake.CreateApplicationTaskStub + fakeReturns := fake.createApplicationTaskReturns fake.recordInvocation("CreateApplicationTask", []interface{}{arg1, arg2}) fake.createApplicationTaskMutex.Unlock() - if fake.CreateApplicationTaskStub != nil { - return fake.CreateApplicationTaskStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationTaskReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1361,15 +1369,16 @@ func (fake *FakeCloudControllerClient) CreateBuild(arg1 resources.Build) (resour fake.createBuildArgsForCall = append(fake.createBuildArgsForCall, struct { arg1 resources.Build }{arg1}) + stub := fake.CreateBuildStub + fakeReturns := fake.createBuildReturns fake.recordInvocation("CreateBuild", []interface{}{arg1}) fake.createBuildMutex.Unlock() - if fake.CreateBuildStub != nil { - return fake.CreateBuildStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBuildReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1427,15 +1436,16 @@ func (fake *FakeCloudControllerClient) CreateIsolationSegment(arg1 resources.Iso fake.createIsolationSegmentArgsForCall = append(fake.createIsolationSegmentArgsForCall, struct { arg1 resources.IsolationSegment }{arg1}) + stub := fake.CreateIsolationSegmentStub + fakeReturns := fake.createIsolationSegmentReturns fake.recordInvocation("CreateIsolationSegment", []interface{}{arg1}) fake.createIsolationSegmentMutex.Unlock() - if fake.CreateIsolationSegmentStub != nil { - return fake.CreateIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1493,15 +1503,16 @@ func (fake *FakeCloudControllerClient) CreatePackage(arg1 resources.Package) (re fake.createPackageArgsForCall = append(fake.createPackageArgsForCall, struct { arg1 resources.Package }{arg1}) + stub := fake.CreatePackageStub + fakeReturns := fake.createPackageReturns fake.recordInvocation("CreatePackage", []interface{}{arg1}) fake.createPackageMutex.Unlock() - if fake.CreatePackageStub != nil { - return fake.CreatePackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1559,15 +1570,16 @@ func (fake *FakeCloudControllerClient) DeleteApplication(arg1 string) (ccv3.JobU fake.deleteApplicationArgsForCall = append(fake.deleteApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteApplicationStub + fakeReturns := fake.deleteApplicationReturns fake.recordInvocation("DeleteApplication", []interface{}{arg1}) fake.deleteApplicationMutex.Unlock() - if fake.DeleteApplicationStub != nil { - return fake.DeleteApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1627,15 +1639,16 @@ func (fake *FakeCloudControllerClient) DeleteApplicationProcessInstance(arg1 str arg2 string arg3 int }{arg1, arg2, arg3}) + stub := fake.DeleteApplicationProcessInstanceStub + fakeReturns := fake.deleteApplicationProcessInstanceReturns fake.recordInvocation("DeleteApplicationProcessInstance", []interface{}{arg1, arg2, arg3}) fake.deleteApplicationProcessInstanceMutex.Unlock() - if fake.DeleteApplicationProcessInstanceStub != nil { - return fake.DeleteApplicationProcessInstanceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteApplicationProcessInstanceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1690,15 +1703,16 @@ func (fake *FakeCloudControllerClient) DeleteIsolationSegment(arg1 string) (ccv3 fake.deleteIsolationSegmentArgsForCall = append(fake.deleteIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteIsolationSegmentStub + fakeReturns := fake.deleteIsolationSegmentReturns fake.recordInvocation("DeleteIsolationSegment", []interface{}{arg1}) fake.deleteIsolationSegmentMutex.Unlock() - if fake.DeleteIsolationSegmentStub != nil { - return fake.DeleteIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1754,15 +1768,16 @@ func (fake *FakeCloudControllerClient) DeleteIsolationSegmentOrganization(arg1 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteIsolationSegmentOrganizationStub + fakeReturns := fake.deleteIsolationSegmentOrganizationReturns fake.recordInvocation("DeleteIsolationSegmentOrganization", []interface{}{arg1, arg2}) fake.deleteIsolationSegmentOrganizationMutex.Unlock() - if fake.DeleteIsolationSegmentOrganizationStub != nil { - return fake.DeleteIsolationSegmentOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteIsolationSegmentOrganizationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1818,15 +1833,16 @@ func (fake *FakeCloudControllerClient) DeleteServiceInstanceRelationshipsSharedS arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteServiceInstanceRelationshipsSharedSpaceStub + fakeReturns := fake.deleteServiceInstanceRelationshipsSharedSpaceReturns fake.recordInvocation("DeleteServiceInstanceRelationshipsSharedSpace", []interface{}{arg1, arg2}) fake.deleteServiceInstanceRelationshipsSharedSpaceMutex.Unlock() - if fake.DeleteServiceInstanceRelationshipsSharedSpaceStub != nil { - return fake.DeleteServiceInstanceRelationshipsSharedSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteServiceInstanceRelationshipsSharedSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1887,15 +1903,16 @@ func (fake *FakeCloudControllerClient) EntitleIsolationSegmentToOrganizations(ar arg1 string arg2 []string }{arg1, arg2Copy}) + stub := fake.EntitleIsolationSegmentToOrganizationsStub + fakeReturns := fake.entitleIsolationSegmentToOrganizationsReturns fake.recordInvocation("EntitleIsolationSegmentToOrganizations", []interface{}{arg1, arg2Copy}) fake.entitleIsolationSegmentToOrganizationsMutex.Unlock() - if fake.EntitleIsolationSegmentToOrganizationsStub != nil { - return fake.EntitleIsolationSegmentToOrganizationsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.entitleIsolationSegmentToOrganizationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1953,15 +1970,16 @@ func (fake *FakeCloudControllerClient) GetApplicationDropletCurrent(arg1 string) fake.getApplicationDropletCurrentArgsForCall = append(fake.getApplicationDropletCurrentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationDropletCurrentStub + fakeReturns := fake.getApplicationDropletCurrentReturns fake.recordInvocation("GetApplicationDropletCurrent", []interface{}{arg1}) fake.getApplicationDropletCurrentMutex.Unlock() - if fake.GetApplicationDropletCurrentStub != nil { - return fake.GetApplicationDropletCurrentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationDropletCurrentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2019,15 +2037,16 @@ func (fake *FakeCloudControllerClient) GetApplicationEnvironment(arg1 string) (c fake.getApplicationEnvironmentArgsForCall = append(fake.getApplicationEnvironmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationEnvironmentStub + fakeReturns := fake.getApplicationEnvironmentReturns fake.recordInvocation("GetApplicationEnvironment", []interface{}{arg1}) fake.getApplicationEnvironmentMutex.Unlock() - if fake.GetApplicationEnvironmentStub != nil { - return fake.GetApplicationEnvironmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationEnvironmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2086,15 +2105,16 @@ func (fake *FakeCloudControllerClient) GetApplicationProcessByType(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationProcessByTypeStub + fakeReturns := fake.getApplicationProcessByTypeReturns fake.recordInvocation("GetApplicationProcessByType", []interface{}{arg1, arg2}) fake.getApplicationProcessByTypeMutex.Unlock() - if fake.GetApplicationProcessByTypeStub != nil { - return fake.GetApplicationProcessByTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationProcessByTypeReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2152,15 +2172,16 @@ func (fake *FakeCloudControllerClient) GetApplicationProcesses(arg1 string) ([]r fake.getApplicationProcessesArgsForCall = append(fake.getApplicationProcessesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationProcessesStub + fakeReturns := fake.getApplicationProcessesReturns fake.recordInvocation("GetApplicationProcesses", []interface{}{arg1}) fake.getApplicationProcessesMutex.Unlock() - if fake.GetApplicationProcessesStub != nil { - return fake.GetApplicationProcessesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationProcessesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2219,15 +2240,16 @@ func (fake *FakeCloudControllerClient) GetApplicationTasks(arg1 string, arg2 ... arg1 string arg2 []ccv3.Query }{arg1, arg2}) + stub := fake.GetApplicationTasksStub + fakeReturns := fake.getApplicationTasksReturns fake.recordInvocation("GetApplicationTasks", []interface{}{arg1, arg2}) fake.getApplicationTasksMutex.Unlock() - if fake.GetApplicationTasksStub != nil { - return fake.GetApplicationTasksStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationTasksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2285,15 +2307,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 } @@ -2351,15 +2374,16 @@ func (fake *FakeCloudControllerClient) GetBuild(arg1 string) (resources.Build, c fake.getBuildArgsForCall = append(fake.getBuildArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetBuildStub + fakeReturns := fake.getBuildReturns fake.recordInvocation("GetBuild", []interface{}{arg1}) fake.getBuildMutex.Unlock() - if fake.GetBuildStub != nil { - return fake.GetBuildStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getBuildReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2417,15 +2441,16 @@ func (fake *FakeCloudControllerClient) GetDeployment(arg1 string) (resources.Dep fake.getDeploymentArgsForCall = append(fake.getDeploymentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDeploymentStub + fakeReturns := fake.getDeploymentReturns fake.recordInvocation("GetDeployment", []interface{}{arg1}) fake.getDeploymentMutex.Unlock() - if fake.GetDeploymentStub != nil { - return fake.GetDeploymentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDeploymentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2483,15 +2508,16 @@ func (fake *FakeCloudControllerClient) GetDeployments(arg1 ...ccv3.Query) ([]res fake.getDeploymentsArgsForCall = append(fake.getDeploymentsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetDeploymentsStub + fakeReturns := fake.getDeploymentsReturns fake.recordInvocation("GetDeployments", []interface{}{arg1}) fake.getDeploymentsMutex.Unlock() - if fake.GetDeploymentsStub != nil { - return fake.GetDeploymentsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDeploymentsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2549,15 +2575,16 @@ func (fake *FakeCloudControllerClient) GetDroplet(arg1 string) (resources.Drople fake.getDropletArgsForCall = append(fake.getDropletArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDropletStub + fakeReturns := fake.getDropletReturns fake.recordInvocation("GetDroplet", []interface{}{arg1}) fake.getDropletMutex.Unlock() - if fake.GetDropletStub != nil { - return fake.GetDropletStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2615,15 +2642,16 @@ func (fake *FakeCloudControllerClient) GetDroplets(arg1 ...ccv3.Query) ([]resour fake.getDropletsArgsForCall = append(fake.getDropletsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetDropletsStub + fakeReturns := fake.getDropletsReturns fake.recordInvocation("GetDroplets", []interface{}{arg1}) fake.getDropletsMutex.Unlock() - if fake.GetDropletsStub != nil { - return fake.GetDropletsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDropletsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2680,15 +2708,16 @@ func (fake *FakeCloudControllerClient) GetInfo() (ccv3.Info, ccv3.ResourceLinks, ret, specificReturn := fake.getInfoReturnsOnCall[len(fake.getInfoArgsForCall)] fake.getInfoArgsForCall = append(fake.getInfoArgsForCall, struct { }{}) + stub := fake.GetInfoStub + fakeReturns := fake.getInfoReturns fake.recordInvocation("GetInfo", []interface{}{}) fake.getInfoMutex.Unlock() - if fake.GetInfoStub != nil { - return fake.GetInfoStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4 } - fakeReturns := fake.getInfoReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4 } @@ -2742,15 +2771,16 @@ func (fake *FakeCloudControllerClient) GetIsolationSegment(arg1 string) (resourc fake.getIsolationSegmentArgsForCall = append(fake.getIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetIsolationSegmentStub + fakeReturns := fake.getIsolationSegmentReturns fake.recordInvocation("GetIsolationSegment", []interface{}{arg1}) fake.getIsolationSegmentMutex.Unlock() - if fake.GetIsolationSegmentStub != nil { - return fake.GetIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2808,15 +2838,16 @@ func (fake *FakeCloudControllerClient) GetIsolationSegmentOrganizations(arg1 str fake.getIsolationSegmentOrganizationsArgsForCall = append(fake.getIsolationSegmentOrganizationsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetIsolationSegmentOrganizationsStub + fakeReturns := fake.getIsolationSegmentOrganizationsReturns fake.recordInvocation("GetIsolationSegmentOrganizations", []interface{}{arg1}) fake.getIsolationSegmentOrganizationsMutex.Unlock() - if fake.GetIsolationSegmentOrganizationsStub != nil { - return fake.GetIsolationSegmentOrganizationsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentOrganizationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2874,15 +2905,16 @@ func (fake *FakeCloudControllerClient) GetIsolationSegments(arg1 ...ccv3.Query) fake.getIsolationSegmentsArgsForCall = append(fake.getIsolationSegmentsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetIsolationSegmentsStub + fakeReturns := fake.getIsolationSegmentsReturns fake.recordInvocation("GetIsolationSegments", []interface{}{arg1}) fake.getIsolationSegmentsMutex.Unlock() - if fake.GetIsolationSegmentsStub != nil { - return fake.GetIsolationSegmentsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2940,15 +2972,16 @@ func (fake *FakeCloudControllerClient) GetOrganizationDefaultIsolationSegment(ar fake.getOrganizationDefaultIsolationSegmentArgsForCall = append(fake.getOrganizationDefaultIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationDefaultIsolationSegmentStub + fakeReturns := fake.getOrganizationDefaultIsolationSegmentReturns fake.recordInvocation("GetOrganizationDefaultIsolationSegment", []interface{}{arg1}) fake.getOrganizationDefaultIsolationSegmentMutex.Unlock() - if fake.GetOrganizationDefaultIsolationSegmentStub != nil { - return fake.GetOrganizationDefaultIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationDefaultIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3006,15 +3039,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 } @@ -3072,15 +3106,16 @@ func (fake *FakeCloudControllerClient) GetPackage(arg1 string) (resources.Packag fake.getPackageArgsForCall = append(fake.getPackageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPackageStub + fakeReturns := fake.getPackageReturns fake.recordInvocation("GetPackage", []interface{}{arg1}) fake.getPackageMutex.Unlock() - if fake.GetPackageStub != nil { - return fake.GetPackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3138,15 +3173,16 @@ func (fake *FakeCloudControllerClient) GetPackages(arg1 ...ccv3.Query) ([]resour fake.getPackagesArgsForCall = append(fake.getPackagesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetPackagesStub + fakeReturns := fake.getPackagesReturns fake.recordInvocation("GetPackages", []interface{}{arg1}) fake.getPackagesMutex.Unlock() - if fake.GetPackagesStub != nil { - return fake.GetPackagesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getPackagesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3204,15 +3240,16 @@ func (fake *FakeCloudControllerClient) GetProcessInstances(arg1 string) ([]ccv3. fake.getProcessInstancesArgsForCall = append(fake.getProcessInstancesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetProcessInstancesStub + fakeReturns := fake.getProcessInstancesReturns fake.recordInvocation("GetProcessInstances", []interface{}{arg1}) fake.getProcessInstancesMutex.Unlock() - if fake.GetProcessInstancesStub != nil { - return fake.GetProcessInstancesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getProcessInstancesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3270,15 +3307,16 @@ func (fake *FakeCloudControllerClient) GetServiceInstances(arg1 ...ccv3.Query) ( fake.getServiceInstancesArgsForCall = append(fake.getServiceInstancesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetServiceInstancesStub + fakeReturns := fake.getServiceInstancesReturns fake.recordInvocation("GetServiceInstances", []interface{}{arg1}) fake.getServiceInstancesMutex.Unlock() - if fake.GetServiceInstancesStub != nil { - return fake.GetServiceInstancesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstancesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3336,15 +3374,16 @@ func (fake *FakeCloudControllerClient) GetSpaceIsolationSegment(arg1 string) (re fake.getSpaceIsolationSegmentArgsForCall = append(fake.getSpaceIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceIsolationSegmentStub + fakeReturns := fake.getSpaceIsolationSegmentReturns fake.recordInvocation("GetSpaceIsolationSegment", []interface{}{arg1}) fake.getSpaceIsolationSegmentMutex.Unlock() - if fake.GetSpaceIsolationSegmentStub != nil { - return fake.GetSpaceIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3402,15 +3441,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 } @@ -3471,15 +3511,16 @@ func (fake *FakeCloudControllerClient) PollJob(arg1 ccv3.JobURL) (ccv3.Warnings, fake.pollJobArgsForCall = append(fake.pollJobArgsForCall, struct { arg1 ccv3.JobURL }{arg1}) + stub := fake.PollJobStub + fakeReturns := fake.pollJobReturns fake.recordInvocation("PollJob", []interface{}{arg1}) fake.pollJobMutex.Unlock() - if fake.PollJobStub != nil { - return fake.PollJobStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollJobReturns return fakeReturns.result1, fakeReturns.result2 } @@ -3535,15 +3576,16 @@ func (fake *FakeCloudControllerClient) SetApplicationDroplet(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetApplicationDropletStub + fakeReturns := fake.setApplicationDropletReturns fake.recordInvocation("SetApplicationDroplet", []interface{}{arg1, arg2}) fake.setApplicationDropletMutex.Unlock() - if fake.SetApplicationDropletStub != nil { - return fake.SetApplicationDropletStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.setApplicationDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3607,15 +3649,16 @@ func (fake *FakeCloudControllerClient) ShareServiceInstanceToSpaces(arg1 string, arg1 string arg2 []string }{arg1, arg2Copy}) + stub := fake.ShareServiceInstanceToSpacesStub + fakeReturns := fake.shareServiceInstanceToSpacesReturns fake.recordInvocation("ShareServiceInstanceToSpaces", []interface{}{arg1, arg2Copy}) fake.shareServiceInstanceToSpacesMutex.Unlock() - if fake.ShareServiceInstanceToSpacesStub != nil { - return fake.ShareServiceInstanceToSpacesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.shareServiceInstanceToSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3673,15 +3716,16 @@ func (fake *FakeCloudControllerClient) TargetCF(arg1 ccv3.TargetSettings) (ccv3. fake.targetCFArgsForCall = append(fake.targetCFArgsForCall, struct { arg1 ccv3.TargetSettings }{arg1}) + stub := fake.TargetCFStub + fakeReturns := fake.targetCFReturns fake.recordInvocation("TargetCF", []interface{}{arg1}) fake.targetCFMutex.Unlock() - if fake.TargetCFStub != nil { - return fake.TargetCFStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.targetCFReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3739,15 +3783,16 @@ func (fake *FakeCloudControllerClient) UpdateApplication(arg1 resources.Applicat fake.updateApplicationArgsForCall = append(fake.updateApplicationArgsForCall, struct { arg1 resources.Application }{arg1}) + stub := fake.UpdateApplicationStub + fakeReturns := fake.updateApplicationReturns fake.recordInvocation("UpdateApplication", []interface{}{arg1}) fake.updateApplicationMutex.Unlock() - if fake.UpdateApplicationStub != nil { - return fake.UpdateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3811,15 +3856,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationApplyManifest(arg1 strin arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.UpdateApplicationApplyManifestStub + fakeReturns := fake.updateApplicationApplyManifestReturns fake.recordInvocation("UpdateApplicationApplyManifest", []interface{}{arg1, arg2Copy}) fake.updateApplicationApplyManifestMutex.Unlock() - if fake.UpdateApplicationApplyManifestStub != nil { - return fake.UpdateApplicationApplyManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationApplyManifestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3878,15 +3924,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationEnvironmentVariables(arg arg1 string arg2 resources.EnvironmentVariables }{arg1, arg2}) + stub := fake.UpdateApplicationEnvironmentVariablesStub + fakeReturns := fake.updateApplicationEnvironmentVariablesReturns fake.recordInvocation("UpdateApplicationEnvironmentVariables", []interface{}{arg1, arg2}) fake.updateApplicationEnvironmentVariablesMutex.Unlock() - if fake.UpdateApplicationEnvironmentVariablesStub != nil { - return fake.UpdateApplicationEnvironmentVariablesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationEnvironmentVariablesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3944,15 +3991,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationRestart(arg1 string) (re fake.updateApplicationRestartArgsForCall = append(fake.updateApplicationRestartArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UpdateApplicationRestartStub + fakeReturns := fake.updateApplicationRestartReturns fake.recordInvocation("UpdateApplicationRestart", []interface{}{arg1}) fake.updateApplicationRestartMutex.Unlock() - if fake.UpdateApplicationRestartStub != nil { - return fake.UpdateApplicationRestartStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationRestartReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4010,15 +4058,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationStart(arg1 string) (reso fake.updateApplicationStartArgsForCall = append(fake.updateApplicationStartArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UpdateApplicationStartStub + fakeReturns := fake.updateApplicationStartReturns fake.recordInvocation("UpdateApplicationStart", []interface{}{arg1}) fake.updateApplicationStartMutex.Unlock() - if fake.UpdateApplicationStartStub != nil { - return fake.UpdateApplicationStartStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationStartReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4076,15 +4125,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationStop(arg1 string) (resou fake.updateApplicationStopArgsForCall = append(fake.updateApplicationStopArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UpdateApplicationStopStub + fakeReturns := fake.updateApplicationStopReturns fake.recordInvocation("UpdateApplicationStop", []interface{}{arg1}) fake.updateApplicationStopMutex.Unlock() - if fake.UpdateApplicationStopStub != nil { - return fake.UpdateApplicationStopStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationStopReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4143,15 +4193,16 @@ func (fake *FakeCloudControllerClient) UpdateOrganizationDefaultIsolationSegment arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateOrganizationDefaultIsolationSegmentRelationshipStub + fakeReturns := fake.updateOrganizationDefaultIsolationSegmentRelationshipReturns fake.recordInvocation("UpdateOrganizationDefaultIsolationSegmentRelationship", []interface{}{arg1, arg2}) fake.updateOrganizationDefaultIsolationSegmentRelationshipMutex.Unlock() - if fake.UpdateOrganizationDefaultIsolationSegmentRelationshipStub != nil { - return fake.UpdateOrganizationDefaultIsolationSegmentRelationshipStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateOrganizationDefaultIsolationSegmentRelationshipReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4209,15 +4260,16 @@ func (fake *FakeCloudControllerClient) UpdateProcess(arg1 resources.Process) (re fake.updateProcessArgsForCall = append(fake.updateProcessArgsForCall, struct { arg1 resources.Process }{arg1}) + stub := fake.UpdateProcessStub + fakeReturns := fake.updateProcessReturns fake.recordInvocation("UpdateProcess", []interface{}{arg1}) fake.updateProcessMutex.Unlock() - if fake.UpdateProcessStub != nil { - return fake.UpdateProcessStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateProcessReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4276,15 +4328,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceIsolationSegmentRelationship(a arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSpaceIsolationSegmentRelationshipStub + fakeReturns := fake.updateSpaceIsolationSegmentRelationshipReturns fake.recordInvocation("UpdateSpaceIsolationSegmentRelationship", []interface{}{arg1, arg2}) fake.updateSpaceIsolationSegmentRelationshipMutex.Unlock() - if fake.UpdateSpaceIsolationSegmentRelationshipStub != nil { - return fake.UpdateSpaceIsolationSegmentRelationshipStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateSpaceIsolationSegmentRelationshipReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4342,15 +4395,16 @@ func (fake *FakeCloudControllerClient) UpdateTaskCancel(arg1 string) (resources. fake.updateTaskCancelArgsForCall = append(fake.updateTaskCancelArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UpdateTaskCancelStub + fakeReturns := fake.updateTaskCancelReturns fake.recordInvocation("UpdateTaskCancel", []interface{}{arg1}) fake.updateTaskCancelMutex.Unlock() - if fake.UpdateTaskCancelStub != nil { - return fake.UpdateTaskCancelStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateTaskCancelReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4416,15 +4470,16 @@ func (fake *FakeCloudControllerClient) UploadBitsPackage(arg1 resources.Package, arg3 io.Reader arg4 int64 }{arg1, arg2Copy, arg3, arg4}) + stub := fake.UploadBitsPackageStub + fakeReturns := fake.uploadBitsPackageReturns fake.recordInvocation("UploadBitsPackage", []interface{}{arg1, arg2Copy, arg3, arg4}) fake.uploadBitsPackageMutex.Unlock() - if fake.UploadBitsPackageStub != nil { - return fake.UploadBitsPackageStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadBitsPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4485,15 +4540,16 @@ func (fake *FakeCloudControllerClient) UploadDropletBits(arg1 string, arg2 strin arg3 io.Reader arg4 int64 }{arg1, arg2, arg3, arg4}) + stub := fake.UploadDropletBitsStub + fakeReturns := fake.uploadDropletBitsReturns fake.recordInvocation("UploadDropletBits", []interface{}{arg1, arg2, arg3, arg4}) fake.uploadDropletBitsMutex.Unlock() - if fake.UploadDropletBitsStub != nil { - return fake.UploadDropletBitsStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadDropletBitsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4552,15 +4608,16 @@ func (fake *FakeCloudControllerClient) UploadPackage(arg1 resources.Package, arg arg1 resources.Package arg2 string }{arg1, arg2}) + stub := fake.UploadPackageStub + fakeReturns := fake.uploadPackageReturns fake.recordInvocation("UploadPackage", []interface{}{arg1, arg2}) fake.uploadPackageMutex.Unlock() - if fake.UploadPackageStub != nil { - return fake.UploadPackageStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v3action/v3actionfakes/fake_config.go b/actor/v3action/v3actionfakes/fake_config.go index 63e48844212..e20256a737f 100644 --- a/actor/v3action/v3actionfakes/fake_config.go +++ b/actor/v3action/v3actionfakes/fake_config.go @@ -136,15 +136,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 } @@ -188,15 +189,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 } @@ -240,15 +242,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 } @@ -292,15 +295,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 } @@ -344,9 +348,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) } } @@ -377,9 +382,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) } } @@ -409,9 +415,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) } } @@ -440,9 +447,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) } } @@ -471,15 +479,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 } @@ -523,15 +532,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 } @@ -575,15 +585,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 } @@ -627,15 +638,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 } @@ -679,15 +691,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 } @@ -730,9 +743,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/v3action/v3actionfakes/fake_manifest_parser.go b/actor/v3action/v3actionfakes/fake_manifest_parser.go index 9873012dced..46e281e2560 100644 --- a/actor/v3action/v3actionfakes/fake_manifest_parser.go +++ b/actor/v3action/v3actionfakes/fake_manifest_parser.go @@ -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/v3action/v3actionfakes/fake_noaaclient.go b/actor/v3action/v3actionfakes/fake_noaaclient.go index 59894af317d..6aae71c11ef 100644 --- a/actor/v3action/v3actionfakes/fake_noaaclient.go +++ b/actor/v3action/v3actionfakes/fake_noaaclient.go @@ -61,15 +61,16 @@ func (fake *FakeNOAAClient) 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 } @@ -115,15 +116,16 @@ func (fake *FakeNOAAClient) RecentLogs(arg1 string, arg2 string) ([]*events.LogM arg1 string arg2 string }{arg1, arg2}) + stub := fake.RecentLogsStub + fakeReturns := fake.recentLogsReturns fake.recordInvocation("RecentLogs", []interface{}{arg1, arg2}) fake.recentLogsMutex.Unlock() - if fake.RecentLogsStub != nil { - return fake.RecentLogsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.recentLogsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -177,9 +179,10 @@ func (fake *FakeNOAAClient) SetOnConnectCallback(arg1 func()) { fake.setOnConnectCallbackArgsForCall = append(fake.setOnConnectCallbackArgsForCall, struct { arg1 func() }{arg1}) + stub := fake.SetOnConnectCallbackStub fake.recordInvocation("SetOnConnectCallback", []interface{}{arg1}) fake.setOnConnectCallbackMutex.Unlock() - if fake.SetOnConnectCallbackStub != nil { + if stub != nil { fake.SetOnConnectCallbackStub(arg1) } } @@ -210,15 +213,16 @@ func (fake *FakeNOAAClient) TailingLogs(arg1 string, arg2 string) (<-chan *event arg1 string arg2 string }{arg1, arg2}) + stub := fake.TailingLogsStub + fakeReturns := fake.tailingLogsReturns fake.recordInvocation("TailingLogs", []interface{}{arg1, arg2}) fake.tailingLogsMutex.Unlock() - if fake.TailingLogsStub != nil { - return fake.TailingLogsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.tailingLogsReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v3action/v3actionfakes/fake_shared_actor.go b/actor/v3action/v3actionfakes/fake_shared_actor.go index 38f7915b524..1f7f49c697f 100644 --- a/actor/v3action/v3actionfakes/fake_shared_actor.go +++ b/actor/v3action/v3actionfakes/fake_shared_actor.go @@ -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/v3action/v3actionfakes/fake_sshactor.go b/actor/v3action/v3actionfakes/fake_sshactor.go index b51bf2c4fc7..e358fff4134 100644 --- a/actor/v3action/v3actionfakes/fake_sshactor.go +++ b/actor/v3action/v3actionfakes/fake_sshactor.go @@ -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/v3action/v3actionfakes/fake_uaaclient.go b/actor/v3action/v3actionfakes/fake_uaaclient.go index 6539cf256fc..4a0708411f6 100644 --- a/actor/v3action/v3actionfakes/fake_uaaclient.go +++ b/actor/v3action/v3actionfakes/fake_uaaclient.go @@ -62,15 +62,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 } @@ -129,15 +130,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 } @@ -191,15 +193,16 @@ func (fake *FakeUAAClient) LoginPrompts() map[string][]string { ret, specificReturn := fake.loginPromptsReturnsOnCall[len(fake.loginPromptsArgsForCall)] fake.loginPromptsArgsForCall = append(fake.loginPromptsArgsForCall, struct { }{}) + stub := fake.LoginPromptsStub + fakeReturns := fake.loginPromptsReturns fake.recordInvocation("LoginPrompts", []interface{}{}) fake.loginPromptsMutex.Unlock() - if fake.LoginPromptsStub != nil { - return fake.LoginPromptsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.loginPromptsReturns return fakeReturns.result1 } diff --git a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go index 1f6a3c8c871..b6a981eae59 100644 --- a/actor/v7action/v7actionfakes/fake_cloud_controller_client.go +++ b/actor/v7action/v7actionfakes/fake_cloud_controller_client.go @@ -2435,15 +2435,16 @@ func (fake *FakeCloudControllerClient) AppSSHEndpoint() string { ret, specificReturn := fake.appSSHEndpointReturnsOnCall[len(fake.appSSHEndpointArgsForCall)] fake.appSSHEndpointArgsForCall = append(fake.appSSHEndpointArgsForCall, struct { }{}) + stub := fake.AppSSHEndpointStub + fakeReturns := fake.appSSHEndpointReturns fake.recordInvocation("AppSSHEndpoint", []interface{}{}) fake.appSSHEndpointMutex.Unlock() - if fake.AppSSHEndpointStub != nil { - return fake.AppSSHEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.appSSHEndpointReturns return fakeReturns.result1 } @@ -2487,15 +2488,16 @@ func (fake *FakeCloudControllerClient) AppSSHHostKeyFingerprint() string { ret, specificReturn := fake.appSSHHostKeyFingerprintReturnsOnCall[len(fake.appSSHHostKeyFingerprintArgsForCall)] fake.appSSHHostKeyFingerprintArgsForCall = append(fake.appSSHHostKeyFingerprintArgsForCall, struct { }{}) + stub := fake.AppSSHHostKeyFingerprintStub + fakeReturns := fake.appSSHHostKeyFingerprintReturns fake.recordInvocation("AppSSHHostKeyFingerprint", []interface{}{}) fake.appSSHHostKeyFingerprintMutex.Unlock() - if fake.AppSSHHostKeyFingerprintStub != nil { - return fake.AppSSHHostKeyFingerprintStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.appSSHHostKeyFingerprintReturns return fakeReturns.result1 } @@ -2541,15 +2543,16 @@ func (fake *FakeCloudControllerClient) ApplyOrganizationQuota(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.ApplyOrganizationQuotaStub + fakeReturns := fake.applyOrganizationQuotaReturns fake.recordInvocation("ApplyOrganizationQuota", []interface{}{arg1, arg2}) fake.applyOrganizationQuotaMutex.Unlock() - if fake.ApplyOrganizationQuotaStub != nil { - return fake.ApplyOrganizationQuotaStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.applyOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2608,15 +2611,16 @@ func (fake *FakeCloudControllerClient) ApplySpaceQuota(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.ApplySpaceQuotaStub + fakeReturns := fake.applySpaceQuotaReturns fake.recordInvocation("ApplySpaceQuota", []interface{}{arg1, arg2}) fake.applySpaceQuotaMutex.Unlock() - if fake.ApplySpaceQuotaStub != nil { - return fake.ApplySpaceQuotaStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.applySpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2674,15 +2678,16 @@ func (fake *FakeCloudControllerClient) CancelDeployment(arg1 string) (ccv3.Warni fake.cancelDeploymentArgsForCall = append(fake.cancelDeploymentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CancelDeploymentStub + fakeReturns := fake.cancelDeploymentReturns fake.recordInvocation("CancelDeployment", []interface{}{arg1}) fake.cancelDeploymentMutex.Unlock() - if fake.CancelDeploymentStub != nil { - return fake.CancelDeploymentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.cancelDeploymentReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2740,15 +2745,16 @@ func (fake *FakeCloudControllerClient) CheckRoute(arg1 string, arg2 string, arg3 arg3 string arg4 int }{arg1, arg2, arg3, arg4}) + stub := fake.CheckRouteStub + fakeReturns := fake.checkRouteReturns fake.recordInvocation("CheckRoute", []interface{}{arg1, arg2, arg3, arg4}) fake.checkRouteMutex.Unlock() - if fake.CheckRouteStub != nil { - return fake.CheckRouteStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.checkRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2805,15 +2811,16 @@ func (fake *FakeCloudControllerClient) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -2859,15 +2866,16 @@ func (fake *FakeCloudControllerClient) CopyPackage(arg1 string, arg2 string) (re arg1 string arg2 string }{arg1, arg2}) + stub := fake.CopyPackageStub + fakeReturns := fake.copyPackageReturns fake.recordInvocation("CopyPackage", []interface{}{arg1, arg2}) fake.copyPackageMutex.Unlock() - if fake.CopyPackageStub != nil { - return fake.CopyPackageStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.copyPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2925,15 +2933,16 @@ func (fake *FakeCloudControllerClient) CreateApplication(arg1 resources.Applicat fake.createApplicationArgsForCall = append(fake.createApplicationArgsForCall, struct { arg1 resources.Application }{arg1}) + stub := fake.CreateApplicationStub + fakeReturns := fake.createApplicationReturns fake.recordInvocation("CreateApplication", []interface{}{arg1}) fake.createApplicationMutex.Unlock() - if fake.CreateApplicationStub != nil { - return fake.CreateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2992,15 +3001,16 @@ func (fake *FakeCloudControllerClient) CreateApplicationDeployment(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateApplicationDeploymentStub + fakeReturns := fake.createApplicationDeploymentReturns fake.recordInvocation("CreateApplicationDeployment", []interface{}{arg1, arg2}) fake.createApplicationDeploymentMutex.Unlock() - if fake.CreateApplicationDeploymentStub != nil { - return fake.CreateApplicationDeploymentStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationDeploymentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3059,15 +3069,16 @@ func (fake *FakeCloudControllerClient) CreateApplicationDeploymentByRevision(arg arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateApplicationDeploymentByRevisionStub + fakeReturns := fake.createApplicationDeploymentByRevisionReturns fake.recordInvocation("CreateApplicationDeploymentByRevision", []interface{}{arg1, arg2}) fake.createApplicationDeploymentByRevisionMutex.Unlock() - if fake.CreateApplicationDeploymentByRevisionStub != nil { - return fake.CreateApplicationDeploymentByRevisionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationDeploymentByRevisionReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3126,15 +3137,16 @@ func (fake *FakeCloudControllerClient) CreateApplicationProcessScale(arg1 string arg1 string arg2 resources.Process }{arg1, arg2}) + stub := fake.CreateApplicationProcessScaleStub + fakeReturns := fake.createApplicationProcessScaleReturns fake.recordInvocation("CreateApplicationProcessScale", []interface{}{arg1, arg2}) fake.createApplicationProcessScaleMutex.Unlock() - if fake.CreateApplicationProcessScaleStub != nil { - return fake.CreateApplicationProcessScaleStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationProcessScaleReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3193,15 +3205,16 @@ func (fake *FakeCloudControllerClient) CreateApplicationTask(arg1 string, arg2 r arg1 string arg2 resources.Task }{arg1, arg2}) + stub := fake.CreateApplicationTaskStub + fakeReturns := fake.createApplicationTaskReturns fake.recordInvocation("CreateApplicationTask", []interface{}{arg1, arg2}) fake.createApplicationTaskMutex.Unlock() - if fake.CreateApplicationTaskStub != nil { - return fake.CreateApplicationTaskStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationTaskReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3259,15 +3272,16 @@ func (fake *FakeCloudControllerClient) CreateBuild(arg1 resources.Build) (resour fake.createBuildArgsForCall = append(fake.createBuildArgsForCall, struct { arg1 resources.Build }{arg1}) + stub := fake.CreateBuildStub + fakeReturns := fake.createBuildReturns fake.recordInvocation("CreateBuild", []interface{}{arg1}) fake.createBuildMutex.Unlock() - if fake.CreateBuildStub != nil { - return fake.CreateBuildStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBuildReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3325,15 +3339,16 @@ func (fake *FakeCloudControllerClient) CreateBuildpack(arg1 resources.Buildpack) fake.createBuildpackArgsForCall = append(fake.createBuildpackArgsForCall, struct { arg1 resources.Buildpack }{arg1}) + stub := fake.CreateBuildpackStub + fakeReturns := fake.createBuildpackReturns fake.recordInvocation("CreateBuildpack", []interface{}{arg1}) fake.createBuildpackMutex.Unlock() - if fake.CreateBuildpackStub != nil { - return fake.CreateBuildpackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBuildpackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3391,15 +3406,16 @@ func (fake *FakeCloudControllerClient) CreateDomain(arg1 resources.Domain) (reso fake.createDomainArgsForCall = append(fake.createDomainArgsForCall, struct { arg1 resources.Domain }{arg1}) + stub := fake.CreateDomainStub + fakeReturns := fake.createDomainReturns fake.recordInvocation("CreateDomain", []interface{}{arg1}) fake.createDomainMutex.Unlock() - if fake.CreateDomainStub != nil { - return fake.CreateDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3457,15 +3473,16 @@ func (fake *FakeCloudControllerClient) CreateDroplet(arg1 string) (resources.Dro fake.createDropletArgsForCall = append(fake.createDropletArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateDropletStub + fakeReturns := fake.createDropletReturns fake.recordInvocation("CreateDroplet", []interface{}{arg1}) fake.createDropletMutex.Unlock() - if fake.CreateDropletStub != nil { - return fake.CreateDropletStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3523,15 +3540,16 @@ func (fake *FakeCloudControllerClient) CreateIsolationSegment(arg1 resources.Iso fake.createIsolationSegmentArgsForCall = append(fake.createIsolationSegmentArgsForCall, struct { arg1 resources.IsolationSegment }{arg1}) + stub := fake.CreateIsolationSegmentStub + fakeReturns := fake.createIsolationSegmentReturns fake.recordInvocation("CreateIsolationSegment", []interface{}{arg1}) fake.createIsolationSegmentMutex.Unlock() - if fake.CreateIsolationSegmentStub != nil { - return fake.CreateIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3589,15 +3607,16 @@ func (fake *FakeCloudControllerClient) CreateOrganization(arg1 string) (resource fake.createOrganizationArgsForCall = append(fake.createOrganizationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateOrganizationStub + fakeReturns := fake.createOrganizationReturns fake.recordInvocation("CreateOrganization", []interface{}{arg1}) fake.createOrganizationMutex.Unlock() - if fake.CreateOrganizationStub != nil { - return fake.CreateOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3655,15 +3674,16 @@ func (fake *FakeCloudControllerClient) CreateOrganizationQuota(arg1 resources.Or fake.createOrganizationQuotaArgsForCall = append(fake.createOrganizationQuotaArgsForCall, struct { arg1 resources.OrganizationQuota }{arg1}) + stub := fake.CreateOrganizationQuotaStub + fakeReturns := fake.createOrganizationQuotaReturns fake.recordInvocation("CreateOrganizationQuota", []interface{}{arg1}) fake.createOrganizationQuotaMutex.Unlock() - if fake.CreateOrganizationQuotaStub != nil { - return fake.CreateOrganizationQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3721,15 +3741,16 @@ func (fake *FakeCloudControllerClient) CreatePackage(arg1 resources.Package) (re fake.createPackageArgsForCall = append(fake.createPackageArgsForCall, struct { arg1 resources.Package }{arg1}) + stub := fake.CreatePackageStub + fakeReturns := fake.createPackageReturns fake.recordInvocation("CreatePackage", []interface{}{arg1}) fake.createPackageMutex.Unlock() - if fake.CreatePackageStub != nil { - return fake.CreatePackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3787,15 +3808,16 @@ func (fake *FakeCloudControllerClient) CreateRole(arg1 resources.Role) (resource fake.createRoleArgsForCall = append(fake.createRoleArgsForCall, struct { arg1 resources.Role }{arg1}) + stub := fake.CreateRoleStub + fakeReturns := fake.createRoleReturns fake.recordInvocation("CreateRole", []interface{}{arg1}) fake.createRoleMutex.Unlock() - if fake.CreateRoleStub != nil { - return fake.CreateRoleStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createRoleReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3853,15 +3875,16 @@ func (fake *FakeCloudControllerClient) CreateRoute(arg1 resources.Route) (resour fake.createRouteArgsForCall = append(fake.createRouteArgsForCall, struct { arg1 resources.Route }{arg1}) + stub := fake.CreateRouteStub + fakeReturns := fake.createRouteReturns fake.recordInvocation("CreateRoute", []interface{}{arg1}) fake.createRouteMutex.Unlock() - if fake.CreateRouteStub != nil { - return fake.CreateRouteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3919,15 +3942,16 @@ func (fake *FakeCloudControllerClient) CreateSecurityGroup(arg1 resources.Securi fake.createSecurityGroupArgsForCall = append(fake.createSecurityGroupArgsForCall, struct { arg1 resources.SecurityGroup }{arg1}) + stub := fake.CreateSecurityGroupStub + fakeReturns := fake.createSecurityGroupReturns fake.recordInvocation("CreateSecurityGroup", []interface{}{arg1}) fake.createSecurityGroupMutex.Unlock() - if fake.CreateSecurityGroupStub != nil { - return fake.CreateSecurityGroupStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createSecurityGroupReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3985,15 +4009,16 @@ func (fake *FakeCloudControllerClient) CreateServiceBroker(arg1 resources.Servic fake.createServiceBrokerArgsForCall = append(fake.createServiceBrokerArgsForCall, struct { arg1 resources.ServiceBroker }{arg1}) + stub := fake.CreateServiceBrokerStub + fakeReturns := fake.createServiceBrokerReturns fake.recordInvocation("CreateServiceBroker", []interface{}{arg1}) fake.createServiceBrokerMutex.Unlock() - if fake.CreateServiceBrokerStub != nil { - return fake.CreateServiceBrokerStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createServiceBrokerReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4051,15 +4076,16 @@ func (fake *FakeCloudControllerClient) CreateSpace(arg1 resources.Space) (resour fake.createSpaceArgsForCall = append(fake.createSpaceArgsForCall, struct { arg1 resources.Space }{arg1}) + stub := fake.CreateSpaceStub + fakeReturns := fake.createSpaceReturns fake.recordInvocation("CreateSpace", []interface{}{arg1}) fake.createSpaceMutex.Unlock() - if fake.CreateSpaceStub != nil { - return fake.CreateSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4117,15 +4143,16 @@ func (fake *FakeCloudControllerClient) CreateSpaceQuota(arg1 resources.SpaceQuot fake.createSpaceQuotaArgsForCall = append(fake.createSpaceQuotaArgsForCall, struct { arg1 resources.SpaceQuota }{arg1}) + stub := fake.CreateSpaceQuotaStub + fakeReturns := fake.createSpaceQuotaReturns fake.recordInvocation("CreateSpaceQuota", []interface{}{arg1}) fake.createSpaceQuotaMutex.Unlock() - if fake.CreateSpaceQuotaStub != nil { - return fake.CreateSpaceQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4183,15 +4210,16 @@ func (fake *FakeCloudControllerClient) CreateUser(arg1 string) (resources.User, fake.createUserArgsForCall = append(fake.createUserArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateUserStub + fakeReturns := fake.createUserReturns fake.recordInvocation("CreateUser", []interface{}{arg1}) fake.createUserMutex.Unlock() - if fake.CreateUserStub != nil { - return fake.CreateUserStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createUserReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4249,15 +4277,16 @@ func (fake *FakeCloudControllerClient) DeleteApplication(arg1 string) (ccv3.JobU fake.deleteApplicationArgsForCall = append(fake.deleteApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteApplicationStub + fakeReturns := fake.deleteApplicationReturns fake.recordInvocation("DeleteApplication", []interface{}{arg1}) fake.deleteApplicationMutex.Unlock() - if fake.DeleteApplicationStub != nil { - return fake.DeleteApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4317,15 +4346,16 @@ func (fake *FakeCloudControllerClient) DeleteApplicationProcessInstance(arg1 str arg2 string arg3 int }{arg1, arg2, arg3}) + stub := fake.DeleteApplicationProcessInstanceStub + fakeReturns := fake.deleteApplicationProcessInstanceReturns fake.recordInvocation("DeleteApplicationProcessInstance", []interface{}{arg1, arg2, arg3}) fake.deleteApplicationProcessInstanceMutex.Unlock() - if fake.DeleteApplicationProcessInstanceStub != nil { - return fake.DeleteApplicationProcessInstanceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteApplicationProcessInstanceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4380,15 +4410,16 @@ func (fake *FakeCloudControllerClient) DeleteBuildpack(arg1 string) (ccv3.JobURL fake.deleteBuildpackArgsForCall = append(fake.deleteBuildpackArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteBuildpackStub + fakeReturns := fake.deleteBuildpackReturns fake.recordInvocation("DeleteBuildpack", []interface{}{arg1}) fake.deleteBuildpackMutex.Unlock() - if fake.DeleteBuildpackStub != nil { - return fake.DeleteBuildpackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteBuildpackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4446,15 +4477,16 @@ func (fake *FakeCloudControllerClient) DeleteDomain(arg1 string) (ccv3.JobURL, c fake.deleteDomainArgsForCall = append(fake.deleteDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteDomainStub + fakeReturns := fake.deleteDomainReturns fake.recordInvocation("DeleteDomain", []interface{}{arg1}) fake.deleteDomainMutex.Unlock() - if fake.DeleteDomainStub != nil { - return fake.DeleteDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4512,15 +4544,16 @@ func (fake *FakeCloudControllerClient) DeleteIsolationSegment(arg1 string) (ccv3 fake.deleteIsolationSegmentArgsForCall = append(fake.deleteIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteIsolationSegmentStub + fakeReturns := fake.deleteIsolationSegmentReturns fake.recordInvocation("DeleteIsolationSegment", []interface{}{arg1}) fake.deleteIsolationSegmentMutex.Unlock() - if fake.DeleteIsolationSegmentStub != nil { - return fake.DeleteIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4576,15 +4609,16 @@ func (fake *FakeCloudControllerClient) DeleteIsolationSegmentOrganization(arg1 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteIsolationSegmentOrganizationStub + fakeReturns := fake.deleteIsolationSegmentOrganizationReturns fake.recordInvocation("DeleteIsolationSegmentOrganization", []interface{}{arg1, arg2}) fake.deleteIsolationSegmentOrganizationMutex.Unlock() - if fake.DeleteIsolationSegmentOrganizationStub != nil { - return fake.DeleteIsolationSegmentOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteIsolationSegmentOrganizationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4639,15 +4673,16 @@ func (fake *FakeCloudControllerClient) DeleteOrganization(arg1 string) (ccv3.Job fake.deleteOrganizationArgsForCall = append(fake.deleteOrganizationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteOrganizationStub + fakeReturns := fake.deleteOrganizationReturns fake.recordInvocation("DeleteOrganization", []interface{}{arg1}) fake.deleteOrganizationMutex.Unlock() - if fake.DeleteOrganizationStub != nil { - return fake.DeleteOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4705,15 +4740,16 @@ func (fake *FakeCloudControllerClient) DeleteOrganizationQuota(arg1 string) (ccv fake.deleteOrganizationQuotaArgsForCall = append(fake.deleteOrganizationQuotaArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteOrganizationQuotaStub + fakeReturns := fake.deleteOrganizationQuotaReturns fake.recordInvocation("DeleteOrganizationQuota", []interface{}{arg1}) fake.deleteOrganizationQuotaMutex.Unlock() - if fake.DeleteOrganizationQuotaStub != nil { - return fake.DeleteOrganizationQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4771,15 +4807,16 @@ func (fake *FakeCloudControllerClient) DeleteOrphanedRoutes(arg1 string) (ccv3.J fake.deleteOrphanedRoutesArgsForCall = append(fake.deleteOrphanedRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteOrphanedRoutesStub + fakeReturns := fake.deleteOrphanedRoutesReturns fake.recordInvocation("DeleteOrphanedRoutes", []interface{}{arg1}) fake.deleteOrphanedRoutesMutex.Unlock() - if fake.DeleteOrphanedRoutesStub != nil { - return fake.DeleteOrphanedRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteOrphanedRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4837,15 +4874,16 @@ func (fake *FakeCloudControllerClient) DeleteRole(arg1 string) (ccv3.JobURL, ccv fake.deleteRoleArgsForCall = append(fake.deleteRoleArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteRoleStub + fakeReturns := fake.deleteRoleReturns fake.recordInvocation("DeleteRole", []interface{}{arg1}) fake.deleteRoleMutex.Unlock() - if fake.DeleteRoleStub != nil { - return fake.DeleteRoleStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteRoleReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4903,15 +4941,16 @@ func (fake *FakeCloudControllerClient) DeleteRoute(arg1 string) (ccv3.JobURL, cc fake.deleteRouteArgsForCall = append(fake.deleteRouteArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteRouteStub + fakeReturns := fake.deleteRouteReturns fake.recordInvocation("DeleteRoute", []interface{}{arg1}) fake.deleteRouteMutex.Unlock() - if fake.DeleteRouteStub != nil { - return fake.DeleteRouteStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4969,15 +5008,16 @@ func (fake *FakeCloudControllerClient) DeleteSecurityGroup(arg1 string) (ccv3.Jo fake.deleteSecurityGroupArgsForCall = append(fake.deleteSecurityGroupArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteSecurityGroupStub + fakeReturns := fake.deleteSecurityGroupReturns fake.recordInvocation("DeleteSecurityGroup", []interface{}{arg1}) fake.deleteSecurityGroupMutex.Unlock() - if fake.DeleteSecurityGroupStub != nil { - return fake.DeleteSecurityGroupStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteSecurityGroupReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5035,15 +5075,16 @@ func (fake *FakeCloudControllerClient) DeleteServiceBroker(arg1 string) (ccv3.Jo fake.deleteServiceBrokerArgsForCall = append(fake.deleteServiceBrokerArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteServiceBrokerStub + fakeReturns := fake.deleteServiceBrokerReturns fake.recordInvocation("DeleteServiceBroker", []interface{}{arg1}) fake.deleteServiceBrokerMutex.Unlock() - if fake.DeleteServiceBrokerStub != nil { - return fake.DeleteServiceBrokerStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteServiceBrokerReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5102,15 +5143,16 @@ func (fake *FakeCloudControllerClient) DeleteServiceInstanceRelationshipsSharedS arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteServiceInstanceRelationshipsSharedSpaceStub + fakeReturns := fake.deleteServiceInstanceRelationshipsSharedSpaceReturns fake.recordInvocation("DeleteServiceInstanceRelationshipsSharedSpace", []interface{}{arg1, arg2}) fake.deleteServiceInstanceRelationshipsSharedSpaceMutex.Unlock() - if fake.DeleteServiceInstanceRelationshipsSharedSpaceStub != nil { - return fake.DeleteServiceInstanceRelationshipsSharedSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteServiceInstanceRelationshipsSharedSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5166,15 +5208,16 @@ func (fake *FakeCloudControllerClient) DeleteServicePlanVisibility(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteServicePlanVisibilityStub + fakeReturns := fake.deleteServicePlanVisibilityReturns fake.recordInvocation("DeleteServicePlanVisibility", []interface{}{arg1, arg2}) fake.deleteServicePlanVisibilityMutex.Unlock() - if fake.DeleteServicePlanVisibilityStub != nil { - return fake.DeleteServicePlanVisibilityStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteServicePlanVisibilityReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5229,15 +5272,16 @@ func (fake *FakeCloudControllerClient) DeleteSpace(arg1 string) (ccv3.JobURL, cc fake.deleteSpaceArgsForCall = append(fake.deleteSpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteSpaceStub + fakeReturns := fake.deleteSpaceReturns fake.recordInvocation("DeleteSpace", []interface{}{arg1}) fake.deleteSpaceMutex.Unlock() - if fake.DeleteSpaceStub != nil { - return fake.DeleteSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5295,15 +5339,16 @@ func (fake *FakeCloudControllerClient) DeleteSpaceQuota(arg1 string) (ccv3.JobUR fake.deleteSpaceQuotaArgsForCall = append(fake.deleteSpaceQuotaArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteSpaceQuotaStub + fakeReturns := fake.deleteSpaceQuotaReturns fake.recordInvocation("DeleteSpaceQuota", []interface{}{arg1}) fake.deleteSpaceQuotaMutex.Unlock() - if fake.DeleteSpaceQuotaStub != nil { - return fake.DeleteSpaceQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.deleteSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5361,15 +5406,16 @@ func (fake *FakeCloudControllerClient) DeleteUser(arg1 string) (ccv3.JobURL, ccv 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, ret.result3 } - fakeReturns := fake.deleteUserReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5427,15 +5473,16 @@ func (fake *FakeCloudControllerClient) DownloadDroplet(arg1 string) ([]byte, ccv fake.downloadDropletArgsForCall = append(fake.downloadDropletArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DownloadDropletStub + fakeReturns := fake.downloadDropletReturns fake.recordInvocation("DownloadDroplet", []interface{}{arg1}) fake.downloadDropletMutex.Unlock() - if fake.DownloadDropletStub != nil { - return fake.DownloadDropletStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.downloadDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5499,15 +5546,16 @@ func (fake *FakeCloudControllerClient) EntitleIsolationSegmentToOrganizations(ar arg1 string arg2 []string }{arg1, arg2Copy}) + stub := fake.EntitleIsolationSegmentToOrganizationsStub + fakeReturns := fake.entitleIsolationSegmentToOrganizationsReturns fake.recordInvocation("EntitleIsolationSegmentToOrganizations", []interface{}{arg1, arg2Copy}) fake.entitleIsolationSegmentToOrganizationsMutex.Unlock() - if fake.EntitleIsolationSegmentToOrganizationsStub != nil { - return fake.EntitleIsolationSegmentToOrganizationsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.entitleIsolationSegmentToOrganizationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5566,15 +5614,16 @@ func (fake *FakeCloudControllerClient) GetAppFeature(arg1 string, arg2 string) ( arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetAppFeatureStub + fakeReturns := fake.getAppFeatureReturns fake.recordInvocation("GetAppFeature", []interface{}{arg1, arg2}) fake.getAppFeatureMutex.Unlock() - if fake.GetAppFeatureStub != nil { - return fake.GetAppFeatureStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getAppFeatureReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5633,15 +5682,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 } @@ -5699,15 +5749,16 @@ func (fake *FakeCloudControllerClient) GetApplicationDropletCurrent(arg1 string) fake.getApplicationDropletCurrentArgsForCall = append(fake.getApplicationDropletCurrentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationDropletCurrentStub + fakeReturns := fake.getApplicationDropletCurrentReturns fake.recordInvocation("GetApplicationDropletCurrent", []interface{}{arg1}) fake.getApplicationDropletCurrentMutex.Unlock() - if fake.GetApplicationDropletCurrentStub != nil { - return fake.GetApplicationDropletCurrentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationDropletCurrentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5765,15 +5816,16 @@ func (fake *FakeCloudControllerClient) GetApplicationEnvironment(arg1 string) (c fake.getApplicationEnvironmentArgsForCall = append(fake.getApplicationEnvironmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationEnvironmentStub + fakeReturns := fake.getApplicationEnvironmentReturns fake.recordInvocation("GetApplicationEnvironment", []interface{}{arg1}) fake.getApplicationEnvironmentMutex.Unlock() - if fake.GetApplicationEnvironmentStub != nil { - return fake.GetApplicationEnvironmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationEnvironmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5831,15 +5883,16 @@ func (fake *FakeCloudControllerClient) GetApplicationManifest(arg1 string) ([]by fake.getApplicationManifestArgsForCall = append(fake.getApplicationManifestArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationManifestStub + fakeReturns := fake.getApplicationManifestReturns fake.recordInvocation("GetApplicationManifest", []interface{}{arg1}) fake.getApplicationManifestMutex.Unlock() - if fake.GetApplicationManifestStub != nil { - return fake.GetApplicationManifestStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationManifestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5898,15 +5951,16 @@ func (fake *FakeCloudControllerClient) GetApplicationProcessByType(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationProcessByTypeStub + fakeReturns := fake.getApplicationProcessByTypeReturns fake.recordInvocation("GetApplicationProcessByType", []interface{}{arg1, arg2}) fake.getApplicationProcessByTypeMutex.Unlock() - if fake.GetApplicationProcessByTypeStub != nil { - return fake.GetApplicationProcessByTypeStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationProcessByTypeReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5964,15 +6018,16 @@ func (fake *FakeCloudControllerClient) GetApplicationProcesses(arg1 string) ([]r fake.getApplicationProcessesArgsForCall = append(fake.getApplicationProcessesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationProcessesStub + fakeReturns := fake.getApplicationProcessesReturns fake.recordInvocation("GetApplicationProcesses", []interface{}{arg1}) fake.getApplicationProcessesMutex.Unlock() - if fake.GetApplicationProcessesStub != nil { - return fake.GetApplicationProcessesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationProcessesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6031,15 +6086,16 @@ func (fake *FakeCloudControllerClient) GetApplicationRevisions(arg1 string, arg2 arg1 string arg2 []ccv3.Query }{arg1, arg2}) + stub := fake.GetApplicationRevisionsStub + fakeReturns := fake.getApplicationRevisionsReturns fake.recordInvocation("GetApplicationRevisions", []interface{}{arg1, arg2}) fake.getApplicationRevisionsMutex.Unlock() - if fake.GetApplicationRevisionsStub != nil { - return fake.GetApplicationRevisionsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRevisionsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6097,15 +6153,16 @@ func (fake *FakeCloudControllerClient) GetApplicationRevisionsDeployed(arg1 stri fake.getApplicationRevisionsDeployedArgsForCall = append(fake.getApplicationRevisionsDeployedArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRevisionsDeployedStub + fakeReturns := fake.getApplicationRevisionsDeployedReturns fake.recordInvocation("GetApplicationRevisionsDeployed", []interface{}{arg1}) fake.getApplicationRevisionsDeployedMutex.Unlock() - if fake.GetApplicationRevisionsDeployedStub != nil { - return fake.GetApplicationRevisionsDeployedStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRevisionsDeployedReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6163,15 +6220,16 @@ func (fake *FakeCloudControllerClient) GetApplicationRoutes(arg1 string) ([]reso fake.getApplicationRoutesArgsForCall = append(fake.getApplicationRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRoutesStub + fakeReturns := fake.getApplicationRoutesReturns fake.recordInvocation("GetApplicationRoutes", []interface{}{arg1}) fake.getApplicationRoutesMutex.Unlock() - if fake.GetApplicationRoutesStub != nil { - return fake.GetApplicationRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6230,15 +6288,16 @@ func (fake *FakeCloudControllerClient) GetApplicationTasks(arg1 string, arg2 ... arg1 string arg2 []ccv3.Query }{arg1, arg2}) + stub := fake.GetApplicationTasksStub + fakeReturns := fake.getApplicationTasksReturns fake.recordInvocation("GetApplicationTasks", []interface{}{arg1, arg2}) fake.getApplicationTasksMutex.Unlock() - if fake.GetApplicationTasksStub != nil { - return fake.GetApplicationTasksStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationTasksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6296,15 +6355,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 } @@ -6362,15 +6422,16 @@ func (fake *FakeCloudControllerClient) GetBuild(arg1 string) (resources.Build, c fake.getBuildArgsForCall = append(fake.getBuildArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetBuildStub + fakeReturns := fake.getBuildReturns fake.recordInvocation("GetBuild", []interface{}{arg1}) fake.getBuildMutex.Unlock() - if fake.GetBuildStub != nil { - return fake.GetBuildStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getBuildReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6428,15 +6489,16 @@ func (fake *FakeCloudControllerClient) GetBuildpacks(arg1 ...ccv3.Query) ([]reso fake.getBuildpacksArgsForCall = append(fake.getBuildpacksArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetBuildpacksStub + fakeReturns := fake.getBuildpacksReturns fake.recordInvocation("GetBuildpacks", []interface{}{arg1}) fake.getBuildpacksMutex.Unlock() - if fake.GetBuildpacksStub != nil { - return fake.GetBuildpacksStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getBuildpacksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6494,15 +6556,16 @@ func (fake *FakeCloudControllerClient) GetDefaultDomain(arg1 string) (resources. fake.getDefaultDomainArgsForCall = append(fake.getDefaultDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDefaultDomainStub + fakeReturns := fake.getDefaultDomainReturns fake.recordInvocation("GetDefaultDomain", []interface{}{arg1}) fake.getDefaultDomainMutex.Unlock() - if fake.GetDefaultDomainStub != nil { - return fake.GetDefaultDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDefaultDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6560,15 +6623,16 @@ func (fake *FakeCloudControllerClient) GetDeployment(arg1 string) (resources.Dep fake.getDeploymentArgsForCall = append(fake.getDeploymentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDeploymentStub + fakeReturns := fake.getDeploymentReturns fake.recordInvocation("GetDeployment", []interface{}{arg1}) fake.getDeploymentMutex.Unlock() - if fake.GetDeploymentStub != nil { - return fake.GetDeploymentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDeploymentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6626,15 +6690,16 @@ func (fake *FakeCloudControllerClient) GetDeployments(arg1 ...ccv3.Query) ([]res fake.getDeploymentsArgsForCall = append(fake.getDeploymentsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetDeploymentsStub + fakeReturns := fake.getDeploymentsReturns fake.recordInvocation("GetDeployments", []interface{}{arg1}) fake.getDeploymentsMutex.Unlock() - if fake.GetDeploymentsStub != nil { - return fake.GetDeploymentsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDeploymentsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6692,15 +6757,16 @@ func (fake *FakeCloudControllerClient) GetDomain(arg1 string) (resources.Domain, fake.getDomainArgsForCall = append(fake.getDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDomainStub + fakeReturns := fake.getDomainReturns fake.recordInvocation("GetDomain", []interface{}{arg1}) fake.getDomainMutex.Unlock() - if fake.GetDomainStub != nil { - return fake.GetDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6758,15 +6824,16 @@ func (fake *FakeCloudControllerClient) GetDomains(arg1 ...ccv3.Query) ([]resourc fake.getDomainsArgsForCall = append(fake.getDomainsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetDomainsStub + fakeReturns := fake.getDomainsReturns fake.recordInvocation("GetDomains", []interface{}{arg1}) fake.getDomainsMutex.Unlock() - if fake.GetDomainsStub != nil { - return fake.GetDomainsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDomainsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6824,15 +6891,16 @@ func (fake *FakeCloudControllerClient) GetDroplet(arg1 string) (resources.Drople fake.getDropletArgsForCall = append(fake.getDropletArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDropletStub + fakeReturns := fake.getDropletReturns fake.recordInvocation("GetDroplet", []interface{}{arg1}) fake.getDropletMutex.Unlock() - if fake.GetDropletStub != nil { - return fake.GetDropletStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6890,15 +6958,16 @@ func (fake *FakeCloudControllerClient) GetDroplets(arg1 ...ccv3.Query) ([]resour fake.getDropletsArgsForCall = append(fake.getDropletsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetDropletsStub + fakeReturns := fake.getDropletsReturns fake.recordInvocation("GetDroplets", []interface{}{arg1}) fake.getDropletsMutex.Unlock() - if fake.GetDropletsStub != nil { - return fake.GetDropletsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDropletsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6956,15 +7025,16 @@ func (fake *FakeCloudControllerClient) GetEnvironmentVariableGroup(arg1 constant fake.getEnvironmentVariableGroupArgsForCall = append(fake.getEnvironmentVariableGroupArgsForCall, struct { arg1 constant.EnvironmentVariableGroupName }{arg1}) + stub := fake.GetEnvironmentVariableGroupStub + fakeReturns := fake.getEnvironmentVariableGroupReturns fake.recordInvocation("GetEnvironmentVariableGroup", []interface{}{arg1}) fake.getEnvironmentVariableGroupMutex.Unlock() - if fake.GetEnvironmentVariableGroupStub != nil { - return fake.GetEnvironmentVariableGroupStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getEnvironmentVariableGroupReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7022,15 +7092,16 @@ func (fake *FakeCloudControllerClient) GetEvents(arg1 ...ccv3.Query) ([]ccv3.Eve fake.getEventsArgsForCall = append(fake.getEventsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetEventsStub + fakeReturns := fake.getEventsReturns fake.recordInvocation("GetEvents", []interface{}{arg1}) fake.getEventsMutex.Unlock() - if fake.GetEventsStub != nil { - return fake.GetEventsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getEventsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7088,15 +7159,16 @@ func (fake *FakeCloudControllerClient) GetFeatureFlag(arg1 string) (resources.Fe fake.getFeatureFlagArgsForCall = append(fake.getFeatureFlagArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetFeatureFlagStub + fakeReturns := fake.getFeatureFlagReturns fake.recordInvocation("GetFeatureFlag", []interface{}{arg1}) fake.getFeatureFlagMutex.Unlock() - if fake.GetFeatureFlagStub != nil { - return fake.GetFeatureFlagStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getFeatureFlagReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7153,15 +7225,16 @@ func (fake *FakeCloudControllerClient) GetFeatureFlags() ([]resources.FeatureFla ret, specificReturn := fake.getFeatureFlagsReturnsOnCall[len(fake.getFeatureFlagsArgsForCall)] fake.getFeatureFlagsArgsForCall = append(fake.getFeatureFlagsArgsForCall, struct { }{}) + stub := fake.GetFeatureFlagsStub + fakeReturns := fake.getFeatureFlagsReturns fake.recordInvocation("GetFeatureFlags", []interface{}{}) fake.getFeatureFlagsMutex.Unlock() - if fake.GetFeatureFlagsStub != nil { - return fake.GetFeatureFlagsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getFeatureFlagsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7211,15 +7284,16 @@ func (fake *FakeCloudControllerClient) GetInfo() (ccv3.Info, ccv3.ResourceLinks, ret, specificReturn := fake.getInfoReturnsOnCall[len(fake.getInfoArgsForCall)] fake.getInfoArgsForCall = append(fake.getInfoArgsForCall, struct { }{}) + stub := fake.GetInfoStub + fakeReturns := fake.getInfoReturns fake.recordInvocation("GetInfo", []interface{}{}) fake.getInfoMutex.Unlock() - if fake.GetInfoStub != nil { - return fake.GetInfoStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4 } - fakeReturns := fake.getInfoReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4 } @@ -7273,15 +7347,16 @@ func (fake *FakeCloudControllerClient) GetIsolationSegment(arg1 string) (resourc fake.getIsolationSegmentArgsForCall = append(fake.getIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetIsolationSegmentStub + fakeReturns := fake.getIsolationSegmentReturns fake.recordInvocation("GetIsolationSegment", []interface{}{arg1}) fake.getIsolationSegmentMutex.Unlock() - if fake.GetIsolationSegmentStub != nil { - return fake.GetIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7339,15 +7414,16 @@ func (fake *FakeCloudControllerClient) GetIsolationSegmentOrganizations(arg1 str fake.getIsolationSegmentOrganizationsArgsForCall = append(fake.getIsolationSegmentOrganizationsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetIsolationSegmentOrganizationsStub + fakeReturns := fake.getIsolationSegmentOrganizationsReturns fake.recordInvocation("GetIsolationSegmentOrganizations", []interface{}{arg1}) fake.getIsolationSegmentOrganizationsMutex.Unlock() - if fake.GetIsolationSegmentOrganizationsStub != nil { - return fake.GetIsolationSegmentOrganizationsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentOrganizationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7405,15 +7481,16 @@ func (fake *FakeCloudControllerClient) GetIsolationSegments(arg1 ...ccv3.Query) fake.getIsolationSegmentsArgsForCall = append(fake.getIsolationSegmentsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetIsolationSegmentsStub + fakeReturns := fake.getIsolationSegmentsReturns fake.recordInvocation("GetIsolationSegments", []interface{}{arg1}) fake.getIsolationSegmentsMutex.Unlock() - if fake.GetIsolationSegmentsStub != nil { - return fake.GetIsolationSegmentsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7472,15 +7549,16 @@ func (fake *FakeCloudControllerClient) GetNewApplicationProcesses(arg1 string, a arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetNewApplicationProcessesStub + fakeReturns := fake.getNewApplicationProcessesReturns fake.recordInvocation("GetNewApplicationProcesses", []interface{}{arg1, arg2}) fake.getNewApplicationProcessesMutex.Unlock() - if fake.GetNewApplicationProcessesStub != nil { - return fake.GetNewApplicationProcessesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getNewApplicationProcessesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7538,15 +7616,16 @@ func (fake *FakeCloudControllerClient) GetOrganization(arg1 string) (resources.O fake.getOrganizationArgsForCall = append(fake.getOrganizationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationStub + fakeReturns := fake.getOrganizationReturns fake.recordInvocation("GetOrganization", []interface{}{arg1}) fake.getOrganizationMutex.Unlock() - if fake.GetOrganizationStub != nil { - return fake.GetOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7604,15 +7683,16 @@ func (fake *FakeCloudControllerClient) GetOrganizationDefaultIsolationSegment(ar fake.getOrganizationDefaultIsolationSegmentArgsForCall = append(fake.getOrganizationDefaultIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationDefaultIsolationSegmentStub + fakeReturns := fake.getOrganizationDefaultIsolationSegmentReturns fake.recordInvocation("GetOrganizationDefaultIsolationSegment", []interface{}{arg1}) fake.getOrganizationDefaultIsolationSegmentMutex.Unlock() - if fake.GetOrganizationDefaultIsolationSegmentStub != nil { - return fake.GetOrganizationDefaultIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationDefaultIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7671,15 +7751,16 @@ func (fake *FakeCloudControllerClient) GetOrganizationDomains(arg1 string, arg2 arg1 string arg2 []ccv3.Query }{arg1, arg2}) + stub := fake.GetOrganizationDomainsStub + fakeReturns := fake.getOrganizationDomainsReturns fake.recordInvocation("GetOrganizationDomains", []interface{}{arg1, arg2}) fake.getOrganizationDomainsMutex.Unlock() - if fake.GetOrganizationDomainsStub != nil { - return fake.GetOrganizationDomainsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationDomainsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7737,15 +7818,16 @@ func (fake *FakeCloudControllerClient) GetOrganizationQuota(arg1 string) (resour fake.getOrganizationQuotaArgsForCall = append(fake.getOrganizationQuotaArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationQuotaStub + fakeReturns := fake.getOrganizationQuotaReturns fake.recordInvocation("GetOrganizationQuota", []interface{}{arg1}) fake.getOrganizationQuotaMutex.Unlock() - if fake.GetOrganizationQuotaStub != nil { - return fake.GetOrganizationQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7803,15 +7885,16 @@ func (fake *FakeCloudControllerClient) GetOrganizationQuotas(arg1 ...ccv3.Query) fake.getOrganizationQuotasArgsForCall = append(fake.getOrganizationQuotasArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetOrganizationQuotasStub + fakeReturns := fake.getOrganizationQuotasReturns fake.recordInvocation("GetOrganizationQuotas", []interface{}{arg1}) fake.getOrganizationQuotasMutex.Unlock() - if fake.GetOrganizationQuotasStub != nil { - return fake.GetOrganizationQuotasStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationQuotasReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7869,15 +7952,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 } @@ -7935,15 +8019,16 @@ func (fake *FakeCloudControllerClient) GetPackage(arg1 string) (resources.Packag fake.getPackageArgsForCall = append(fake.getPackageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPackageStub + fakeReturns := fake.getPackageReturns fake.recordInvocation("GetPackage", []interface{}{arg1}) fake.getPackageMutex.Unlock() - if fake.GetPackageStub != nil { - return fake.GetPackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8002,15 +8087,16 @@ func (fake *FakeCloudControllerClient) GetPackageDroplets(arg1 string, arg2 ...c arg1 string arg2 []ccv3.Query }{arg1, arg2}) + stub := fake.GetPackageDropletsStub + fakeReturns := fake.getPackageDropletsReturns fake.recordInvocation("GetPackageDroplets", []interface{}{arg1, arg2}) fake.getPackageDropletsMutex.Unlock() - if fake.GetPackageDropletsStub != nil { - return fake.GetPackageDropletsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getPackageDropletsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8068,15 +8154,16 @@ func (fake *FakeCloudControllerClient) GetPackages(arg1 ...ccv3.Query) ([]resour fake.getPackagesArgsForCall = append(fake.getPackagesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetPackagesStub + fakeReturns := fake.getPackagesReturns fake.recordInvocation("GetPackages", []interface{}{arg1}) fake.getPackagesMutex.Unlock() - if fake.GetPackagesStub != nil { - return fake.GetPackagesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getPackagesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8134,15 +8221,16 @@ func (fake *FakeCloudControllerClient) GetProcess(arg1 string) (resources.Proces fake.getProcessArgsForCall = append(fake.getProcessArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetProcessStub + fakeReturns := fake.getProcessReturns fake.recordInvocation("GetProcess", []interface{}{arg1}) fake.getProcessMutex.Unlock() - if fake.GetProcessStub != nil { - return fake.GetProcessStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getProcessReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8200,15 +8288,16 @@ func (fake *FakeCloudControllerClient) GetProcessInstances(arg1 string) ([]ccv3. fake.getProcessInstancesArgsForCall = append(fake.getProcessInstancesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetProcessInstancesStub + fakeReturns := fake.getProcessInstancesReturns fake.recordInvocation("GetProcessInstances", []interface{}{arg1}) fake.getProcessInstancesMutex.Unlock() - if fake.GetProcessInstancesStub != nil { - return fake.GetProcessInstancesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getProcessInstancesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8266,15 +8355,16 @@ func (fake *FakeCloudControllerClient) GetProcessSidecars(arg1 string) ([]resour fake.getProcessSidecarsArgsForCall = append(fake.getProcessSidecarsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetProcessSidecarsStub + fakeReturns := fake.getProcessSidecarsReturns fake.recordInvocation("GetProcessSidecars", []interface{}{arg1}) fake.getProcessSidecarsMutex.Unlock() - if fake.GetProcessSidecarsStub != nil { - return fake.GetProcessSidecarsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getProcessSidecarsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8332,15 +8422,16 @@ func (fake *FakeCloudControllerClient) GetProcesses(arg1 ...ccv3.Query) ([]resou fake.getProcessesArgsForCall = append(fake.getProcessesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetProcessesStub + fakeReturns := fake.getProcessesReturns fake.recordInvocation("GetProcesses", []interface{}{arg1}) fake.getProcessesMutex.Unlock() - if fake.GetProcessesStub != nil { - return fake.GetProcessesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getProcessesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8398,15 +8489,16 @@ func (fake *FakeCloudControllerClient) GetRoles(arg1 ...ccv3.Query) ([]resources fake.getRolesArgsForCall = append(fake.getRolesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetRolesStub + fakeReturns := fake.getRolesReturns fake.recordInvocation("GetRoles", []interface{}{arg1}) fake.getRolesMutex.Unlock() - if fake.GetRolesStub != nil { - return fake.GetRolesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4 } - fakeReturns := fake.getRolesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4 } @@ -8467,15 +8559,16 @@ func (fake *FakeCloudControllerClient) GetRouteDestinations(arg1 string) ([]reso fake.getRouteDestinationsArgsForCall = append(fake.getRouteDestinationsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetRouteDestinationsStub + fakeReturns := fake.getRouteDestinationsReturns fake.recordInvocation("GetRouteDestinations", []interface{}{arg1}) fake.getRouteDestinationsMutex.Unlock() - if fake.GetRouteDestinationsStub != nil { - return fake.GetRouteDestinationsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRouteDestinationsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8533,15 +8626,16 @@ func (fake *FakeCloudControllerClient) GetRoutes(arg1 ...ccv3.Query) ([]resource fake.getRoutesArgsForCall = append(fake.getRoutesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetRoutesStub + fakeReturns := fake.getRoutesReturns fake.recordInvocation("GetRoutes", []interface{}{arg1}) fake.getRoutesMutex.Unlock() - if fake.GetRoutesStub != nil { - return fake.GetRoutesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8600,15 +8694,16 @@ func (fake *FakeCloudControllerClient) GetRunningSecurityGroups(arg1 string, arg arg1 string arg2 []ccv3.Query }{arg1, arg2}) + stub := fake.GetRunningSecurityGroupsStub + fakeReturns := fake.getRunningSecurityGroupsReturns fake.recordInvocation("GetRunningSecurityGroups", []interface{}{arg1, arg2}) fake.getRunningSecurityGroupsMutex.Unlock() - if fake.GetRunningSecurityGroupsStub != nil { - return fake.GetRunningSecurityGroupsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRunningSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8666,15 +8761,16 @@ func (fake *FakeCloudControllerClient) GetSSHEnabled(arg1 string) (ccv3.SSHEnabl fake.getSSHEnabledArgsForCall = append(fake.getSSHEnabledArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSSHEnabledStub + fakeReturns := fake.getSSHEnabledReturns fake.recordInvocation("GetSSHEnabled", []interface{}{arg1}) fake.getSSHEnabledMutex.Unlock() - if fake.GetSSHEnabledStub != nil { - return fake.GetSSHEnabledStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSSHEnabledReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8732,15 +8828,16 @@ func (fake *FakeCloudControllerClient) GetSecurityGroups(arg1 ...ccv3.Query) ([] fake.getSecurityGroupsArgsForCall = append(fake.getSecurityGroupsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetSecurityGroupsStub + fakeReturns := fake.getSecurityGroupsReturns fake.recordInvocation("GetSecurityGroups", []interface{}{arg1}) fake.getSecurityGroupsMutex.Unlock() - if fake.GetSecurityGroupsStub != nil { - return fake.GetSecurityGroupsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8798,15 +8895,16 @@ func (fake *FakeCloudControllerClient) GetServiceBrokers(arg1 ...ccv3.Query) ([] fake.getServiceBrokersArgsForCall = append(fake.getServiceBrokersArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetServiceBrokersStub + fakeReturns := fake.getServiceBrokersReturns fake.recordInvocation("GetServiceBrokers", []interface{}{arg1}) fake.getServiceBrokersMutex.Unlock() - if fake.GetServiceBrokersStub != nil { - return fake.GetServiceBrokersStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceBrokersReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8864,15 +8962,16 @@ func (fake *FakeCloudControllerClient) GetServiceInstances(arg1 ...ccv3.Query) ( fake.getServiceInstancesArgsForCall = append(fake.getServiceInstancesArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetServiceInstancesStub + fakeReturns := fake.getServiceInstancesReturns fake.recordInvocation("GetServiceInstances", []interface{}{arg1}) fake.getServiceInstancesMutex.Unlock() - if fake.GetServiceInstancesStub != nil { - return fake.GetServiceInstancesStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstancesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8931,15 +9030,16 @@ func (fake *FakeCloudControllerClient) GetServiceOfferingByNameAndBroker(arg1 st arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceOfferingByNameAndBrokerStub + fakeReturns := fake.getServiceOfferingByNameAndBrokerReturns fake.recordInvocation("GetServiceOfferingByNameAndBroker", []interface{}{arg1, arg2}) fake.getServiceOfferingByNameAndBrokerMutex.Unlock() - if fake.GetServiceOfferingByNameAndBrokerStub != nil { - return fake.GetServiceOfferingByNameAndBrokerStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceOfferingByNameAndBrokerReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8997,15 +9097,16 @@ func (fake *FakeCloudControllerClient) GetServiceOfferings(arg1 ...ccv3.Query) ( fake.getServiceOfferingsArgsForCall = append(fake.getServiceOfferingsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetServiceOfferingsStub + fakeReturns := fake.getServiceOfferingsReturns fake.recordInvocation("GetServiceOfferings", []interface{}{arg1}) fake.getServiceOfferingsMutex.Unlock() - if fake.GetServiceOfferingsStub != nil { - return fake.GetServiceOfferingsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceOfferingsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9063,15 +9164,16 @@ func (fake *FakeCloudControllerClient) GetServicePlanVisibility(arg1 string) (re fake.getServicePlanVisibilityArgsForCall = append(fake.getServicePlanVisibilityArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServicePlanVisibilityStub + fakeReturns := fake.getServicePlanVisibilityReturns fake.recordInvocation("GetServicePlanVisibility", []interface{}{arg1}) fake.getServicePlanVisibilityMutex.Unlock() - if fake.GetServicePlanVisibilityStub != nil { - return fake.GetServicePlanVisibilityStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlanVisibilityReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9129,15 +9231,16 @@ func (fake *FakeCloudControllerClient) GetServicePlans(arg1 ...ccv3.Query) ([]re fake.getServicePlansArgsForCall = append(fake.getServicePlansArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetServicePlansStub + fakeReturns := fake.getServicePlansReturns fake.recordInvocation("GetServicePlans", []interface{}{arg1}) fake.getServicePlansMutex.Unlock() - if fake.GetServicePlansStub != nil { - return fake.GetServicePlansStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlansReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9195,15 +9298,16 @@ func (fake *FakeCloudControllerClient) GetServicePlansWithOfferings(arg1 ...ccv3 fake.getServicePlansWithOfferingsArgsForCall = append(fake.getServicePlansWithOfferingsArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetServicePlansWithOfferingsStub + fakeReturns := fake.getServicePlansWithOfferingsReturns fake.recordInvocation("GetServicePlansWithOfferings", []interface{}{arg1}) fake.getServicePlansWithOfferingsMutex.Unlock() - if fake.GetServicePlansWithOfferingsStub != nil { - return fake.GetServicePlansWithOfferingsStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlansWithOfferingsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9261,15 +9365,16 @@ func (fake *FakeCloudControllerClient) GetServicePlansWithSpaceAndOrganization(a fake.getServicePlansWithSpaceAndOrganizationArgsForCall = append(fake.getServicePlansWithSpaceAndOrganizationArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetServicePlansWithSpaceAndOrganizationStub + fakeReturns := fake.getServicePlansWithSpaceAndOrganizationReturns fake.recordInvocation("GetServicePlansWithSpaceAndOrganization", []interface{}{arg1}) fake.getServicePlansWithSpaceAndOrganizationMutex.Unlock() - if fake.GetServicePlansWithSpaceAndOrganizationStub != nil { - return fake.GetServicePlansWithSpaceAndOrganizationStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlansWithSpaceAndOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9328,15 +9433,16 @@ func (fake *FakeCloudControllerClient) GetSpaceFeature(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSpaceFeatureStub + fakeReturns := fake.getSpaceFeatureReturns fake.recordInvocation("GetSpaceFeature", []interface{}{arg1, arg2}) fake.getSpaceFeatureMutex.Unlock() - if fake.GetSpaceFeatureStub != nil { - return fake.GetSpaceFeatureStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceFeatureReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9394,15 +9500,16 @@ func (fake *FakeCloudControllerClient) GetSpaceIsolationSegment(arg1 string) (re fake.getSpaceIsolationSegmentArgsForCall = append(fake.getSpaceIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceIsolationSegmentStub + fakeReturns := fake.getSpaceIsolationSegmentReturns fake.recordInvocation("GetSpaceIsolationSegment", []interface{}{arg1}) fake.getSpaceIsolationSegmentMutex.Unlock() - if fake.GetSpaceIsolationSegmentStub != nil { - return fake.GetSpaceIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9460,15 +9567,16 @@ func (fake *FakeCloudControllerClient) GetSpaceQuota(arg1 string) (resources.Spa fake.getSpaceQuotaArgsForCall = append(fake.getSpaceQuotaArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceQuotaStub + fakeReturns := fake.getSpaceQuotaReturns fake.recordInvocation("GetSpaceQuota", []interface{}{arg1}) fake.getSpaceQuotaMutex.Unlock() - if fake.GetSpaceQuotaStub != nil { - return fake.GetSpaceQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9526,15 +9634,16 @@ func (fake *FakeCloudControllerClient) GetSpaceQuotas(arg1 ...ccv3.Query) ([]res fake.getSpaceQuotasArgsForCall = append(fake.getSpaceQuotasArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetSpaceQuotasStub + fakeReturns := fake.getSpaceQuotasReturns fake.recordInvocation("GetSpaceQuotas", []interface{}{arg1}) fake.getSpaceQuotasMutex.Unlock() - if fake.GetSpaceQuotasStub != nil { - return fake.GetSpaceQuotasStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceQuotasReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9592,15 +9701,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 } @@ -9661,15 +9771,16 @@ func (fake *FakeCloudControllerClient) GetStacks(arg1 ...ccv3.Query) ([]resource fake.getStacksArgsForCall = append(fake.getStacksArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetStacksStub + fakeReturns := fake.getStacksReturns fake.recordInvocation("GetStacks", []interface{}{arg1}) fake.getStacksMutex.Unlock() - if fake.GetStacksStub != nil { - return fake.GetStacksStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStacksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9728,15 +9839,16 @@ func (fake *FakeCloudControllerClient) GetStagingSecurityGroups(arg1 string, arg arg1 string arg2 []ccv3.Query }{arg1, arg2}) + stub := fake.GetStagingSecurityGroupsStub + fakeReturns := fake.getStagingSecurityGroupsReturns fake.recordInvocation("GetStagingSecurityGroups", []interface{}{arg1, arg2}) fake.getStagingSecurityGroupsMutex.Unlock() - if fake.GetStagingSecurityGroupsStub != nil { - return fake.GetStagingSecurityGroupsStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStagingSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9794,15 +9906,16 @@ func (fake *FakeCloudControllerClient) GetTask(arg1 string) (resources.Task, ccv fake.getTaskArgsForCall = append(fake.getTaskArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetTaskStub + fakeReturns := fake.getTaskReturns fake.recordInvocation("GetTask", []interface{}{arg1}) fake.getTaskMutex.Unlock() - if fake.GetTaskStub != nil { - return fake.GetTaskStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getTaskReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9860,15 +9973,16 @@ func (fake *FakeCloudControllerClient) GetUser(arg1 string) (resources.User, ccv fake.getUserArgsForCall = append(fake.getUserArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetUserStub + fakeReturns := fake.getUserReturns fake.recordInvocation("GetUser", []interface{}{arg1}) fake.getUserMutex.Unlock() - if fake.GetUserStub != nil { - return fake.GetUserStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getUserReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9926,15 +10040,16 @@ func (fake *FakeCloudControllerClient) GetUsers(arg1 ...ccv3.Query) ([]resources fake.getUsersArgsForCall = append(fake.getUsersArgsForCall, struct { arg1 []ccv3.Query }{arg1}) + stub := fake.GetUsersStub + fakeReturns := fake.getUsersReturns fake.recordInvocation("GetUsers", []interface{}{arg1}) fake.getUsersMutex.Unlock() - if fake.GetUsersStub != nil { - return fake.GetUsersStub(arg1...) + if stub != nil { + return stub(arg1...) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getUsersReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9993,15 +10108,16 @@ func (fake *FakeCloudControllerClient) MapRoute(arg1 string, arg2 string) (ccv3. arg1 string arg2 string }{arg1, arg2}) + stub := fake.MapRouteStub + fakeReturns := fake.mapRouteReturns fake.recordInvocation("MapRoute", []interface{}{arg1, arg2}) fake.mapRouteMutex.Unlock() - if fake.MapRouteStub != nil { - return fake.MapRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.mapRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10056,15 +10172,16 @@ func (fake *FakeCloudControllerClient) PollJob(arg1 ccv3.JobURL) (ccv3.Warnings, fake.pollJobArgsForCall = append(fake.pollJobArgsForCall, struct { arg1 ccv3.JobURL }{arg1}) + stub := fake.PollJobStub + fakeReturns := fake.pollJobReturns fake.recordInvocation("PollJob", []interface{}{arg1}) fake.pollJobMutex.Unlock() - if fake.PollJobStub != nil { - return fake.PollJobStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollJobReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10119,15 +10236,16 @@ func (fake *FakeCloudControllerClient) PurgeServiceOffering(arg1 string) (ccv3.W fake.purgeServiceOfferingArgsForCall = append(fake.purgeServiceOfferingArgsForCall, struct { arg1 string }{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, ret.result2 } - fakeReturns := fake.purgeServiceOfferingReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10187,15 +10305,16 @@ func (fake *FakeCloudControllerClient) ResourceMatch(arg1 []ccv3.Resource) ([]cc fake.resourceMatchArgsForCall = append(fake.resourceMatchArgsForCall, struct { arg1 []ccv3.Resource }{arg1Copy}) + stub := fake.ResourceMatchStub + fakeReturns := fake.resourceMatchReturns fake.recordInvocation("ResourceMatch", []interface{}{arg1Copy}) fake.resourceMatchMutex.Unlock() - if fake.ResourceMatchStub != nil { - return fake.ResourceMatchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.resourceMatchReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10252,15 +10371,16 @@ func (fake *FakeCloudControllerClient) RootResponse() (ccv3.Info, ccv3.Warnings, ret, specificReturn := fake.rootResponseReturnsOnCall[len(fake.rootResponseArgsForCall)] fake.rootResponseArgsForCall = append(fake.rootResponseArgsForCall, struct { }{}) + stub := fake.RootResponseStub + fakeReturns := fake.rootResponseReturns fake.recordInvocation("RootResponse", []interface{}{}) fake.rootResponseMutex.Unlock() - if fake.RootResponseStub != nil { - return fake.RootResponseStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.rootResponseReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10312,15 +10432,16 @@ func (fake *FakeCloudControllerClient) SetApplicationDroplet(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetApplicationDropletStub + fakeReturns := fake.setApplicationDropletReturns fake.recordInvocation("SetApplicationDroplet", []interface{}{arg1, arg2}) fake.setApplicationDropletMutex.Unlock() - if fake.SetApplicationDropletStub != nil { - return fake.SetApplicationDropletStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.setApplicationDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10379,15 +10500,16 @@ func (fake *FakeCloudControllerClient) SharePrivateDomainToOrgs(arg1 string, arg arg1 string arg2 ccv3.SharedOrgs }{arg1, arg2}) + stub := fake.SharePrivateDomainToOrgsStub + fakeReturns := fake.sharePrivateDomainToOrgsReturns fake.recordInvocation("SharePrivateDomainToOrgs", []interface{}{arg1, arg2}) fake.sharePrivateDomainToOrgsMutex.Unlock() - if fake.SharePrivateDomainToOrgsStub != nil { - return fake.SharePrivateDomainToOrgsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.sharePrivateDomainToOrgsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10448,15 +10570,16 @@ func (fake *FakeCloudControllerClient) ShareServiceInstanceToSpaces(arg1 string, arg1 string arg2 []string }{arg1, arg2Copy}) + stub := fake.ShareServiceInstanceToSpacesStub + fakeReturns := fake.shareServiceInstanceToSpacesReturns fake.recordInvocation("ShareServiceInstanceToSpaces", []interface{}{arg1, arg2Copy}) fake.shareServiceInstanceToSpacesMutex.Unlock() - if fake.ShareServiceInstanceToSpacesStub != nil { - return fake.ShareServiceInstanceToSpacesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.shareServiceInstanceToSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10514,15 +10637,16 @@ func (fake *FakeCloudControllerClient) TargetCF(arg1 ccv3.TargetSettings) (ccv3. fake.targetCFArgsForCall = append(fake.targetCFArgsForCall, struct { arg1 ccv3.TargetSettings }{arg1}) + stub := fake.TargetCFStub + fakeReturns := fake.targetCFReturns fake.recordInvocation("TargetCF", []interface{}{arg1}) fake.targetCFMutex.Unlock() - if fake.TargetCFStub != nil { - return fake.TargetCFStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.targetCFReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10581,15 +10705,16 @@ func (fake *FakeCloudControllerClient) UnbindSecurityGroupRunningSpace(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnbindSecurityGroupRunningSpaceStub + fakeReturns := fake.unbindSecurityGroupRunningSpaceReturns fake.recordInvocation("UnbindSecurityGroupRunningSpace", []interface{}{arg1, arg2}) fake.unbindSecurityGroupRunningSpaceMutex.Unlock() - if fake.UnbindSecurityGroupRunningSpaceStub != nil { - return fake.UnbindSecurityGroupRunningSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unbindSecurityGroupRunningSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10645,15 +10770,16 @@ func (fake *FakeCloudControllerClient) UnbindSecurityGroupStagingSpace(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnbindSecurityGroupStagingSpaceStub + fakeReturns := fake.unbindSecurityGroupStagingSpaceReturns fake.recordInvocation("UnbindSecurityGroupStagingSpace", []interface{}{arg1, arg2}) fake.unbindSecurityGroupStagingSpaceMutex.Unlock() - if fake.UnbindSecurityGroupStagingSpaceStub != nil { - return fake.UnbindSecurityGroupStagingSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unbindSecurityGroupStagingSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10709,15 +10835,16 @@ func (fake *FakeCloudControllerClient) UnmapRoute(arg1 string, arg2 string) (ccv arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnmapRouteStub + fakeReturns := fake.unmapRouteReturns fake.recordInvocation("UnmapRoute", []interface{}{arg1, arg2}) fake.unmapRouteMutex.Unlock() - if fake.UnmapRouteStub != nil { - return fake.UnmapRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unmapRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10773,15 +10900,16 @@ func (fake *FakeCloudControllerClient) UnsetSpaceQuota(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnsetSpaceQuotaStub + fakeReturns := fake.unsetSpaceQuotaReturns fake.recordInvocation("UnsetSpaceQuota", []interface{}{arg1, arg2}) fake.unsetSpaceQuotaMutex.Unlock() - if fake.UnsetSpaceQuotaStub != nil { - return fake.UnsetSpaceQuotaStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unsetSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10837,15 +10965,16 @@ func (fake *FakeCloudControllerClient) UnsharePrivateDomainFromOrg(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnsharePrivateDomainFromOrgStub + fakeReturns := fake.unsharePrivateDomainFromOrgReturns fake.recordInvocation("UnsharePrivateDomainFromOrg", []interface{}{arg1, arg2}) fake.unsharePrivateDomainFromOrgMutex.Unlock() - if fake.UnsharePrivateDomainFromOrgStub != nil { - return fake.UnsharePrivateDomainFromOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unsharePrivateDomainFromOrgReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10902,15 +11031,16 @@ func (fake *FakeCloudControllerClient) UpdateAppFeature(arg1 string, arg2 bool, arg2 bool arg3 string }{arg1, arg2, arg3}) + stub := fake.UpdateAppFeatureStub + fakeReturns := fake.updateAppFeatureReturns fake.recordInvocation("UpdateAppFeature", []interface{}{arg1, arg2, arg3}) fake.updateAppFeatureMutex.Unlock() - if fake.UpdateAppFeatureStub != nil { - return fake.UpdateAppFeatureStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateAppFeatureReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10965,15 +11095,16 @@ func (fake *FakeCloudControllerClient) UpdateApplication(arg1 resources.Applicat fake.updateApplicationArgsForCall = append(fake.updateApplicationArgsForCall, struct { arg1 resources.Application }{arg1}) + stub := fake.UpdateApplicationStub + fakeReturns := fake.updateApplicationReturns fake.recordInvocation("UpdateApplication", []interface{}{arg1}) fake.updateApplicationMutex.Unlock() - if fake.UpdateApplicationStub != nil { - return fake.UpdateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11037,15 +11168,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationApplyManifest(arg1 strin arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.UpdateApplicationApplyManifestStub + fakeReturns := fake.updateApplicationApplyManifestReturns fake.recordInvocation("UpdateApplicationApplyManifest", []interface{}{arg1, arg2Copy}) fake.updateApplicationApplyManifestMutex.Unlock() - if fake.UpdateApplicationApplyManifestStub != nil { - return fake.UpdateApplicationApplyManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationApplyManifestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11104,15 +11236,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationEnvironmentVariables(arg arg1 string arg2 resources.EnvironmentVariables }{arg1, arg2}) + stub := fake.UpdateApplicationEnvironmentVariablesStub + fakeReturns := fake.updateApplicationEnvironmentVariablesReturns fake.recordInvocation("UpdateApplicationEnvironmentVariables", []interface{}{arg1, arg2}) fake.updateApplicationEnvironmentVariablesMutex.Unlock() - if fake.UpdateApplicationEnvironmentVariablesStub != nil { - return fake.UpdateApplicationEnvironmentVariablesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationEnvironmentVariablesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11171,15 +11304,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationName(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateApplicationNameStub + fakeReturns := fake.updateApplicationNameReturns fake.recordInvocation("UpdateApplicationName", []interface{}{arg1, arg2}) fake.updateApplicationNameMutex.Unlock() - if fake.UpdateApplicationNameStub != nil { - return fake.UpdateApplicationNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11237,15 +11371,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationRestart(arg1 string) (re fake.updateApplicationRestartArgsForCall = append(fake.updateApplicationRestartArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UpdateApplicationRestartStub + fakeReturns := fake.updateApplicationRestartReturns fake.recordInvocation("UpdateApplicationRestart", []interface{}{arg1}) fake.updateApplicationRestartMutex.Unlock() - if fake.UpdateApplicationRestartStub != nil { - return fake.UpdateApplicationRestartStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationRestartReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11303,15 +11438,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationStart(arg1 string) (reso fake.updateApplicationStartArgsForCall = append(fake.updateApplicationStartArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UpdateApplicationStartStub + fakeReturns := fake.updateApplicationStartReturns fake.recordInvocation("UpdateApplicationStart", []interface{}{arg1}) fake.updateApplicationStartMutex.Unlock() - if fake.UpdateApplicationStartStub != nil { - return fake.UpdateApplicationStartStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationStartReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11369,15 +11505,16 @@ func (fake *FakeCloudControllerClient) UpdateApplicationStop(arg1 string) (resou fake.updateApplicationStopArgsForCall = append(fake.updateApplicationStopArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UpdateApplicationStopStub + fakeReturns := fake.updateApplicationStopReturns fake.recordInvocation("UpdateApplicationStop", []interface{}{arg1}) fake.updateApplicationStopMutex.Unlock() - if fake.UpdateApplicationStopStub != nil { - return fake.UpdateApplicationStopStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationStopReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11435,15 +11572,16 @@ func (fake *FakeCloudControllerClient) UpdateBuildpack(arg1 resources.Buildpack) fake.updateBuildpackArgsForCall = append(fake.updateBuildpackArgsForCall, struct { arg1 resources.Buildpack }{arg1}) + stub := fake.UpdateBuildpackStub + fakeReturns := fake.updateBuildpackReturns fake.recordInvocation("UpdateBuildpack", []interface{}{arg1}) fake.updateBuildpackMutex.Unlock() - if fake.UpdateBuildpackStub != nil { - return fake.UpdateBuildpackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateBuildpackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11502,15 +11640,16 @@ func (fake *FakeCloudControllerClient) UpdateEnvironmentVariableGroup(arg1 const arg1 constant.EnvironmentVariableGroupName arg2 resources.EnvironmentVariables }{arg1, arg2}) + stub := fake.UpdateEnvironmentVariableGroupStub + fakeReturns := fake.updateEnvironmentVariableGroupReturns fake.recordInvocation("UpdateEnvironmentVariableGroup", []interface{}{arg1, arg2}) fake.updateEnvironmentVariableGroupMutex.Unlock() - if fake.UpdateEnvironmentVariableGroupStub != nil { - return fake.UpdateEnvironmentVariableGroupStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateEnvironmentVariableGroupReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11568,15 +11707,16 @@ func (fake *FakeCloudControllerClient) UpdateFeatureFlag(arg1 resources.FeatureF fake.updateFeatureFlagArgsForCall = append(fake.updateFeatureFlagArgsForCall, struct { arg1 resources.FeatureFlag }{arg1}) + stub := fake.UpdateFeatureFlagStub + fakeReturns := fake.updateFeatureFlagReturns fake.recordInvocation("UpdateFeatureFlag", []interface{}{arg1}) fake.updateFeatureFlagMutex.Unlock() - if fake.UpdateFeatureFlagStub != nil { - return fake.UpdateFeatureFlagStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateFeatureFlagReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11634,15 +11774,16 @@ func (fake *FakeCloudControllerClient) UpdateOrganization(arg1 resources.Organiz fake.updateOrganizationArgsForCall = append(fake.updateOrganizationArgsForCall, struct { arg1 resources.Organization }{arg1}) + stub := fake.UpdateOrganizationStub + fakeReturns := fake.updateOrganizationReturns fake.recordInvocation("UpdateOrganization", []interface{}{arg1}) fake.updateOrganizationMutex.Unlock() - if fake.UpdateOrganizationStub != nil { - return fake.UpdateOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11701,15 +11842,16 @@ func (fake *FakeCloudControllerClient) UpdateOrganizationDefaultIsolationSegment arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateOrganizationDefaultIsolationSegmentRelationshipStub + fakeReturns := fake.updateOrganizationDefaultIsolationSegmentRelationshipReturns fake.recordInvocation("UpdateOrganizationDefaultIsolationSegmentRelationship", []interface{}{arg1, arg2}) fake.updateOrganizationDefaultIsolationSegmentRelationshipMutex.Unlock() - if fake.UpdateOrganizationDefaultIsolationSegmentRelationshipStub != nil { - return fake.UpdateOrganizationDefaultIsolationSegmentRelationshipStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateOrganizationDefaultIsolationSegmentRelationshipReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11767,15 +11909,16 @@ func (fake *FakeCloudControllerClient) UpdateOrganizationQuota(arg1 resources.Or fake.updateOrganizationQuotaArgsForCall = append(fake.updateOrganizationQuotaArgsForCall, struct { arg1 resources.OrganizationQuota }{arg1}) + stub := fake.UpdateOrganizationQuotaStub + fakeReturns := fake.updateOrganizationQuotaReturns fake.recordInvocation("UpdateOrganizationQuota", []interface{}{arg1}) fake.updateOrganizationQuotaMutex.Unlock() - if fake.UpdateOrganizationQuotaStub != nil { - return fake.UpdateOrganizationQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11833,15 +11976,16 @@ func (fake *FakeCloudControllerClient) UpdateProcess(arg1 resources.Process) (re fake.updateProcessArgsForCall = append(fake.updateProcessArgsForCall, struct { arg1 resources.Process }{arg1}) + stub := fake.UpdateProcessStub + fakeReturns := fake.updateProcessReturns fake.recordInvocation("UpdateProcess", []interface{}{arg1}) fake.updateProcessMutex.Unlock() - if fake.UpdateProcessStub != nil { - return fake.UpdateProcessStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateProcessReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11901,15 +12045,16 @@ func (fake *FakeCloudControllerClient) UpdateResourceMetadata(arg1 string, arg2 arg2 string arg3 resources.Metadata }{arg1, arg2, arg3}) + stub := fake.UpdateResourceMetadataStub + fakeReturns := fake.updateResourceMetadataReturns fake.recordInvocation("UpdateResourceMetadata", []interface{}{arg1, arg2, arg3}) fake.updateResourceMetadataMutex.Unlock() - if fake.UpdateResourceMetadataStub != nil { - return fake.UpdateResourceMetadataStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateResourceMetadataReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11967,15 +12112,16 @@ func (fake *FakeCloudControllerClient) UpdateSecurityGroup(arg1 resources.Securi fake.updateSecurityGroupArgsForCall = append(fake.updateSecurityGroupArgsForCall, struct { arg1 resources.SecurityGroup }{arg1}) + stub := fake.UpdateSecurityGroupStub + fakeReturns := fake.updateSecurityGroupReturns fake.recordInvocation("UpdateSecurityGroup", []interface{}{arg1}) fake.updateSecurityGroupMutex.Unlock() - if fake.UpdateSecurityGroupStub != nil { - return fake.UpdateSecurityGroupStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateSecurityGroupReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12039,15 +12185,16 @@ func (fake *FakeCloudControllerClient) UpdateSecurityGroupRunningSpace(arg1 stri arg1 string arg2 []string }{arg1, arg2Copy}) + stub := fake.UpdateSecurityGroupRunningSpaceStub + fakeReturns := fake.updateSecurityGroupRunningSpaceReturns fake.recordInvocation("UpdateSecurityGroupRunningSpace", []interface{}{arg1, arg2Copy}) fake.updateSecurityGroupRunningSpaceMutex.Unlock() - if fake.UpdateSecurityGroupRunningSpaceStub != nil { - return fake.UpdateSecurityGroupRunningSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSecurityGroupRunningSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12108,15 +12255,16 @@ func (fake *FakeCloudControllerClient) UpdateSecurityGroupStagingSpace(arg1 stri arg1 string arg2 []string }{arg1, arg2Copy}) + stub := fake.UpdateSecurityGroupStagingSpaceStub + fakeReturns := fake.updateSecurityGroupStagingSpaceReturns fake.recordInvocation("UpdateSecurityGroupStagingSpace", []interface{}{arg1, arg2Copy}) fake.updateSecurityGroupStagingSpaceMutex.Unlock() - if fake.UpdateSecurityGroupStagingSpaceStub != nil { - return fake.UpdateSecurityGroupStagingSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSecurityGroupStagingSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12172,15 +12320,16 @@ func (fake *FakeCloudControllerClient) UpdateServiceBroker(arg1 string, arg2 res arg1 string arg2 resources.ServiceBroker }{arg1, arg2}) + stub := fake.UpdateServiceBrokerStub + fakeReturns := fake.updateServiceBrokerReturns fake.recordInvocation("UpdateServiceBroker", []interface{}{arg1, arg2}) fake.updateServiceBrokerMutex.Unlock() - if fake.UpdateServiceBrokerStub != nil { - return fake.UpdateServiceBrokerStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateServiceBrokerReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12239,15 +12388,16 @@ func (fake *FakeCloudControllerClient) UpdateServicePlanVisibility(arg1 string, arg1 string arg2 resources.ServicePlanVisibility }{arg1, arg2}) + stub := fake.UpdateServicePlanVisibilityStub + fakeReturns := fake.updateServicePlanVisibilityReturns fake.recordInvocation("UpdateServicePlanVisibility", []interface{}{arg1, arg2}) fake.updateServicePlanVisibilityMutex.Unlock() - if fake.UpdateServicePlanVisibilityStub != nil { - return fake.UpdateServicePlanVisibilityStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateServicePlanVisibilityReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12305,15 +12455,16 @@ func (fake *FakeCloudControllerClient) UpdateSpace(arg1 resources.Space) (resour fake.updateSpaceArgsForCall = append(fake.updateSpaceArgsForCall, struct { arg1 resources.Space }{arg1}) + stub := fake.UpdateSpaceStub + fakeReturns := fake.updateSpaceReturns fake.recordInvocation("UpdateSpace", []interface{}{arg1}) fake.updateSpaceMutex.Unlock() - if fake.UpdateSpaceStub != nil { - return fake.UpdateSpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12377,15 +12528,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceApplyManifest(arg1 string, arg arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.UpdateSpaceApplyManifestStub + fakeReturns := fake.updateSpaceApplyManifestReturns fake.recordInvocation("UpdateSpaceApplyManifest", []interface{}{arg1, arg2Copy}) fake.updateSpaceApplyManifestMutex.Unlock() - if fake.UpdateSpaceApplyManifestStub != nil { - return fake.UpdateSpaceApplyManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateSpaceApplyManifestReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12445,15 +12597,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceFeature(arg1 string, arg2 bool arg2 bool arg3 string }{arg1, arg2, arg3}) + stub := fake.UpdateSpaceFeatureStub + fakeReturns := fake.updateSpaceFeatureReturns fake.recordInvocation("UpdateSpaceFeature", []interface{}{arg1, arg2, arg3}) fake.updateSpaceFeatureMutex.Unlock() - if fake.UpdateSpaceFeatureStub != nil { - return fake.UpdateSpaceFeatureStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceFeatureReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12509,15 +12662,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceIsolationSegmentRelationship(a arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSpaceIsolationSegmentRelationshipStub + fakeReturns := fake.updateSpaceIsolationSegmentRelationshipReturns fake.recordInvocation("UpdateSpaceIsolationSegmentRelationship", []interface{}{arg1, arg2}) fake.updateSpaceIsolationSegmentRelationshipMutex.Unlock() - if fake.UpdateSpaceIsolationSegmentRelationshipStub != nil { - return fake.UpdateSpaceIsolationSegmentRelationshipStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateSpaceIsolationSegmentRelationshipReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12575,15 +12729,16 @@ func (fake *FakeCloudControllerClient) UpdateSpaceQuota(arg1 resources.SpaceQuot fake.updateSpaceQuotaArgsForCall = append(fake.updateSpaceQuotaArgsForCall, struct { arg1 resources.SpaceQuota }{arg1}) + stub := fake.UpdateSpaceQuotaStub + fakeReturns := fake.updateSpaceQuotaReturns fake.recordInvocation("UpdateSpaceQuota", []interface{}{arg1}) fake.updateSpaceQuotaMutex.Unlock() - if fake.UpdateSpaceQuotaStub != nil { - return fake.UpdateSpaceQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12641,15 +12796,16 @@ func (fake *FakeCloudControllerClient) UpdateTaskCancel(arg1 string) (resources. fake.updateTaskCancelArgsForCall = append(fake.updateTaskCancelArgsForCall, struct { arg1 string }{arg1}) + stub := fake.UpdateTaskCancelStub + fakeReturns := fake.updateTaskCancelReturns fake.recordInvocation("UpdateTaskCancel", []interface{}{arg1}) fake.updateTaskCancelMutex.Unlock() - if fake.UpdateTaskCancelStub != nil { - return fake.UpdateTaskCancelStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateTaskCancelReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12715,15 +12871,16 @@ func (fake *FakeCloudControllerClient) UploadBitsPackage(arg1 resources.Package, arg3 io.Reader arg4 int64 }{arg1, arg2Copy, arg3, arg4}) + stub := fake.UploadBitsPackageStub + fakeReturns := fake.uploadBitsPackageReturns fake.recordInvocation("UploadBitsPackage", []interface{}{arg1, arg2Copy, arg3, arg4}) fake.uploadBitsPackageMutex.Unlock() - if fake.UploadBitsPackageStub != nil { - return fake.UploadBitsPackageStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadBitsPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12784,15 +12941,16 @@ func (fake *FakeCloudControllerClient) UploadBuildpack(arg1 string, arg2 string, arg3 io.Reader arg4 int64 }{arg1, arg2, arg3, arg4}) + stub := fake.UploadBuildpackStub + fakeReturns := fake.uploadBuildpackReturns fake.recordInvocation("UploadBuildpack", []interface{}{arg1, arg2, arg3, arg4}) fake.uploadBuildpackMutex.Unlock() - if fake.UploadBuildpackStub != nil { - return fake.UploadBuildpackStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadBuildpackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12853,15 +13011,16 @@ func (fake *FakeCloudControllerClient) UploadDropletBits(arg1 string, arg2 strin arg3 io.Reader arg4 int64 }{arg1, arg2, arg3, arg4}) + stub := fake.UploadDropletBitsStub + fakeReturns := fake.uploadDropletBitsReturns fake.recordInvocation("UploadDropletBits", []interface{}{arg1, arg2, arg3, arg4}) fake.uploadDropletBitsMutex.Unlock() - if fake.UploadDropletBitsStub != nil { - return fake.UploadDropletBitsStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadDropletBitsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12920,15 +13079,16 @@ func (fake *FakeCloudControllerClient) UploadPackage(arg1 resources.Package, arg arg1 resources.Package arg2 string }{arg1, arg2}) + stub := fake.UploadPackageStub + fakeReturns := fake.uploadPackageReturns fake.recordInvocation("UploadPackage", []interface{}{arg1, arg2}) fake.uploadPackageMutex.Unlock() - if fake.UploadPackageStub != nil { - return fake.UploadPackageStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/actor/v7action/v7actionfakes/fake_config.go b/actor/v7action/v7actionfakes/fake_config.go index 16015f1a295..2a87269e6ad 100644 --- a/actor/v7action/v7actionfakes/fake_config.go +++ b/actor/v7action/v7actionfakes/fake_config.go @@ -166,15 +166,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 } @@ -218,15 +219,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 } @@ -270,15 +272,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 } @@ -322,15 +325,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 } @@ -374,15 +378,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 } @@ -426,15 +431,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 } @@ -478,9 +484,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) } } @@ -509,9 +516,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) } } @@ -540,9 +548,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) } } @@ -573,9 +582,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) } } @@ -605,9 +615,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) } } @@ -636,9 +647,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) } } @@ -667,15 +679,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 } @@ -719,15 +732,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 } @@ -771,15 +785,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 } @@ -823,15 +838,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 } @@ -875,15 +891,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 } @@ -926,9 +943,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 f37fc9b1488..0e3e8ef2c2e 100644 --- a/actor/v7action/v7actionfakes/fake_downloader.go +++ b/actor/v7action/v7actionfakes/fake_downloader.go @@ -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_manifest_parser.go b/actor/v7action/v7actionfakes/fake_manifest_parser.go index 9efc1e439b0..3467c7f0745 100644 --- a/actor/v7action/v7actionfakes/fake_manifest_parser.go +++ b/actor/v7action/v7actionfakes/fake_manifest_parser.go @@ -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 d1bd7332569..89753364651 100644 --- a/actor/v7action/v7actionfakes/fake_routing_client.go +++ b/actor/v7action/v7actionfakes/fake_routing_client.go @@ -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 5a0cc5bd6a7..140a4ed911d 100644 --- a/actor/v7action/v7actionfakes/fake_shared_actor.go +++ b/actor/v7action/v7actionfakes/fake_shared_actor.go @@ -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 ce8c98f5ac7..e2d22ba0add 100644 --- a/actor/v7action/v7actionfakes/fake_simple_progress_bar.go +++ b/actor/v7action/v7actionfakes/fake_simple_progress_bar.go @@ -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 bb806afab1e..a58d07d7d69 100644 --- a/actor/v7action/v7actionfakes/fake_sshactor.go +++ b/actor/v7action/v7actionfakes/fake_sshactor.go @@ -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 cf4533a2b71..fea7c07e254 100644 --- a/actor/v7action/v7actionfakes/fake_uaaclient.go +++ b/actor/v7action/v7actionfakes/fake_uaaclient.go @@ -160,15 +160,16 @@ func (fake *FakeUAAClient) 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 } @@ -215,15 +216,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 } @@ -283,15 +285,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 } @@ -346,15 +349,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 } @@ -410,15 +414,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 } @@ -474,15 +479,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 } @@ -536,15 +542,16 @@ func (fake *FakeUAAClient) LoginPrompts() map[string][]string { ret, specificReturn := fake.loginPromptsReturnsOnCall[len(fake.loginPromptsArgsForCall)] fake.loginPromptsArgsForCall = append(fake.loginPromptsArgsForCall, struct { }{}) + stub := fake.LoginPromptsStub + fakeReturns := fake.loginPromptsReturns fake.recordInvocation("LoginPrompts", []interface{}{}) fake.loginPromptsMutex.Unlock() - if fake.LoginPromptsStub != nil { - return fake.LoginPromptsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.loginPromptsReturns return fakeReturns.result1 } @@ -589,15 +596,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 } @@ -652,15 +660,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 } @@ -714,15 +723,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 } @@ -774,15 +784,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/v7pushaction/v7pushactionfakes/fake_progress_bar.go b/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go index 493c949e30b..2e39b18bfae 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_progress_bar.go @@ -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 22f42a76ee4..2adfd1e23bc 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 afa5619c02c..0d60a8d9007 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_shared_actor.go @@ -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_v2actor.go b/actor/v7pushaction/v7pushactionfakes/fake_v2actor.go index 03488f9d9f5..0cdf9c32dc0 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_v2actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_v2actor.go @@ -95,15 +95,16 @@ func (fake *FakeV2Actor) CreateRoute(arg1 v2action.Route, arg2 bool) (v2action.R arg1 v2action.Route arg2 bool }{arg1, arg2}) + stub := fake.CreateRouteStub + fakeReturns := fake.createRouteReturns fake.recordInvocation("CreateRoute", []interface{}{arg1, arg2}) fake.createRouteMutex.Unlock() - if fake.CreateRouteStub != nil { - return fake.CreateRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -161,15 +162,16 @@ func (fake *FakeV2Actor) FindRouteBoundToSpaceWithSettings(arg1 v2action.Route) fake.findRouteBoundToSpaceWithSettingsArgsForCall = append(fake.findRouteBoundToSpaceWithSettingsArgsForCall, struct { arg1 v2action.Route }{arg1}) + stub := fake.FindRouteBoundToSpaceWithSettingsStub + fakeReturns := fake.findRouteBoundToSpaceWithSettingsReturns fake.recordInvocation("FindRouteBoundToSpaceWithSettings", []interface{}{arg1}) fake.findRouteBoundToSpaceWithSettingsMutex.Unlock() - if fake.FindRouteBoundToSpaceWithSettingsStub != nil { - return fake.FindRouteBoundToSpaceWithSettingsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.findRouteBoundToSpaceWithSettingsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -227,15 +229,16 @@ func (fake *FakeV2Actor) GetApplicationRoutes(arg1 string) (v2action.Routes, v2a fake.getApplicationRoutesArgsForCall = append(fake.getApplicationRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRoutesStub + fakeReturns := fake.getApplicationRoutesReturns fake.recordInvocation("GetApplicationRoutes", []interface{}{arg1}) fake.getApplicationRoutesMutex.Unlock() - if fake.GetApplicationRoutesStub != nil { - return fake.GetApplicationRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -293,15 +296,16 @@ func (fake *FakeV2Actor) GetOrganizationDomains(arg1 string) ([]v2action.Domain, fake.getOrganizationDomainsArgsForCall = append(fake.getOrganizationDomainsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationDomainsStub + fakeReturns := fake.getOrganizationDomainsReturns fake.recordInvocation("GetOrganizationDomains", []interface{}{arg1}) fake.getOrganizationDomainsMutex.Unlock() - if fake.GetOrganizationDomainsStub != nil { - return fake.GetOrganizationDomainsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationDomainsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -360,15 +364,16 @@ func (fake *FakeV2Actor) MapRouteToApplication(arg1 string, arg2 string) (v2acti arg1 string arg2 string }{arg1, arg2}) + stub := fake.MapRouteToApplicationStub + fakeReturns := fake.mapRouteToApplicationReturns fake.recordInvocation("MapRouteToApplication", []interface{}{arg1, arg2}) fake.mapRouteToApplicationMutex.Unlock() - if fake.MapRouteToApplicationStub != nil { - return fake.MapRouteToApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.mapRouteToApplicationReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go index 5d6780f4faa..c550fb87034 100644 --- a/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go +++ b/actor/v7pushaction/v7pushactionfakes/fake_v7actor.go @@ -511,15 +511,16 @@ func (fake *FakeV7Actor) CreateApplicationDroplet(arg1 string) (resources.Drople fake.createApplicationDropletArgsForCall = append(fake.createApplicationDropletArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateApplicationDropletStub + fakeReturns := fake.createApplicationDropletReturns fake.recordInvocation("CreateApplicationDroplet", []interface{}{arg1}) fake.createApplicationDropletMutex.Unlock() - if fake.CreateApplicationDropletStub != nil { - return fake.CreateApplicationDropletStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -578,15 +579,16 @@ func (fake *FakeV7Actor) CreateApplicationInSpace(arg1 resources.Application, ar arg1 resources.Application arg2 string }{arg1, arg2}) + stub := fake.CreateApplicationInSpaceStub + fakeReturns := fake.createApplicationInSpaceReturns fake.recordInvocation("CreateApplicationInSpace", []interface{}{arg1, arg2}) fake.createApplicationInSpaceMutex.Unlock() - if fake.CreateApplicationInSpaceStub != nil { - return fake.CreateApplicationInSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationInSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -644,15 +646,16 @@ func (fake *FakeV7Actor) CreateBitsPackageByApplication(arg1 string) (resources. fake.createBitsPackageByApplicationArgsForCall = append(fake.createBitsPackageByApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateBitsPackageByApplicationStub + fakeReturns := fake.createBitsPackageByApplicationReturns fake.recordInvocation("CreateBitsPackageByApplication", []interface{}{arg1}) fake.createBitsPackageByApplicationMutex.Unlock() - if fake.CreateBitsPackageByApplicationStub != nil { - return fake.CreateBitsPackageByApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBitsPackageByApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -711,15 +714,16 @@ func (fake *FakeV7Actor) CreateDeploymentByApplicationAndDroplet(arg1 string, ar arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateDeploymentByApplicationAndDropletStub + fakeReturns := fake.createDeploymentByApplicationAndDropletReturns fake.recordInvocation("CreateDeploymentByApplicationAndDroplet", []interface{}{arg1, arg2}) fake.createDeploymentByApplicationAndDropletMutex.Unlock() - if fake.CreateDeploymentByApplicationAndDropletStub != nil { - return fake.CreateDeploymentByApplicationAndDropletStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDeploymentByApplicationAndDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -778,15 +782,16 @@ func (fake *FakeV7Actor) CreateDockerPackageByApplication(arg1 string, arg2 v7ac arg1 string arg2 v7action.DockerImageCredentials }{arg1, arg2}) + stub := fake.CreateDockerPackageByApplicationStub + fakeReturns := fake.createDockerPackageByApplicationReturns fake.recordInvocation("CreateDockerPackageByApplication", []interface{}{arg1, arg2}) fake.createDockerPackageByApplicationMutex.Unlock() - if fake.CreateDockerPackageByApplicationStub != nil { - return fake.CreateDockerPackageByApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDockerPackageByApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -848,15 +853,16 @@ func (fake *FakeV7Actor) CreateRoute(arg1 string, arg2 string, arg3 string, arg4 arg4 string arg5 int }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateRouteStub + fakeReturns := fake.createRouteReturns fake.recordInvocation("CreateRoute", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createRouteMutex.Unlock() - if fake.CreateRouteStub != nil { - return fake.CreateRouteStub(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.createRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -915,15 +921,16 @@ func (fake *FakeV7Actor) GetApplicationByNameAndSpace(arg1 string, arg2 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 } @@ -982,15 +989,16 @@ func (fake *FakeV7Actor) GetApplicationDroplets(arg1 string, arg2 string) ([]res arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationDropletsStub + fakeReturns := fake.getApplicationDropletsReturns fake.recordInvocation("GetApplicationDroplets", []interface{}{arg1, arg2}) fake.getApplicationDropletsMutex.Unlock() - if fake.GetApplicationDropletsStub != nil { - return fake.GetApplicationDropletsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationDropletsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1048,15 +1056,16 @@ func (fake *FakeV7Actor) GetApplicationRoutes(arg1 string) ([]resources.Route, v fake.getApplicationRoutesArgsForCall = append(fake.getApplicationRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRoutesStub + fakeReturns := fake.getApplicationRoutesReturns fake.recordInvocation("GetApplicationRoutes", []interface{}{arg1}) fake.getApplicationRoutesMutex.Unlock() - if fake.GetApplicationRoutesStub != nil { - return fake.GetApplicationRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1120,15 +1129,16 @@ func (fake *FakeV7Actor) GetApplicationsByNamesAndSpace(arg1 []string, arg2 stri arg1 []string arg2 string }{arg1Copy, arg2}) + stub := fake.GetApplicationsByNamesAndSpaceStub + fakeReturns := fake.getApplicationsByNamesAndSpaceReturns fake.recordInvocation("GetApplicationsByNamesAndSpace", []interface{}{arg1Copy, arg2}) fake.getApplicationsByNamesAndSpaceMutex.Unlock() - if fake.GetApplicationsByNamesAndSpaceStub != nil { - return fake.GetApplicationsByNamesAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationsByNamesAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1186,15 +1196,16 @@ func (fake *FakeV7Actor) GetDefaultDomain(arg1 string) (resources.Domain, v7acti fake.getDefaultDomainArgsForCall = append(fake.getDefaultDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDefaultDomainStub + fakeReturns := fake.getDefaultDomainReturns fake.recordInvocation("GetDefaultDomain", []interface{}{arg1}) fake.getDefaultDomainMutex.Unlock() - if fake.GetDefaultDomainStub != nil { - return fake.GetDefaultDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDefaultDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1252,15 +1263,16 @@ func (fake *FakeV7Actor) GetDomain(arg1 string) (resources.Domain, v7action.Warn fake.getDomainArgsForCall = append(fake.getDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDomainStub + fakeReturns := fake.getDomainReturns fake.recordInvocation("GetDomain", []interface{}{arg1}) fake.getDomainMutex.Unlock() - if fake.GetDomainStub != nil { - return fake.GetDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1321,15 +1333,16 @@ func (fake *FakeV7Actor) GetRouteByAttributes(arg1 resources.Domain, arg2 string arg3 string arg4 int }{arg1, arg2, arg3, arg4}) + stub := fake.GetRouteByAttributesStub + fakeReturns := fake.getRouteByAttributesReturns fake.recordInvocation("GetRouteByAttributes", []interface{}{arg1, arg2, arg3, arg4}) fake.getRouteByAttributesMutex.Unlock() - if fake.GetRouteByAttributesStub != nil { - return fake.GetRouteByAttributesStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRouteByAttributesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1388,15 +1401,16 @@ func (fake *FakeV7Actor) GetRouteDestinationByAppGUID(arg1 resources.Route, arg2 arg1 resources.Route arg2 string }{arg1, arg2}) + stub := fake.GetRouteDestinationByAppGUIDStub + fakeReturns := fake.getRouteDestinationByAppGUIDReturns fake.recordInvocation("GetRouteDestinationByAppGUID", []interface{}{arg1, arg2}) fake.getRouteDestinationByAppGUIDMutex.Unlock() - if fake.GetRouteDestinationByAppGUIDStub != nil { - return fake.GetRouteDestinationByAppGUIDStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getRouteDestinationByAppGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1452,15 +1466,16 @@ func (fake *FakeV7Actor) MapRoute(arg1 string, arg2 string) (v7action.Warnings, arg1 string arg2 string }{arg1, arg2}) + stub := fake.MapRouteStub + fakeReturns := fake.mapRouteReturns fake.recordInvocation("MapRoute", []interface{}{arg1, arg2}) fake.mapRouteMutex.Unlock() - if fake.MapRouteStub != nil { - return fake.MapRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.mapRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1516,15 +1531,16 @@ func (fake *FakeV7Actor) PollBuild(arg1 string, arg2 string) (resources.Droplet, arg1 string arg2 string }{arg1, arg2}) + stub := fake.PollBuildStub + fakeReturns := fake.pollBuildReturns fake.recordInvocation("PollBuild", []interface{}{arg1, arg2}) fake.pollBuildMutex.Unlock() - if fake.PollBuildStub != nil { - return fake.PollBuildStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pollBuildReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1582,15 +1598,16 @@ func (fake *FakeV7Actor) PollPackage(arg1 resources.Package) (resources.Package, fake.pollPackageArgsForCall = append(fake.pollPackageArgsForCall, struct { arg1 resources.Package }{arg1}) + stub := fake.PollPackageStub + fakeReturns := fake.pollPackageReturns fake.recordInvocation("PollPackage", []interface{}{arg1}) fake.pollPackageMutex.Unlock() - if fake.PollPackageStub != nil { - return fake.PollPackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pollPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1650,15 +1667,16 @@ func (fake *FakeV7Actor) PollStart(arg1 resources.Application, arg2 bool, arg3 f arg2 bool arg3 func(string) }{arg1, arg2, arg3}) + stub := fake.PollStartStub + fakeReturns := fake.pollStartReturns fake.recordInvocation("PollStart", []interface{}{arg1, arg2, arg3}) fake.pollStartMutex.Unlock() - if fake.PollStartStub != nil { - return fake.PollStartStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollStartReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1716,15 +1734,16 @@ func (fake *FakeV7Actor) PollStartForRolling(arg1 resources.Application, arg2 st arg3 bool arg4 func(string) }{arg1, arg2, arg3, arg4}) + stub := fake.PollStartForRollingStub + fakeReturns := fake.pollStartForRollingReturns fake.recordInvocation("PollStartForRolling", []interface{}{arg1, arg2, arg3, arg4}) fake.pollStartForRollingMutex.Unlock() - if fake.PollStartForRollingStub != nil { - return fake.PollStartForRollingStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollStartForRollingReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1784,15 +1803,16 @@ func (fake *FakeV7Actor) ResourceMatch(arg1 []sharedaction.V3Resource) ([]shared fake.resourceMatchArgsForCall = append(fake.resourceMatchArgsForCall, struct { arg1 []sharedaction.V3Resource }{arg1Copy}) + stub := fake.ResourceMatchStub + fakeReturns := fake.resourceMatchReturns fake.recordInvocation("ResourceMatch", []interface{}{arg1Copy}) fake.resourceMatchMutex.Unlock() - if fake.ResourceMatchStub != nil { - return fake.ResourceMatchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.resourceMatchReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -1851,15 +1871,16 @@ func (fake *FakeV7Actor) RestartApplication(arg1 string, arg2 bool) (v7action.Wa 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 } @@ -1915,15 +1936,16 @@ func (fake *FakeV7Actor) ScaleProcessByApplication(arg1 string, arg2 resources.P arg1 string arg2 resources.Process }{arg1, arg2}) + stub := fake.ScaleProcessByApplicationStub + fakeReturns := fake.scaleProcessByApplicationReturns fake.recordInvocation("ScaleProcessByApplication", []interface{}{arg1, arg2}) fake.scaleProcessByApplicationMutex.Unlock() - if fake.ScaleProcessByApplicationStub != nil { - return fake.ScaleProcessByApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.scaleProcessByApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1979,15 +2001,16 @@ func (fake *FakeV7Actor) SetApplicationDroplet(arg1 string, arg2 string) (v7acti arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetApplicationDropletStub + fakeReturns := fake.setApplicationDropletReturns fake.recordInvocation("SetApplicationDroplet", []interface{}{arg1, arg2}) fake.setApplicationDropletMutex.Unlock() - if fake.SetApplicationDropletStub != nil { - return fake.SetApplicationDropletStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setApplicationDropletReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2048,15 +2071,16 @@ func (fake *FakeV7Actor) SetApplicationManifest(arg1 string, arg2 []byte) (v7act arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.SetApplicationManifestStub + fakeReturns := fake.setApplicationManifestReturns fake.recordInvocation("SetApplicationManifest", []interface{}{arg1, arg2Copy}) fake.setApplicationManifestMutex.Unlock() - if fake.SetApplicationManifestStub != nil { - return fake.SetApplicationManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setApplicationManifestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2117,15 +2141,16 @@ func (fake *FakeV7Actor) SetSpaceManifest(arg1 string, arg2 []byte) (v7action.Wa 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 } @@ -2180,15 +2205,16 @@ func (fake *FakeV7Actor) StageApplicationPackage(arg1 string) (resources.Build, fake.stageApplicationPackageArgsForCall = append(fake.stageApplicationPackageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StageApplicationPackageStub + fakeReturns := fake.stageApplicationPackageReturns fake.recordInvocation("StageApplicationPackage", []interface{}{arg1}) fake.stageApplicationPackageMutex.Unlock() - if fake.StageApplicationPackageStub != nil { - return fake.StageApplicationPackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.stageApplicationPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2246,15 +2272,16 @@ func (fake *FakeV7Actor) StopApplication(arg1 string) (v7action.Warnings, error) fake.stopApplicationArgsForCall = append(fake.stopApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StopApplicationStub + fakeReturns := fake.stopApplicationReturns fake.recordInvocation("StopApplication", []interface{}{arg1}) fake.stopApplicationMutex.Unlock() - if fake.StopApplicationStub != nil { - return fake.StopApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stopApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2310,15 +2337,16 @@ func (fake *FakeV7Actor) UnmapRoute(arg1 string, arg2 string) (v7action.Warnings arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnmapRouteStub + fakeReturns := fake.unmapRouteReturns fake.recordInvocation("UnmapRoute", []interface{}{arg1, arg2}) fake.unmapRouteMutex.Unlock() - if fake.UnmapRouteStub != nil { - return fake.UnmapRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unmapRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2373,15 +2401,16 @@ func (fake *FakeV7Actor) UpdateApplication(arg1 resources.Application) (resource fake.updateApplicationArgsForCall = append(fake.updateApplicationArgsForCall, struct { arg1 resources.Application }{arg1}) + stub := fake.UpdateApplicationStub + fakeReturns := fake.updateApplicationReturns fake.recordInvocation("UpdateApplication", []interface{}{arg1}) fake.updateApplicationMutex.Unlock() - if fake.UpdateApplicationStub != nil { - return fake.UpdateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2441,15 +2470,16 @@ func (fake *FakeV7Actor) UpdateProcessByTypeAndApplication(arg1 string, arg2 str arg2 string arg3 resources.Process }{arg1, arg2, arg3}) + stub := fake.UpdateProcessByTypeAndApplicationStub + fakeReturns := fake.updateProcessByTypeAndApplicationReturns fake.recordInvocation("UpdateProcessByTypeAndApplication", []interface{}{arg1, arg2, arg3}) fake.updateProcessByTypeAndApplicationMutex.Unlock() - if fake.UpdateProcessByTypeAndApplicationStub != nil { - return fake.UpdateProcessByTypeAndApplicationStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateProcessByTypeAndApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -2512,15 +2542,16 @@ func (fake *FakeV7Actor) UploadBitsPackage(arg1 resources.Package, arg2 []shared arg3 io.Reader arg4 int64 }{arg1, arg2Copy, arg3, arg4}) + stub := fake.UploadBitsPackageStub + fakeReturns := fake.uploadBitsPackageReturns fake.recordInvocation("UploadBitsPackage", []interface{}{arg1, arg2Copy, arg3, arg4}) fake.uploadBitsPackageMutex.Unlock() - if fake.UploadBitsPackageStub != nil { - return fake.UploadBitsPackageStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadBitsPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -2581,15 +2612,16 @@ func (fake *FakeV7Actor) UploadDroplet(arg1 string, arg2 string, arg3 io.Reader, arg3 io.Reader arg4 int64 }{arg1, arg2, arg3, arg4}) + stub := fake.UploadDropletStub + fakeReturns := fake.uploadDropletReturns fake.recordInvocation("UploadDroplet", []interface{}{arg1, arg2, arg3, arg4}) fake.uploadDropletMutex.Unlock() - if fake.UploadDropletStub != nil { - return fake.UploadDropletStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.uploadDropletReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go b/api/cfnetworking/cfnetv1/cfnetv1_suite_test.go new file mode 100644 index 00000000000..298dbe268c5 --- /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/v7/api/cfnetworking/cfnetv1" + + . "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") +} + +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 00000000000..ac0ca046966 --- /dev/null +++ b/api/cfnetworking/cfnetv1/cfnetv1fakes/fake_connection_wrapper.go @@ -0,0 +1,188 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetv1fakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1" +) + +type FakeConnectionWrapper struct { + MakeStub func(*cfnetworking.Request, *cfnetworking.Response) error + makeMutex sync.RWMutex + makeArgsForCall []struct { + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + } + makeReturns struct { + result1 error + } + makeReturnsOnCall map[int]struct { + result1 error + } + WrapStub func(cfnetworking.Connection) cfnetworking.Connection + wrapMutex sync.RWMutex + wrapArgsForCall []struct { + arg1 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(arg1 *cfnetworking.Request, arg2 *cfnetworking.Response) error { + fake.makeMutex.Lock() + ret, specificReturn := fake.makeReturnsOnCall[len(fake.makeArgsForCall)] + fake.makeArgsForCall = append(fake.makeArgsForCall, struct { + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns + fake.recordInvocation("Make", []interface{}{arg1, arg2}) + fake.makeMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeConnectionWrapper) MakeCallCount() int { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + result1 error + }) + } + fake.makeReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +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 { + arg1 cfnetworking.Connection + }{arg1}) + stub := fake.WrapStub + fakeReturns := fake.wrapReturns + fake.recordInvocation("Wrap", []interface{}{arg1}) + fake.wrapMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeConnectionWrapper) WrapCallCount() int { + fake.wrapMutex.RLock() + defer fake.wrapMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + 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/cfvnetv1.go b/api/cfnetworking/cfnetv1/cfvnetv1.go new file mode 100644 index 00000000000..c80661d5e30 --- /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/client.go b/api/cfnetworking/cfnetv1/client.go new file mode 100644 index 00000000000..42fabf4ea2e --- /dev/null +++ b/api/cfnetworking/cfnetv1/client.go @@ -0,0 +1,138 @@ +// 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/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/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 00000000000..6a493104fe6 --- /dev/null +++ b/api/cfnetworking/cfnetv1/connection_wrapper.go @@ -0,0 +1,17 @@ +package cfnetv1 + +import "code.cloudfoundry.org/cli/v7/api/cfnetworking" + +// 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 +} + +// 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 00000000000..69cf937ca4f --- /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 00000000000..bbf341fd522 --- /dev/null +++ b/api/cfnetworking/cfnetv1/policy.go @@ -0,0 +1,104 @@ +package cfnetv1 + +import ( + "bytes" + "encoding/json" + "strings" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/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 00000000000..05d9a605cb2 --- /dev/null +++ b/api/cfnetworking/cfnetv1/policy_test.go @@ -0,0 +1,339 @@ +package cfnetv1_test + +import ( + "net/http" + + . "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v7/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() + }) + + 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 00000000000..d684f64418b --- /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 00000000000..a20996a1cc7 --- /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/v7/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.go b/api/cfnetworking/cfnetworking.go new file mode 100644 index 00000000000..2dd8df41fd6 --- /dev/null +++ b/api/cfnetworking/cfnetworking.go @@ -0,0 +1,6 @@ +// CF networking API. Copied from code.cloudfoundry.org/cli/v7/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/cfnetworking_suite_test.go b/api/cfnetworking/cfnetworking_suite_test.go new file mode 100644 index 00000000000..b434160e526 --- /dev/null +++ b/api/cfnetworking/cfnetworking_suite_test.go @@ -0,0 +1,35 @@ +package cfnetworking_test + +import ( + "bytes" + "log" + "testing" + + . "github.com/onsi/ginkgo/v2" + . "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 00000000000..6895cae7919 --- /dev/null +++ b/api/cfnetworking/cfnetworkingfakes/fake_connection.go @@ -0,0 +1,113 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetworkingfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking" +) + +type FakeConnection struct { + MakeStub func(*cfnetworking.Request, *cfnetworking.Response) error + makeMutex sync.RWMutex + makeArgsForCall []struct { + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + } + makeReturns struct { + result1 error + } + makeReturnsOnCall map[int]struct { + result1 error + } + invocations map[string][][]interface{} + invocationsMutex sync.RWMutex +} + +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 { + arg1 *cfnetworking.Request + arg2 *cfnetworking.Response + }{arg1, arg2}) + stub := fake.MakeStub + fakeReturns := fake.makeReturns + fake.recordInvocation("Make", []interface{}{arg1, arg2}) + fake.makeMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeConnection) MakeCallCount() int { + fake.makeMutex.RLock() + defer fake.makeMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + 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 00000000000..72051269959 --- /dev/null +++ b/api/cfnetworking/cfnetworkingfakes/fake_read_seeker.go @@ -0,0 +1,202 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package cfnetworkingfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking" +) + +type FakeReadSeeker struct { + ReadStub func([]byte) (int, error) + readMutex sync.RWMutex + readArgsForCall []struct { + arg1 []byte + } + readReturns struct { + result1 int + result2 error + } + readReturnsOnCall map[int]struct { + result1 int + result2 error + } + SeekStub func(int64, int) (int64, error) + seekMutex sync.RWMutex + seekArgsForCall []struct { + arg1 int64 + arg2 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(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 { + arg1 []byte + }{arg1Copy}) + stub := fake.ReadStub + fakeReturns := fake.readReturns + fake.recordInvocation("Read", []interface{}{arg1Copy}) + fake.readMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeReadSeeker) ReadCallCount() int { + fake.readMutex.RLock() + defer fake.readMutex.RUnlock() + 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() + 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 + result2 error + }{result1, result2} +} + +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 { + result1 int + result2 error + }) + } + fake.readReturnsOnCall[i] = struct { + result1 int + result2 error + }{result1, result2} +} + +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 { + arg1 int64 + arg2 int + }{arg1, arg2}) + stub := fake.SeekStub + fakeReturns := fake.seekReturns + fake.recordInvocation("Seek", []interface{}{arg1, arg2}) + fake.seekMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeReadSeeker) SeekCallCount() int { + fake.seekMutex.RLock() + defer fake.seekMutex.RUnlock() + 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() + 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 + result2 error + }{result1, result2} +} + +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 { + 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 00000000000..96958130dcf --- /dev/null +++ b/api/cfnetworking/connection.go @@ -0,0 +1,8 @@ +package cfnetworking + +// Connection creates and executes http requests +// +//counterfeiter:generate . Connection +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 00000000000..51a6a2ef50f --- /dev/null +++ b/api/cfnetworking/errors.go @@ -0,0 +1,64 @@ +package cfnetworking + +import ( + "encoding/json" + "net/http" + + "code.cloudfoundry.org/cli/v7/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 00000000000..0bb53a075a3 --- /dev/null +++ b/api/cfnetworking/errors_test.go @@ -0,0 +1,36 @@ +package cfnetworking_test + +import ( + "fmt" + "net/http" + + . "code.cloudfoundry.org/cli/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetworkingfakes" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/networkerror" + + . "github.com/onsi/ginkgo/v2" + . "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 00000000000..16db7bd925c --- /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 00000000000..807ac313642 --- /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 00000000000..a3ff4659f9a --- /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 00000000000..d780a34cb8f --- /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 00000000000..3e3178c39ad --- /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 00000000000..002a73df304 --- /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 00000000000..a69d3030854 --- /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 00000000000..fea62dcd7fd --- /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 00000000000..0a4c17a6f72 --- /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 an 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 00000000000..a583abcff0e --- /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 00000000000..513c6de40cb --- /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 00000000000..e337d7a7954 --- /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 00000000000..97b7992e614 --- /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 its 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 00000000000..8639a036bb5 --- /dev/null +++ b/api/cfnetworking/networking_connection.go @@ -0,0 +1,127 @@ +package cfnetworking + +import ( + "bytes" + "crypto/tls" + "crypto/x509" + "encoding/json" + "errors" + "io" + "net" + "net/http" + "net/url" + "time" + + "code.cloudfoundry.org/cli/v7/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 err.(type) { + case *url.Error: + if errors.As(err, &x509.UnknownAuthorityError{}) { + return networkerror.UnverifiedServerError{ + URL: request.URL.String(), + } + } + hostnameError := x509.HostnameError{} + if errors.As(err, &hostnameError) { + return networkerror.SSLValidationHostnameError{ + Message: hostnameError.Error(), + } + } + return networkerror.RequestError{Err: err} + 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 := 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 +} diff --git a/api/cfnetworking/networking_connection_test.go b/api/cfnetworking/networking_connection_test.go new file mode 100644 index 00000000000..3169b5915bb --- /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/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/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"` +} + +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} + }) + + 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")) + }) + }) + + 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() { + 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")) + }) + }) + + 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()})) + }) + }) + }) + + 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)) + }) + }) + }) + }) +}) diff --git a/api/cfnetworking/request.go b/api/cfnetworking/request.go new file mode 100644 index 00000000000..8a81ca53897 --- /dev/null +++ b/api/cfnetworking/request.go @@ -0,0 +1,34 @@ +package cfnetworking + +import ( + "io" + "net/http" +) + +//counterfeiter:generate . 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 00000000000..8d4de87ccac --- /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 00000000000..f29c14fa6ef --- /dev/null +++ b/api/cfnetworking/wrapper/request_logger.go @@ -0,0 +1,156 @@ +package wrapper + +import ( + "fmt" + "io" + "net/http" + "sort" + "strings" + "time" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking" +) + +// 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 +} + +// 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 := io.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 := make([]string, 0) + 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 00000000000..de973f7065b --- /dev/null +++ b/api/cfnetworking/wrapper/request_logger_test.go @@ -0,0 +1,328 @@ +package wrapper_test + +import ( + "bytes" + "errors" + "io" + "net/http" + "net/url" + "time" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetworkingfakes" + . "code.cloudfoundry.org/cli/v7/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v7/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 := 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.go b/api/cfnetworking/wrapper/retry_request.go new file mode 100644 index 00000000000..842130da48b --- /dev/null +++ b/api/cfnetworking/wrapper/retry_request.go @@ -0,0 +1,54 @@ +package wrapper + +import ( + "net/http" + + "code.cloudfoundry.org/cli/v7/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 00000000000..cc4f20c8c26 --- /dev/null +++ b/api/cfnetworking/wrapper/retry_request_test.go @@ -0,0 +1,110 @@ +package wrapper_test + +import ( + "errors" + "io" + "net/http" + "strings" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetworkingfakes" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/networkerror" + . "code.cloudfoundry.org/cli/v7/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 := 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.go b/api/cfnetworking/wrapper/uaa_authentication.go new file mode 100644 index 00000000000..42ca9b8629e --- /dev/null +++ b/api/cfnetworking/wrapper/uaa_authentication.go @@ -0,0 +1,81 @@ +package wrapper + +import ( + "code.cloudfoundry.org/cli/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/networkerror" + "code.cloudfoundry.org/cli/v7/api/uaa" +) + +// UAAClient is the interface for getting a valid access token +// +//counterfeiter:generate . UAAClient +type UAAClient interface { + RefreshAccessToken(refreshToken string) (uaa.RefreshedTokens, error) +} + +// TokenCache is where the UAA token information is stored. +// +//counterfeiter:generate . TokenCache +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 00000000000..0c8765bfc40 --- /dev/null +++ b/api/cfnetworking/wrapper/uaa_authentication_test.go @@ -0,0 +1,174 @@ +package wrapper_test + +import ( + "errors" + "io" + "net/http" + "strings" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/cfnetworkingfakes" + . "code.cloudfoundry.org/cli/v7/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/wrapper/util" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/wrapper/wrapperfakes" + "code.cloudfoundry.org/cli/v7/api/uaa" + + "code.cloudfoundry.org/cli/v7/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: 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 new file mode 100644 index 00000000000..7e1f291fef5 --- /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.go b/api/cfnetworking/wrapper/wrapper.go new file mode 100644 index 00000000000..c9964d98277 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapper.go @@ -0,0 +1,3 @@ +package wrapper + +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/api/cfnetworking/wrapper/wrapper_suite_test.go b/api/cfnetworking/wrapper/wrapper_suite_test.go new file mode 100644 index 00000000000..36bb7436be4 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapper_suite_test.go @@ -0,0 +1,35 @@ +package wrapper_test + +import ( + "bytes" + "log" + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/ghttp" +) + +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 00000000000..2194ce3b647 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_request_logger_output.go @@ -0,0 +1,740 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + "time" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking/wrapper" +) + +type FakeRequestLoggerOutput struct { + DisplayHeaderStub func(string, string) error + displayHeaderMutex sync.RWMutex + displayHeaderArgsForCall []struct { + arg1 string + arg2 string + } + displayHeaderReturns struct { + result1 error + } + displayHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayHostStub func(string) error + displayHostMutex sync.RWMutex + displayHostArgsForCall []struct { + arg1 string + } + displayHostReturns struct { + result1 error + } + displayHostReturnsOnCall map[int]struct { + result1 error + } + DisplayJSONBodyStub func([]byte) error + displayJSONBodyMutex sync.RWMutex + displayJSONBodyArgsForCall []struct { + arg1 []byte + } + displayJSONBodyReturns struct { + result1 error + } + displayJSONBodyReturnsOnCall map[int]struct { + result1 error + } + DisplayMessageStub func(string) error + displayMessageMutex sync.RWMutex + displayMessageArgsForCall []struct { + arg1 string + } + displayMessageReturns struct { + result1 error + } + displayMessageReturnsOnCall map[int]struct { + result1 error + } + DisplayRequestHeaderStub func(string, string, string) error + displayRequestHeaderMutex sync.RWMutex + displayRequestHeaderArgsForCall []struct { + arg1 string + arg2 string + arg3 string + } + displayRequestHeaderReturns struct { + result1 error + } + displayRequestHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayResponseHeaderStub func(string, string) error + displayResponseHeaderMutex sync.RWMutex + displayResponseHeaderArgsForCall []struct { + arg1 string + arg2 string + } + displayResponseHeaderReturns struct { + result1 error + } + displayResponseHeaderReturnsOnCall map[int]struct { + result1 error + } + DisplayTypeStub func(string, time.Time) error + displayTypeMutex sync.RWMutex + displayTypeArgsForCall []struct { + arg1 string + arg2 time.Time + } + displayTypeReturns struct { + result1 error + } + displayTypeReturnsOnCall map[int]struct { + result1 error + } + HandleInternalErrorStub func(error) + handleInternalErrorMutex sync.RWMutex + handleInternalErrorArgsForCall []struct { + arg1 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(arg1 string, arg2 string) error { + fake.displayHeaderMutex.Lock() + ret, specificReturn := fake.displayHeaderReturnsOnCall[len(fake.displayHeaderArgsForCall)] + fake.displayHeaderArgsForCall = append(fake.displayHeaderArgsForCall, struct { + arg1 string + arg2 string + }{arg1, arg2}) + stub := fake.DisplayHeaderStub + fakeReturns := fake.displayHeaderReturns + fake.recordInvocation("DisplayHeader", []interface{}{arg1, arg2}) + fake.displayHeaderMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayHeaderCallCount() int { + fake.displayHeaderMutex.RLock() + defer fake.displayHeaderMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + result1 error + }) + } + fake.displayHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayHost(arg1 string) error { + fake.displayHostMutex.Lock() + ret, specificReturn := fake.displayHostReturnsOnCall[len(fake.displayHostArgsForCall)] + fake.displayHostArgsForCall = append(fake.displayHostArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.DisplayHostStub + fakeReturns := fake.displayHostReturns + fake.recordInvocation("DisplayHost", []interface{}{arg1}) + fake.displayHostMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayHostCallCount() int { + fake.displayHostMutex.RLock() + defer fake.displayHostMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + result1 error + }) + } + fake.displayHostReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +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 { + arg1 []byte + }{arg1Copy}) + stub := fake.DisplayJSONBodyStub + fakeReturns := fake.displayJSONBodyReturns + fake.recordInvocation("DisplayJSONBody", []interface{}{arg1Copy}) + fake.displayJSONBodyMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayJSONBodyCallCount() int { + fake.displayJSONBodyMutex.RLock() + defer fake.displayJSONBodyMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + result1 error + }) + } + fake.displayJSONBodyReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) DisplayMessage(arg1 string) error { + fake.displayMessageMutex.Lock() + ret, specificReturn := fake.displayMessageReturnsOnCall[len(fake.displayMessageArgsForCall)] + fake.displayMessageArgsForCall = append(fake.displayMessageArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.DisplayMessageStub + fakeReturns := fake.displayMessageReturns + fake.recordInvocation("DisplayMessage", []interface{}{arg1}) + fake.displayMessageMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayMessageCallCount() int { + fake.displayMessageMutex.RLock() + defer fake.displayMessageMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + result1 error + }) + } + fake.displayMessageReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +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 { + 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 stub != nil { + return stub(arg1, arg2, arg3) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayRequestHeaderCallCount() int { + fake.displayRequestHeaderMutex.RLock() + defer fake.displayRequestHeaderMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + result1 error + }) + } + fake.displayRequestHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +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 { + arg1 string + arg2 string + }{arg1, arg2}) + stub := fake.DisplayResponseHeaderStub + fakeReturns := fake.displayResponseHeaderReturns + fake.recordInvocation("DisplayResponseHeader", []interface{}{arg1, arg2}) + fake.displayResponseHeaderMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayResponseHeaderCallCount() int { + fake.displayResponseHeaderMutex.RLock() + defer fake.displayResponseHeaderMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + result1 error + }) + } + fake.displayResponseHeaderReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +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 { + arg1 string + arg2 time.Time + }{arg1, arg2}) + stub := fake.DisplayTypeStub + fakeReturns := fake.displayTypeReturns + fake.recordInvocation("DisplayType", []interface{}{arg1, arg2}) + fake.displayTypeMutex.Unlock() + if stub != nil { + return stub(arg1, arg2) + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) DisplayTypeCallCount() int { + fake.displayTypeMutex.RLock() + defer fake.displayTypeMutex.RUnlock() + 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() + 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 + }{result1} +} + +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 { + result1 error + }) + } + fake.displayTypeReturnsOnCall[i] = struct { + result1 error + }{result1} +} + +func (fake *FakeRequestLoggerOutput) HandleInternalError(arg1 error) { + fake.handleInternalErrorMutex.Lock() + fake.handleInternalErrorArgsForCall = append(fake.handleInternalErrorArgsForCall, struct { + arg1 error + }{arg1}) + stub := fake.HandleInternalErrorStub + fake.recordInvocation("HandleInternalError", []interface{}{arg1}) + fake.handleInternalErrorMutex.Unlock() + if stub != nil { + fake.HandleInternalErrorStub(arg1) + } +} + +func (fake *FakeRequestLoggerOutput) HandleInternalErrorCallCount() int { + fake.handleInternalErrorMutex.RLock() + defer fake.handleInternalErrorMutex.RUnlock() + 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() + 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 { + }{}) + stub := fake.StartStub + fakeReturns := fake.startReturns + fake.recordInvocation("Start", []interface{}{}) + fake.startMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) StartCallCount() int { + fake.startMutex.RLock() + defer fake.startMutex.RUnlock() + 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 + }{result1} +} + +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 { + 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 { + }{}) + stub := fake.StopStub + fakeReturns := fake.stopReturns + fake.recordInvocation("Stop", []interface{}{}) + fake.stopMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeRequestLoggerOutput) StopCallCount() int { + fake.stopMutex.RLock() + defer fake.stopMutex.RUnlock() + 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 + }{result1} +} + +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 { + 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 00000000000..46e267044c7 --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_token_cache.go @@ -0,0 +1,245 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v7/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(string) + setAccessTokenMutex sync.RWMutex + setAccessTokenArgsForCall []struct { + arg1 string + } + SetRefreshTokenStub func(string) + setRefreshTokenMutex sync.RWMutex + setRefreshTokenArgsForCall []struct { + arg1 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 { + }{}) + stub := fake.AccessTokenStub + fakeReturns := fake.accessTokenReturns + fake.recordInvocation("AccessToken", []interface{}{}) + fake.accessTokenMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeTokenCache) AccessTokenCallCount() int { + fake.accessTokenMutex.RLock() + defer fake.accessTokenMutex.RUnlock() + 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 + }{result1} +} + +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 { + 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 { + }{}) + stub := fake.RefreshTokenStub + fakeReturns := fake.refreshTokenReturns + fake.recordInvocation("RefreshToken", []interface{}{}) + fake.refreshTokenMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *FakeTokenCache) RefreshTokenCallCount() int { + fake.refreshTokenMutex.RLock() + defer fake.refreshTokenMutex.RUnlock() + 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 + }{result1} +} + +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 { + result1 string + }) + } + fake.refreshTokenReturnsOnCall[i] = struct { + result1 string + }{result1} +} + +func (fake *FakeTokenCache) SetAccessToken(arg1 string) { + fake.setAccessTokenMutex.Lock() + fake.setAccessTokenArgsForCall = append(fake.setAccessTokenArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.SetAccessTokenStub + fake.recordInvocation("SetAccessToken", []interface{}{arg1}) + fake.setAccessTokenMutex.Unlock() + if stub != nil { + fake.SetAccessTokenStub(arg1) + } +} + +func (fake *FakeTokenCache) SetAccessTokenCallCount() int { + fake.setAccessTokenMutex.RLock() + defer fake.setAccessTokenMutex.RUnlock() + 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() + argsForCall := fake.setAccessTokenArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeTokenCache) SetRefreshToken(arg1 string) { + fake.setRefreshTokenMutex.Lock() + fake.setRefreshTokenArgsForCall = append(fake.setRefreshTokenArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.SetRefreshTokenStub + fake.recordInvocation("SetRefreshToken", []interface{}{arg1}) + fake.setRefreshTokenMutex.Unlock() + if stub != nil { + fake.SetRefreshTokenStub(arg1) + } +} + +func (fake *FakeTokenCache) SetRefreshTokenCallCount() int { + fake.setRefreshTokenMutex.RLock() + defer fake.setRefreshTokenMutex.RUnlock() + 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() + argsForCall := fake.setRefreshTokenArgsForCall[i] + return argsForCall.arg1 +} + +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 00000000000..9d5ebba821d --- /dev/null +++ b/api/cfnetworking/wrapper/wrapperfakes/fake_uaaclient.go @@ -0,0 +1,117 @@ +// Code generated by counterfeiter. DO NOT EDIT. +package wrapperfakes + +import ( + "sync" + + "code.cloudfoundry.org/cli/v7/api/cfnetworking/wrapper" + "code.cloudfoundry.org/cli/v7/api/uaa" +) + +type FakeUAAClient struct { + RefreshAccessTokenStub func(string) (uaa.RefreshedTokens, error) + refreshAccessTokenMutex sync.RWMutex + refreshAccessTokenArgsForCall []struct { + arg1 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(arg1 string) (uaa.RefreshedTokens, error) { + fake.refreshAccessTokenMutex.Lock() + ret, specificReturn := fake.refreshAccessTokenReturnsOnCall[len(fake.refreshAccessTokenArgsForCall)] + fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns + fake.recordInvocation("RefreshAccessToken", []interface{}{arg1}) + fake.refreshAccessTokenMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeUAAClient) RefreshAccessTokenCallCount() int { + fake.refreshAccessTokenMutex.RLock() + defer fake.refreshAccessTokenMutex.RUnlock() + 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() + 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 + result2 error + }{result1, result2} +} + +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 { + 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/cloudcontroller/ccv2/ccv2fakes/fake_connection_wrapper.go b/api/cloudcontroller/ccv2/ccv2fakes/fake_connection_wrapper.go index 573b3dc9fb5..c64256e9382 100644 --- a/api/cloudcontroller/ccv2/ccv2fakes/fake_connection_wrapper.go +++ b/api/cloudcontroller/ccv2/ccv2fakes/fake_connection_wrapper.go @@ -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/ccv2/ccv2fakes/fake_reader.go b/api/cloudcontroller/ccv2/ccv2fakes/fake_reader.go index 20c59db08ec..8ec619886c2 100644 --- a/api/cloudcontroller/ccv2/ccv2fakes/fake_reader.go +++ b/api/cloudcontroller/ccv2/ccv2fakes/fake_reader.go @@ -36,15 +36,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_clock.go b/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go index c689055a8e2..826041b76ed 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_clock.go @@ -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 6abc1ea0b32..a3264d77611 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_connection_wrapper.go @@ -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 09e6ccf14ce..395fb77fea9 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 21a0fd801c1..d5e6ba07901 100644 --- a/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go +++ b/api/cloudcontroller/ccv3/ccv3fakes/fake_requester.go @@ -121,9 +121,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) } } @@ -152,9 +153,10 @@ func (fake *FakeRequester) InitializeRouter(arg1 map[string]string) { fake.initializeRouterArgsForCall = append(fake.initializeRouterArgsForCall, struct { arg1 map[string]string }{arg1}) + stub := fake.InitializeRouterStub fake.recordInvocation("InitializeRouter", []interface{}{arg1}) fake.initializeRouterMutex.Unlock() - if fake.InitializeRouterStub != nil { + if stub != nil { fake.InitializeRouterStub(arg1) } } @@ -184,15 +186,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 } @@ -250,15 +253,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 } @@ -318,15 +322,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 } @@ -393,15 +398,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 } @@ -465,15 +471,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 } @@ -530,9 +537,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/cloudcontrollerfakes/fake_connection.go b/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go index 7c78f21725b..1842c700987 100644 --- a/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go +++ b/api/cloudcontroller/cloudcontrollerfakes/fake_connection.go @@ -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/wrapper/wrapperfakes/fake_request_logger_output.go b/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go index e9c365bfc7c..4c242bb47cc 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_request_logger_output.go @@ -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 a313e5d722f..3b12ac11ea6 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_token_cache.go @@ -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 99455bab0ad..2b012ce3dd8 100644 --- a/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/cloudcontroller/wrapper/wrapperfakes/fake_uaaclient.go @@ -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/plugin/pluginfakes/fake_connection.go b/api/plugin/pluginfakes/fake_connection.go index 4d7dddf8be9..00e5fc09c5e 100644 --- a/api/plugin/pluginfakes/fake_connection.go +++ b/api/plugin/pluginfakes/fake_connection.go @@ -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 3f28d830967..7ceed318e23 100644 --- a/api/plugin/pluginfakes/fake_connection_wrapper.go +++ b/api/plugin/pluginfakes/fake_connection_wrapper.go @@ -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 139e7a944a3..f69c6f5dad0 100644 --- a/api/plugin/pluginfakes/fake_proxy_reader.go +++ b/api/plugin/pluginfakes/fake_proxy_reader.go @@ -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/wrapperfakes/fake_request_logger_output.go b/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go index 96d51fefdb1..4dc5bbbb6e0 100644 --- a/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/plugin/wrapper/wrapperfakes/fake_request_logger_output.go @@ -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/routerfakes/fake_connection.go b/api/router/routerfakes/fake_connection.go index 685d51ef9e6..3c63479c811 100644 --- a/api/router/routerfakes/fake_connection.go +++ b/api/router/routerfakes/fake_connection.go @@ -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 cc7ebb16e82..b42825ba1f6 100644 --- a/api/router/routerfakes/fake_connection_wrapper.go +++ b/api/router/routerfakes/fake_connection_wrapper.go @@ -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/wrapperfakes/fake_request_logger_output.go b/api/router/wrapper/wrapperfakes/fake_request_logger_output.go index 7f7f2a0738a..d443a9ae181 100644 --- a/api/router/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/router/wrapper/wrapperfakes/fake_request_logger_output.go @@ -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 2beb2a8e51e..766127a6edb 100644 --- a/api/router/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/router/wrapper/wrapperfakes/fake_token_cache.go @@ -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 99050df08b6..2ea44e1ab21 100644 --- a/api/router/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/router/wrapper/wrapperfakes/fake_uaaclient.go @@ -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/client.go b/api/uaa/client.go index 94e651d96c3..7158fcdba38 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/v7/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/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go b/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go index 858de4735e2..97d8670d792 100644 --- a/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go +++ b/api/uaa/noaabridge/noaabridgefakes/fake_token_cache.go @@ -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 aecd368f4fb..ee2cbf82b01 100644 --- a/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go +++ b/api/uaa/noaabridge/noaabridgefakes/fake_uaaclient.go @@ -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/uaafakes/fake_config.go b/api/uaa/uaafakes/fake_config.go index 96726f24176..9942e792c67 100644 --- a/api/uaa/uaafakes/fake_config.go +++ b/api/uaa/uaafakes/fake_config.go @@ -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 0548db919cb..7d732f09ba2 100644 --- a/api/uaa/uaafakes/fake_connection.go +++ b/api/uaa/uaafakes/fake_connection.go @@ -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 c2e67bb1e11..6d942cc134e 100644 --- a/api/uaa/uaafakes/fake_connection_wrapper.go +++ b/api/uaa/uaafakes/fake_connection_wrapper.go @@ -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/wrapper/wrapperfakes/fake_request_logger_output.go b/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go index efe17ad55aa..a16683e608d 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go +++ b/api/uaa/wrapper/wrapperfakes/fake_request_logger_output.go @@ -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 909b56123aa..0f5558b911f 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_token_cache.go +++ b/api/uaa/wrapper/wrapperfakes/fake_token_cache.go @@ -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 49de2c12717..d22e9a24147 100644 --- a/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go +++ b/api/uaa/wrapper/wrapperfakes/fake_uaaclient.go @@ -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/actorsfakes/fake_push_actor.go b/cf/actors/actorsfakes/fake_push_actor.go index 0cf315225bd..b45f4be1baf 100644 --- a/cf/actors/actorsfakes/fake_push_actor.go +++ b/cf/actors/actorsfakes/fake_push_actor.go @@ -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 1f413e1bbed..550d7e35178 100644 --- a/cf/actors/actorsfakes/fake_route_actor.go +++ b/cf/actors/actorsfakes/fake_route_actor.go @@ -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 e0140beea35..8c995fa61ad 100644 --- a/cf/actors/actorsfakes/fake_service_actor.go +++ b/cf/actors/actorsfakes/fake_service_actor.go @@ -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 f7b0c72a677..a8f10391ece 100644 --- a/cf/actors/actorsfakes/fake_service_plan_actor.go +++ b/cf/actors/actorsfakes/fake_service_plan_actor.go @@ -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/brokerbuilderfakes/fake_broker_builder.go b/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go index a9ca5673735..cc2171f6cb2 100644 --- a/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go +++ b/cf/actors/brokerbuilder/brokerbuilderfakes/fake_broker_builder.go @@ -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/planbuilderfakes/fake_plan_builder.go b/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go index 15f4b9c167f..fc7802b192a 100644 --- a/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go +++ b/cf/actors/planbuilder/planbuilderfakes/fake_plan_builder.go @@ -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/plugininstallerfakes/fake_plugin_installer.go b/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go index ec86945ed08..05496657a90 100644 --- a/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go +++ b/cf/actors/plugininstaller/plugininstallerfakes/fake_plugin_installer.go @@ -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/servicebuilder/servicebuilderfakes/fake_service_builder.go b/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go index bf7d3feecc0..7cc34e56276 100644 --- a/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go +++ b/cf/actors/servicebuilder/servicebuilderfakes/fake_service_builder.go @@ -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/userprint/userprintfakes/fake_user_printer.go b/cf/actors/userprint/userprintfakes/fake_user_printer.go index 6c9b9dc02c8..bda9c7a2270 100644 --- a/cf/actors/userprint/userprintfakes/fake_user_printer.go +++ b/cf/actors/userprint/userprintfakes/fake_user_printer.go @@ -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/apifakes/fake_app_summary_repository.go b/cf/api/apifakes/fake_app_summary_repository.go index f33d8f7c3f2..fd11e68f0cf 100644 --- a/cf/api/apifakes/fake_app_summary_repository.go +++ b/cf/api/apifakes/fake_app_summary_repository.go @@ -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 86092e24cd7..617fce5c1b5 100644 --- a/cf/api/apifakes/fake_buildpack_bits_repository.go +++ b/cf/api/apifakes/fake_buildpack_bits_repository.go @@ -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 a86749209c3..bee1e271f39 100644 --- a/cf/api/apifakes/fake_buildpack_repository.go +++ b/cf/api/apifakes/fake_buildpack_repository.go @@ -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 6d73610fc50..10ac710728d 100644 --- a/cf/api/apifakes/fake_client_repository.go +++ b/cf/api/apifakes/fake_client_repository.go @@ -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 50ef89eafda..e1d9f2f6b9a 100644 --- a/cf/api/apifakes/fake_curl_repository.go +++ b/cf/api/apifakes/fake_curl_repository.go @@ -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 4e377144c45..84abe64af7a 100644 --- a/cf/api/apifakes/fake_domain_repository.go +++ b/cf/api/apifakes/fake_domain_repository.go @@ -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 f6a5b8ffb3a..fbd2514a63b 100644 --- a/cf/api/apifakes/fake_route_repository.go +++ b/cf/api/apifakes/fake_route_repository.go @@ -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 37f35d576d6..082f0df95a3 100644 --- a/cf/api/apifakes/fake_route_service_binding_repository.go +++ b/cf/api/apifakes/fake_route_service_binding_repository.go @@ -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 227743fbcfa..84bda22f7bc 100644 --- a/cf/api/apifakes/fake_routing_apirepository.go +++ b/cf/api/apifakes/fake_routing_apirepository.go @@ -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 86cb49e2006..5ee495f31ee 100644 --- a/cf/api/apifakes/fake_service_auth_token_repository.go +++ b/cf/api/apifakes/fake_service_auth_token_repository.go @@ -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 686859f14d6..7e837467289 100644 --- a/cf/api/apifakes/fake_service_binding_repository.go +++ b/cf/api/apifakes/fake_service_binding_repository.go @@ -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 a7272a87a0d..90d576157b7 100644 --- a/cf/api/apifakes/fake_service_broker_repository.go +++ b/cf/api/apifakes/fake_service_broker_repository.go @@ -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 8fecd7a56b8..152870d7f80 100644 --- a/cf/api/apifakes/fake_service_key_repository.go +++ b/cf/api/apifakes/fake_service_key_repository.go @@ -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 f08bfca11fd..6a801f9c9f0 100644 --- a/cf/api/apifakes/fake_service_plan_repository.go +++ b/cf/api/apifakes/fake_service_plan_repository.go @@ -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 0f04dfbadf3..5e7de6ce00d 100644 --- a/cf/api/apifakes/fake_service_plan_visibility_repository.go +++ b/cf/api/apifakes/fake_service_plan_visibility_repository.go @@ -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 75319f3d53c..1f13d6e9a5a 100644 --- a/cf/api/apifakes/fake_service_repository.go +++ b/cf/api/apifakes/fake_service_repository.go @@ -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 c0e95c56848..61ee9f974a7 100644 --- a/cf/api/apifakes/fake_service_summary_repository.go +++ b/cf/api/apifakes/fake_service_summary_repository.go @@ -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 5b3481e70bb..c5de7164a40 100644 --- a/cf/api/apifakes/fake_user_provided_service_instance_repository.go +++ b/cf/api/apifakes/fake_user_provided_service_instance_repository.go @@ -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 6615a0fb5ec..b5d4fa9879b 100644 --- a/cf/api/apifakes/fake_user_repository.go +++ b/cf/api/apifakes/fake_user_repository.go @@ -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/appevents/appeventsfakes/fake_repository.go b/cf/api/appevents/appeventsfakes/fake_repository.go index 738d6b74fa2..0f8417a80c8 100644 --- a/cf/api/appevents/appeventsfakes/fake_repository.go +++ b/cf/api/appevents/appeventsfakes/fake_repository.go @@ -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/appfilesfakes/fake_repository.go b/cf/api/appfiles/appfilesfakes/fake_repository.go index f2b29f05f2c..1d2ef271b03 100644 --- a/cf/api/appfiles/appfilesfakes/fake_repository.go +++ b/cf/api/appfiles/appfilesfakes/fake_repository.go @@ -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/appinstancesfakes/fake_repository.go b/cf/api/appinstances/appinstancesfakes/fake_repository.go index 99f0e0d9789..1ac947f96b5 100644 --- a/cf/api/appinstances/appinstancesfakes/fake_repository.go +++ b/cf/api/appinstances/appinstancesfakes/fake_repository.go @@ -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/applicationbitsfakes/fake_repository.go b/cf/api/applicationbits/applicationbitsfakes/fake_repository.go index 8de0fe9e350..f5fb1a39ec1 100644 --- a/cf/api/applicationbits/applicationbitsfakes/fake_repository.go +++ b/cf/api/applicationbits/applicationbitsfakes/fake_repository.go @@ -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/applicationsfakes/fake_repository.go b/cf/api/applications/applicationsfakes/fake_repository.go index cbfb478d10b..c39ff716b25 100644 --- a/cf/api/applications/applicationsfakes/fake_repository.go +++ b/cf/api/applications/applicationsfakes/fake_repository.go @@ -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/authenticationfakes/fake_repository.go b/cf/api/authentication/authenticationfakes/fake_repository.go index 5867242939c..75e5e568352 100644 --- a/cf/api/authentication/authenticationfakes/fake_repository.go +++ b/cf/api/authentication/authenticationfakes/fake_repository.go @@ -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 90629148e28..4ad20d021db 100644 --- a/cf/api/authentication/authenticationfakes/fake_token_refresher.go +++ b/cf/api/authentication/authenticationfakes/fake_token_refresher.go @@ -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/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go b/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go index 49f70b66163..8d6268523a7 100644 --- a/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go +++ b/cf/api/copyapplicationsource/copyapplicationsourcefakes/fake_repository.go @@ -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/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go b/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go index d152bb79428..cabc00eae0a 100644 --- a/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go +++ b/cf/api/environmentvariablegroups/environmentvariablegroupsfakes/fake_repository.go @@ -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/featureflagsfakes/fake_feature_flag_repository.go b/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go index 14a23a6ba39..89bf2a751e0 100644 --- a/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go +++ b/cf/api/featureflags/featureflagsfakes/fake_feature_flag_repository.go @@ -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/logsfakes/fake_color_logger.go b/cf/api/logs/logsfakes/fake_color_logger.go index 5603817d0c8..078bd58fd61 100644 --- a/cf/api/logs/logsfakes/fake_color_logger.go +++ b/cf/api/logs/logsfakes/fake_color_logger.go @@ -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 628032628b3..01b8e4ffe7b 100644 --- a/cf/api/logs/logsfakes/fake_loggable.go +++ b/cf/api/logs/logsfakes/fake_loggable.go @@ -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 7c4a5775774..42b23581ccd 100644 --- a/cf/api/logs/logsfakes/fake_repository.go +++ b/cf/api/logs/logsfakes/fake_repository.go @@ -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/organizationsfakes/fake_organization_repository.go b/cf/api/organizations/organizationsfakes/fake_organization_repository.go index e921d1e4568..4503da2661c 100644 --- a/cf/api/organizations/organizationsfakes/fake_organization_repository.go +++ b/cf/api/organizations/organizationsfakes/fake_organization_repository.go @@ -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/passwordfakes/fake_repository.go b/cf/api/password/passwordfakes/fake_repository.go index 18e1556675c..96547b636ae 100644 --- a/cf/api/password/passwordfakes/fake_repository.go +++ b/cf/api/password/passwordfakes/fake_repository.go @@ -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/quotasfakes/fake_quota_repository.go b/cf/api/quotas/quotasfakes/fake_quota_repository.go index 51dd5c05a24..6a57f809946 100644 --- a/cf/api/quotas/quotasfakes/fake_quota_repository.go +++ b/cf/api/quotas/quotasfakes/fake_quota_repository.go @@ -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/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go b/cf/api/securitygroups/defaults/running/runningfakes/fake_security_groups_repo.go index d0dd7538925..4bb0b83b9fd 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 @@ -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/stagingfakes/fake_security_groups_repo.go b/cf/api/securitygroups/defaults/staging/stagingfakes/fake_security_groups_repo.go index 39c16710c3e..81cffda98a0 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 @@ -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/securitygroupsfakes/fake_security_group_repo.go b/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go index d817015759b..059de89897b 100644 --- a/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go +++ b/cf/api/securitygroups/securitygroupsfakes/fake_security_group_repo.go @@ -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/spacesfakes/fake_security_group_space_binder.go b/cf/api/securitygroups/spaces/spacesfakes/fake_security_group_space_binder.go index f700c60c198..908450b25fa 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 @@ -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/spacequotas/spacequotasfakes/fake_space_quota_repository.go b/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go index 48570157ed3..e836a3282ae 100644 --- a/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go +++ b/cf/api/spacequotas/spacequotasfakes/fake_space_quota_repository.go @@ -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/spacesfakes/fake_space_repository.go b/cf/api/spaces/spacesfakes/fake_space_repository.go index 701db7f58fa..cf4345ac250 100644 --- a/cf/api/spaces/spacesfakes/fake_space_repository.go +++ b/cf/api/spaces/spacesfakes/fake_space_repository.go @@ -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/stacksfakes/fake_stack_repository.go b/cf/api/stacks/stacksfakes/fake_stack_repository.go index 56502d85e9c..81ef59dd731 100644 --- a/cf/api/stacks/stacksfakes/fake_stack_repository.go +++ b/cf/api/stacks/stacksfakes/fake_stack_repository.go @@ -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/appfiles/appfilesfakes/fake_app_files.go b/cf/appfiles/appfilesfakes/fake_app_files.go index 3fabfda54af..6afa06a8763 100644 --- a/cf/appfiles/appfilesfakes/fake_app_files.go +++ b/cf/appfiles/appfilesfakes/fake_app_files.go @@ -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 4136fc296cb..1bf0f7531a8 100644 --- a/cf/appfiles/appfilesfakes/fake_cf_ignore.go +++ b/cf/appfiles/appfilesfakes/fake_cf_ignore.go @@ -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 78667da60ec..d6698525adb 100644 --- a/cf/appfiles/appfilesfakes/fake_zipper.go +++ b/cf/appfiles/appfilesfakes/fake_zipper.go @@ -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/commandregistry/commandregistryfakes/fake_command.go b/cf/commandregistry/commandregistryfakes/fake_command.go index 6b11c8479d0..ced725ca49f 100644 --- a/cf/commandregistry/commandregistryfakes/fake_command.go +++ b/cf/commandregistry/commandregistryfakes/fake_command.go @@ -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 911903b9ee4..2a91361c89c 100644 --- a/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go +++ b/cf/commandregistry/commandregistryfakes/fake_random_word_generator.go @@ -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/commands/application/applicationfakes/fake_displayer.go b/cf/commands/application/applicationfakes/fake_displayer.go index 734167606a0..bf889ba3ac2 100644 --- a/cf/commands/application/applicationfakes/fake_displayer.go +++ b/cf/commands/application/applicationfakes/fake_displayer.go @@ -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 d19e70cac9a..dc6c9da1968 100644 --- a/cf/commands/application/applicationfakes/fake_restarter.go +++ b/cf/commands/application/applicationfakes/fake_restarter.go @@ -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 d1957e0c37e..817f25ac9ab 100644 --- a/cf/commands/application/applicationfakes/fake_staging_watcher.go +++ b/cf/commands/application/applicationfakes/fake_staging_watcher.go @@ -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 2fba808148a..266c944c407 100644 --- a/cf/commands/application/applicationfakes/fake_starter.go +++ b/cf/commands/application/applicationfakes/fake_starter.go @@ -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 90780131cad..ff38052d30c 100644 --- a/cf/commands/application/applicationfakes/fake_stopper.go +++ b/cf/commands/application/applicationfakes/fake_stopper.go @@ -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/commandsfakes/fake_sshcode_getter.go b/cf/commands/commandsfakes/fake_sshcode_getter.go index 3f5d1a51584..b62e0b3242a 100644 --- a/cf/commands/commandsfakes/fake_sshcode_getter.go +++ b/cf/commands/commandsfakes/fake_sshcode_getter.go @@ -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/route/routefakes/fake_creator.go b/cf/commands/route/routefakes/fake_creator.go index 6062486a57b..d12e45680a7 100644 --- a/cf/commands/route/routefakes/fake_creator.go +++ b/cf/commands/route/routefakes/fake_creator.go @@ -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/service/servicefakes/fake_binder.go b/cf/commands/service/servicefakes/fake_binder.go index 3cfd9c31c4b..58eebfe3780 100644 --- a/cf/commands/service/servicefakes/fake_binder.go +++ b/cf/commands/service/servicefakes/fake_binder.go @@ -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 8f8e42de869..3cd2ec993b6 100644 --- a/cf/commands/service/servicefakes/fake_route_service_unbinder.go +++ b/cf/commands/service/servicefakes/fake_route_service_unbinder.go @@ -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/user/userfakes/fake_org_role_setter.go b/cf/commands/user/userfakes/fake_org_role_setter.go index 878e59e2242..4cc6e0489e5 100644 --- a/cf/commands/user/userfakes/fake_org_role_setter.go +++ b/cf/commands/user/userfakes/fake_org_role_setter.go @@ -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 fb07b3297e6..0c94721813c 100644 --- a/cf/commands/user/userfakes/fake_space_role_setter.go +++ b/cf/commands/user/userfakes/fake_space_role_setter.go @@ -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/configuration/configurationfakes/fake_data_interface.go b/cf/configuration/configurationfakes/fake_data_interface.go index b616118d4b2..3e5adf0ad08 100644 --- a/cf/configuration/configurationfakes/fake_data_interface.go +++ b/cf/configuration/configurationfakes/fake_data_interface.go @@ -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 d99e46c214b..8f09e7dfdbe 100644 --- a/cf/configuration/configurationfakes/fake_persistor.go +++ b/cf/configuration/configurationfakes/fake_persistor.go @@ -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/coreconfigfakes/fake_endpoint_repository.go b/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go index aa2e3811bfa..dedc0db9b0e 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_endpoint_repository.go @@ -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 d9b508aadc6..cfe5fbefdaf 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_read_writer.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" "code.cloudfoundry.org/cli/v7/cf/models" - "github.com/blang/semver/v4" + 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 55b4546bf72..8b5d4da3443 100644 --- a/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go +++ b/cf/configuration/coreconfig/coreconfigfakes/fake_repository.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/v7/cf/configuration/coreconfig" "code.cloudfoundry.org/cli/v7/cf/models" - "github.com/blang/semver/v4" + 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/pluginconfigfakes/fake_plugin_configuration.go b/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go index 131cf619b32..d7c1fc0ed1b 100644 --- a/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go +++ b/cf/configuration/pluginconfig/pluginconfigfakes/fake_plugin_configuration.go @@ -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/errorsfakes/fake_httperror.go b/cf/errors/errorsfakes/fake_httperror.go index b32547ffece..1bb62bbd576 100644 --- a/cf/errors/errorsfakes/fake_httperror.go +++ b/cf/errors/errorsfakes/fake_httperror.go @@ -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/manifest/manifestfakes/fake_app.go b/cf/manifest/manifestfakes/fake_app.go index 3222728d120..9e8b595ad02 100644 --- a/cf/manifest/manifestfakes/fake_app.go +++ b/cf/manifest/manifestfakes/fake_app.go @@ -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 974adb8d955..5e2ee367d82 100644 --- a/cf/manifest/manifestfakes/fake_repository.go +++ b/cf/manifest/manifestfakes/fake_repository.go @@ -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/net/netfakes/fake_httpclient_interface.go b/cf/net/netfakes/fake_httpclient_interface.go index 1c535cf9df1..3f30e3ccc06 100644 --- a/cf/net/netfakes/fake_httpclient_interface.go +++ b/cf/net/netfakes/fake_httpclient_interface.go @@ -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 c6331fd1915..97249d5075d 100644 --- a/cf/net/netfakes/fake_request_dumper_interface.go +++ b/cf/net/netfakes/fake_request_dumper_interface.go @@ -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 f23c9739c44..bdaa6e7eeb6 100644 --- a/cf/net/netfakes/fake_warning_producer.go +++ b/cf/net/netfakes/fake_warning_producer.go @@ -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/requirements/requirementsfakes/fake_application_requirement.go b/cf/requirements/requirementsfakes/fake_application_requirement.go index 94a1df641b9..25e21bfee95 100644 --- a/cf/requirements/requirementsfakes/fake_application_requirement.go +++ b/cf/requirements/requirementsfakes/fake_application_requirement.go @@ -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 ab515feaece..668a161feeb 100644 --- a/cf/requirements/requirementsfakes/fake_buildpack_requirement.go +++ b/cf/requirements/requirementsfakes/fake_buildpack_requirement.go @@ -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 803a50c7e0a..d5ea5463a8f 100644 --- a/cf/requirements/requirementsfakes/fake_config_refresher.go +++ b/cf/requirements/requirementsfakes/fake_config_refresher.go @@ -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 44b8014d5a0..880aa078a09 100644 --- a/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go +++ b/cf/requirements/requirementsfakes/fake_deaapplication_requirement.go @@ -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 d6ff11e6e34..4b18015a914 100644 --- a/cf/requirements/requirementsfakes/fake_domain_requirement.go +++ b/cf/requirements/requirementsfakes/fake_domain_requirement.go @@ -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 4bc8ae210ff..86a3dc8ad50 100644 --- a/cf/requirements/requirementsfakes/fake_factory.go +++ b/cf/requirements/requirementsfakes/fake_factory.go @@ -5,7 +5,7 @@ import ( "sync" "code.cloudfoundry.org/cli/v7/cf/requirements" - "github.com/blang/semver/v4" + 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 7216f24738f..19896ed5487 100644 --- a/cf/requirements/requirementsfakes/fake_organization_requirement.go +++ b/cf/requirements/requirementsfakes/fake_organization_requirement.go @@ -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 489a004309d..99642858706 100644 --- a/cf/requirements/requirementsfakes/fake_requirement.go +++ b/cf/requirements/requirementsfakes/fake_requirement.go @@ -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 199c0476e11..f6492852af3 100644 --- a/cf/requirements/requirementsfakes/fake_service_instance_requirement.go +++ b/cf/requirements/requirementsfakes/fake_service_instance_requirement.go @@ -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 8cad09b1191..e4565479245 100644 --- a/cf/requirements/requirementsfakes/fake_space_requirement.go +++ b/cf/requirements/requirementsfakes/fake_space_requirement.go @@ -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 af5c8012bea..59c54e00c9d 100644 --- a/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go +++ b/cf/requirements/requirementsfakes/fake_targeted_org_requirement.go @@ -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 a9b9710d2e2..17b1f1586da 100644 --- a/cf/requirements/requirementsfakes/fake_user_requirement.go +++ b/cf/requirements/requirementsfakes/fake_user_requirement.go @@ -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/ssh/sshfakes/fake_listener_factory.go b/cf/ssh/sshfakes/fake_listener_factory.go index a500b000687..5c10ca9512c 100644 --- a/cf/ssh/sshfakes/fake_listener_factory.go +++ b/cf/ssh/sshfakes/fake_listener_factory.go @@ -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 acc399c8d95..838b5f9f36c 100644 --- a/cf/ssh/sshfakes/fake_secure_client.go +++ b/cf/ssh/sshfakes/fake_secure_client.go @@ -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 b1e57001ddb..5aff0feb050 100644 --- a/cf/ssh/sshfakes/fake_secure_dialer.go +++ b/cf/ssh/sshfakes/fake_secure_dialer.go @@ -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 8683031036f..7eaf11f84da 100644 --- a/cf/ssh/sshfakes/fake_secure_session.go +++ b/cf/ssh/sshfakes/fake_secure_session.go @@ -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 54fc946c9fb..5f21bbde67c 100644 --- a/cf/ssh/sshfakes/fake_secure_shell.go +++ b/cf/ssh/sshfakes/fake_secure_shell.go @@ -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/terminalfakes/fake_terminal_helper.go b/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go index f500f31da20..e0ef33264e3 100644 --- a/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go +++ b/cf/ssh/terminal/terminalfakes/fake_terminal_helper.go @@ -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/terminalfakes/fake_ui.go b/cf/terminal/terminalfakes/fake_ui.go index f95cdecc7bc..eb929e531fc 100644 --- a/cf/terminal/terminalfakes/fake_ui.go +++ b/cf/terminal/terminalfakes/fake_ui.go @@ -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/trace/tracefakes/fake_printer.go b/cf/trace/tracefakes/fake_printer.go index ed6e9f16bba..ec0cc8fff1c 100644 --- a/cf/trace/tracefakes/fake_printer.go +++ b/cf/trace/tracefakes/fake_printer.go @@ -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/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go b/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go index 64f6dc24111..e657269e833 100644 --- a/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go +++ b/cf/util/testhelpers/rpcserver/rpcserverfakes/fake_handlers.go @@ -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/command/commandfakes/fake_config.go b/command/commandfakes/fake_config.go index 00717be9e09..cb9695ed4fa 100644 --- a/command/commandfakes/fake_config.go +++ b/command/commandfakes/fake_config.go @@ -581,15 +581,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 } @@ -633,15 +634,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 } @@ -685,9 +687,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) } } @@ -717,9 +720,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) } } @@ -748,15 +752,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 } @@ -800,15 +805,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 } @@ -852,15 +858,16 @@ func (fake *FakeConfig) CFPassword() string { ret, specificReturn := fake.cFPasswordReturnsOnCall[len(fake.cFPasswordArgsForCall)] fake.cFPasswordArgsForCall = append(fake.cFPasswordArgsForCall, struct { }{}) + stub := fake.CFPasswordStub + fakeReturns := fake.cFPasswordReturns fake.recordInvocation("CFPassword", []interface{}{}) fake.cFPasswordMutex.Unlock() - if fake.CFPasswordStub != nil { - return fake.CFPasswordStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cFPasswordReturns return fakeReturns.result1 } @@ -904,15 +911,16 @@ func (fake *FakeConfig) CFUsername() string { ret, specificReturn := fake.cFUsernameReturnsOnCall[len(fake.cFUsernameArgsForCall)] fake.cFUsernameArgsForCall = append(fake.cFUsernameArgsForCall, struct { }{}) + stub := fake.CFUsernameStub + fakeReturns := fake.cFUsernameReturns fake.recordInvocation("CFUsername", []interface{}{}) fake.cFUsernameMutex.Unlock() - if fake.CFUsernameStub != nil { - return fake.CFUsernameStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cFUsernameReturns return fakeReturns.result1 } @@ -956,15 +964,16 @@ func (fake *FakeConfig) ColorEnabled() configv3.ColorSetting { 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 } @@ -1008,15 +1017,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 } @@ -1063,15 +1073,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 } @@ -1118,15 +1129,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 } @@ -1170,15 +1182,16 @@ func (fake *FakeConfig) DockerPassword() string { ret, specificReturn := fake.dockerPasswordReturnsOnCall[len(fake.dockerPasswordArgsForCall)] fake.dockerPasswordArgsForCall = append(fake.dockerPasswordArgsForCall, struct { }{}) + stub := fake.DockerPasswordStub + fakeReturns := fake.dockerPasswordReturns fake.recordInvocation("DockerPassword", []interface{}{}) fake.dockerPasswordMutex.Unlock() - if fake.DockerPasswordStub != nil { - return fake.DockerPasswordStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.dockerPasswordReturns return fakeReturns.result1 } @@ -1222,15 +1235,16 @@ func (fake *FakeConfig) Experimental() bool { ret, specificReturn := fake.experimentalReturnsOnCall[len(fake.experimentalArgsForCall)] fake.experimentalArgsForCall = append(fake.experimentalArgsForCall, struct { }{}) + stub := fake.ExperimentalStub + fakeReturns := fake.experimentalReturns fake.recordInvocation("Experimental", []interface{}{}) fake.experimentalMutex.Unlock() - if fake.ExperimentalStub != nil { - return fake.ExperimentalStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.experimentalReturns return fakeReturns.result1 } @@ -1275,15 +1289,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 } @@ -1338,15 +1353,16 @@ func (fake *FakeConfig) GetPluginCaseInsensitive(arg1 string) (configv3.Plugin, fake.getPluginCaseInsensitiveArgsForCall = append(fake.getPluginCaseInsensitiveArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetPluginCaseInsensitiveStub + fakeReturns := fake.getPluginCaseInsensitiveReturns fake.recordInvocation("GetPluginCaseInsensitive", []interface{}{arg1}) fake.getPluginCaseInsensitiveMutex.Unlock() - if fake.GetPluginCaseInsensitiveStub != nil { - return fake.GetPluginCaseInsensitiveStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getPluginCaseInsensitiveReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1400,15 +1416,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 } @@ -1452,15 +1469,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 } @@ -1504,15 +1522,16 @@ func (fake *FakeConfig) IsTTY() bool { ret, specificReturn := fake.isTTYReturnsOnCall[len(fake.isTTYArgsForCall)] fake.isTTYArgsForCall = append(fake.isTTYArgsForCall, struct { }{}) + stub := fake.IsTTYStub + fakeReturns := fake.isTTYReturns fake.recordInvocation("IsTTY", []interface{}{}) fake.isTTYMutex.Unlock() - if fake.IsTTYStub != nil { - return fake.IsTTYStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isTTYReturns return fakeReturns.result1 } @@ -1556,15 +1575,16 @@ func (fake *FakeConfig) 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 } @@ -1608,15 +1628,16 @@ func (fake *FakeConfig) 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 } @@ -1660,15 +1681,16 @@ func (fake *FakeConfig) NOAARequestRetryCount() int { ret, specificReturn := fake.nOAARequestRetryCountReturnsOnCall[len(fake.nOAARequestRetryCountArgsForCall)] fake.nOAARequestRetryCountArgsForCall = append(fake.nOAARequestRetryCountArgsForCall, struct { }{}) + stub := fake.NOAARequestRetryCountStub + fakeReturns := fake.nOAARequestRetryCountReturns fake.recordInvocation("NOAARequestRetryCount", []interface{}{}) fake.nOAARequestRetryCountMutex.Unlock() - if fake.NOAARequestRetryCountStub != nil { - return fake.NOAARequestRetryCountStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.nOAARequestRetryCountReturns return fakeReturns.result1 } @@ -1712,15 +1734,16 @@ func (fake *FakeConfig) OverallPollingTimeout() time.Duration { ret, specificReturn := fake.overallPollingTimeoutReturnsOnCall[len(fake.overallPollingTimeoutArgsForCall)] fake.overallPollingTimeoutArgsForCall = append(fake.overallPollingTimeoutArgsForCall, struct { }{}) + stub := fake.OverallPollingTimeoutStub + fakeReturns := fake.overallPollingTimeoutReturns fake.recordInvocation("OverallPollingTimeout", []interface{}{}) fake.overallPollingTimeoutMutex.Unlock() - if fake.OverallPollingTimeoutStub != nil { - return fake.OverallPollingTimeoutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.overallPollingTimeoutReturns return fakeReturns.result1 } @@ -1764,15 +1787,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 } @@ -1816,15 +1840,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 } @@ -1868,15 +1893,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 } @@ -1920,15 +1946,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 } @@ -1972,15 +1999,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 } @@ -2024,9 +2052,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) } } @@ -2055,15 +2084,16 @@ func (fake *FakeConfig) RequestRetryCount() int { ret, specificReturn := fake.requestRetryCountReturnsOnCall[len(fake.requestRetryCountArgsForCall)] fake.requestRetryCountArgsForCall = append(fake.requestRetryCountArgsForCall, struct { }{}) + stub := fake.RequestRetryCountStub + fakeReturns := fake.requestRetryCountReturns fake.recordInvocation("RequestRetryCount", []interface{}{}) fake.requestRetryCountMutex.Unlock() - if fake.RequestRetryCountStub != nil { - return fake.RequestRetryCountStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.requestRetryCountReturns return fakeReturns.result1 } @@ -2107,15 +2137,16 @@ func (fake *FakeConfig) RoutingEndpoint() string { ret, specificReturn := fake.routingEndpointReturnsOnCall[len(fake.routingEndpointArgsForCall)] fake.routingEndpointArgsForCall = append(fake.routingEndpointArgsForCall, struct { }{}) + stub := fake.RoutingEndpointStub + fakeReturns := fake.routingEndpointReturns fake.recordInvocation("RoutingEndpoint", []interface{}{}) fake.routingEndpointMutex.Unlock() - if fake.RoutingEndpointStub != nil { - return fake.RoutingEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.routingEndpointReturns return fakeReturns.result1 } @@ -2159,15 +2190,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 } @@ -2211,9 +2243,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) } } @@ -2242,9 +2275,10 @@ func (fake *FakeConfig) SetAsyncTimeout(arg1 int) { fake.setAsyncTimeoutArgsForCall = append(fake.setAsyncTimeoutArgsForCall, struct { arg1 int }{arg1}) + stub := fake.SetAsyncTimeoutStub fake.recordInvocation("SetAsyncTimeout", []interface{}{arg1}) fake.setAsyncTimeoutMutex.Unlock() - if fake.SetAsyncTimeoutStub != nil { + if stub != nil { fake.SetAsyncTimeoutStub(arg1) } } @@ -2273,9 +2307,10 @@ func (fake *FakeConfig) 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) } } @@ -2304,9 +2339,10 @@ func (fake *FakeConfig) 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) } } @@ -2335,9 +2371,10 @@ func (fake *FakeConfig) 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) } } @@ -2367,9 +2404,10 @@ func (fake *FakeConfig) SetOrganizationInformation(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetOrganizationInformationStub fake.recordInvocation("SetOrganizationInformation", []interface{}{arg1, arg2}) fake.setOrganizationInformationMutex.Unlock() - if fake.SetOrganizationInformationStub != nil { + if stub != nil { fake.SetOrganizationInformationStub(arg1, arg2) } } @@ -2398,9 +2436,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) } } @@ -2431,9 +2470,10 @@ func (fake *FakeConfig) SetSpaceInformation(arg1 string, arg2 string, arg3 bool) arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.SetSpaceInformationStub fake.recordInvocation("SetSpaceInformation", []interface{}{arg1, arg2, arg3}) fake.setSpaceInformationMutex.Unlock() - if fake.SetSpaceInformationStub != nil { + if stub != nil { fake.SetSpaceInformationStub(arg1, arg2, arg3) } } @@ -2462,9 +2502,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) } } @@ -2495,9 +2536,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) } } @@ -2526,9 +2568,10 @@ func (fake *FakeConfig) 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) } } @@ -2558,9 +2601,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) } } @@ -2589,9 +2633,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) } } @@ -2620,9 +2665,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) } } @@ -2651,15 +2697,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 } @@ -2703,15 +2750,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 } @@ -2755,15 +2803,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 } @@ -2807,15 +2856,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 } @@ -2859,15 +2909,16 @@ func (fake *FakeConfig) TargetedOrganization() configv3.Organization { ret, specificReturn := fake.targetedOrganizationReturnsOnCall[len(fake.targetedOrganizationArgsForCall)] fake.targetedOrganizationArgsForCall = append(fake.targetedOrganizationArgsForCall, struct { }{}) + stub := fake.TargetedOrganizationStub + fakeReturns := fake.targetedOrganizationReturns fake.recordInvocation("TargetedOrganization", []interface{}{}) fake.targetedOrganizationMutex.Unlock() - if fake.TargetedOrganizationStub != nil { - return fake.TargetedOrganizationStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.targetedOrganizationReturns return fakeReturns.result1 } @@ -2911,15 +2962,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 } @@ -2963,15 +3015,16 @@ func (fake *FakeConfig) TargetedSpace() configv3.Space { ret, specificReturn := fake.targetedSpaceReturnsOnCall[len(fake.targetedSpaceArgsForCall)] fake.targetedSpaceArgsForCall = append(fake.targetedSpaceArgsForCall, struct { }{}) + stub := fake.TargetedSpaceStub + fakeReturns := fake.targetedSpaceReturns fake.recordInvocation("TargetedSpace", []interface{}{}) fake.targetedSpaceMutex.Unlock() - if fake.TargetedSpaceStub != nil { - return fake.TargetedSpaceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.targetedSpaceReturns return fakeReturns.result1 } @@ -3015,15 +3068,16 @@ func (fake *FakeConfig) TerminalWidth() int { ret, specificReturn := fake.terminalWidthReturnsOnCall[len(fake.terminalWidthArgsForCall)] fake.terminalWidthArgsForCall = append(fake.terminalWidthArgsForCall, struct { }{}) + stub := fake.TerminalWidthStub + fakeReturns := fake.terminalWidthReturns fake.recordInvocation("TerminalWidth", []interface{}{}) fake.terminalWidthMutex.Unlock() - if fake.TerminalWidthStub != nil { - return fake.TerminalWidthStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.terminalWidthReturns return fakeReturns.result1 } @@ -3067,15 +3121,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 } @@ -3119,15 +3174,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 } @@ -3171,15 +3227,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 } @@ -3223,15 +3280,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 } @@ -3274,9 +3332,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() } } @@ -3297,9 +3356,10 @@ func (fake *FakeConfig) UnsetSpaceInformation() { fake.unsetSpaceInformationMutex.Lock() fake.unsetSpaceInformationArgsForCall = append(fake.unsetSpaceInformationArgsForCall, struct { }{}) + stub := fake.UnsetSpaceInformationStub fake.recordInvocation("UnsetSpaceInformation", []interface{}{}) fake.unsetSpaceInformationMutex.Unlock() - if fake.UnsetSpaceInformationStub != nil { + if stub != nil { fake.UnsetSpaceInformationStub() } } @@ -3320,9 +3380,10 @@ func (fake *FakeConfig) UnsetUserInformation() { fake.unsetUserInformationMutex.Lock() fake.unsetUserInformationArgsForCall = append(fake.unsetUserInformationArgsForCall, struct { }{}) + stub := fake.UnsetUserInformationStub fake.recordInvocation("UnsetUserInformation", []interface{}{}) fake.unsetUserInformationMutex.Unlock() - if fake.UnsetUserInformationStub != nil { + if stub != nil { fake.UnsetUserInformationStub() } } @@ -3345,9 +3406,10 @@ func (fake *FakeConfig) V7SetSpaceInformation(arg1 string, arg2 string) { arg1 string arg2 string }{arg1, arg2}) + stub := fake.V7SetSpaceInformationStub fake.recordInvocation("V7SetSpaceInformation", []interface{}{arg1, arg2}) fake.v7SetSpaceInformationMutex.Unlock() - if fake.V7SetSpaceInformationStub != nil { + if stub != nil { fake.V7SetSpaceInformationStub(arg1, arg2) } } @@ -3376,15 +3438,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 } @@ -3431,15 +3494,16 @@ func (fake *FakeConfig) WriteConfig() error { ret, specificReturn := fake.writeConfigReturnsOnCall[len(fake.writeConfigArgsForCall)] fake.writeConfigArgsForCall = append(fake.writeConfigArgsForCall, struct { }{}) + stub := fake.WriteConfigStub + fakeReturns := fake.writeConfigReturns fake.recordInvocation("WriteConfig", []interface{}{}) fake.writeConfigMutex.Unlock() - if fake.WriteConfigStub != nil { - return fake.WriteConfigStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.writeConfigReturns return fakeReturns.result1 } @@ -3483,15 +3547,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/command/commandfakes/fake_shared_actor.go b/command/commandfakes/fake_shared_actor.go index 68c8cda3e39..d5427a1e251 100644 --- a/command/commandfakes/fake_shared_actor.go +++ b/command/commandfakes/fake_shared_actor.go @@ -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 c399e49ee62..a689d2c34df 100644 --- a/command/commandfakes/fake_ui.go +++ b/command/commandfakes/fake_ui.go @@ -304,9 +304,10 @@ func (fake *FakeUI) DeferText(arg1 string, arg2 ...map[string]interface{}) { arg1 string arg2 []map[string]interface{} }{arg1, arg2}) + stub := fake.DeferTextStub fake.recordInvocation("DeferText", []interface{}{arg1, arg2}) fake.deferTextMutex.Unlock() - if fake.DeferTextStub != nil { + if stub != nil { fake.DeferTextStub(arg1, arg2...) } } @@ -338,15 +339,16 @@ func (fake *FakeUI) DisplayBoolPrompt(arg1 bool, arg2 string, arg3 ...map[string arg2 string arg3 []map[string]interface{} }{arg1, arg2, arg3}) + stub := fake.DisplayBoolPromptStub + fakeReturns := fake.displayBoolPromptReturns fake.recordInvocation("DisplayBoolPrompt", []interface{}{arg1, arg2, arg3}) fake.displayBoolPromptMutex.Unlock() - if fake.DisplayBoolPromptStub != nil { - return fake.DisplayBoolPromptStub(arg1, arg2, arg3...) + if stub != nil { + return stub(arg1, arg2, arg3...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.displayBoolPromptReturns return fakeReturns.result1, fakeReturns.result2 } @@ -406,15 +408,16 @@ func (fake *FakeUI) DisplayChangesForPush(arg1 []ui.Change) error { fake.displayChangesForPushArgsForCall = append(fake.displayChangesForPushArgsForCall, struct { arg1 []ui.Change }{arg1Copy}) + stub := fake.DisplayChangesForPushStub + fakeReturns := fake.displayChangesForPushReturns fake.recordInvocation("DisplayChangesForPush", []interface{}{arg1Copy}) fake.displayChangesForPushMutex.Unlock() - if fake.DisplayChangesForPushStub != nil { - return fake.DisplayChangesForPushStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.displayChangesForPushReturns return fakeReturns.result1 } @@ -464,9 +467,10 @@ func (fake *FakeUI) DisplayDeprecationWarning() { fake.displayDeprecationWarningMutex.Lock() fake.displayDeprecationWarningArgsForCall = append(fake.displayDeprecationWarningArgsForCall, struct { }{}) + stub := fake.DisplayDeprecationWarningStub fake.recordInvocation("DisplayDeprecationWarning", []interface{}{}) fake.displayDeprecationWarningMutex.Unlock() - if fake.DisplayDeprecationWarningStub != nil { + if stub != nil { fake.DisplayDeprecationWarningStub() } } @@ -488,9 +492,10 @@ func (fake *FakeUI) DisplayError(arg1 error) { fake.displayErrorArgsForCall = append(fake.displayErrorArgsForCall, struct { arg1 error }{arg1}) + stub := fake.DisplayErrorStub fake.recordInvocation("DisplayError", []interface{}{arg1}) fake.displayErrorMutex.Unlock() - if fake.DisplayErrorStub != nil { + if stub != nil { fake.DisplayErrorStub(arg1) } } @@ -518,9 +523,10 @@ func (fake *FakeUI) DisplayFileDeprecationWarning() { fake.displayFileDeprecationWarningMutex.Lock() fake.displayFileDeprecationWarningArgsForCall = append(fake.displayFileDeprecationWarningArgsForCall, struct { }{}) + stub := fake.DisplayFileDeprecationWarningStub fake.recordInvocation("DisplayFileDeprecationWarning", []interface{}{}) fake.displayFileDeprecationWarningMutex.Unlock() - if fake.DisplayFileDeprecationWarningStub != nil { + if stub != nil { fake.DisplayFileDeprecationWarningStub() } } @@ -542,9 +548,10 @@ func (fake *FakeUI) DisplayHeader(arg1 string) { fake.displayHeaderArgsForCall = append(fake.displayHeaderArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisplayHeaderStub fake.recordInvocation("DisplayHeader", []interface{}{arg1}) fake.displayHeaderMutex.Unlock() - if fake.DisplayHeaderStub != nil { + if stub != nil { fake.DisplayHeaderStub(arg1) } } @@ -578,9 +585,10 @@ func (fake *FakeUI) DisplayInstancesTableForApp(arg1 [][]string) { fake.displayInstancesTableForAppArgsForCall = append(fake.displayInstancesTableForAppArgsForCall, struct { arg1 [][]string }{arg1Copy}) + stub := fake.DisplayInstancesTableForAppStub fake.recordInvocation("DisplayInstancesTableForApp", []interface{}{arg1Copy}) fake.displayInstancesTableForAppMutex.Unlock() - if fake.DisplayInstancesTableForAppStub != nil { + if stub != nil { fake.DisplayInstancesTableForAppStub(arg1) } } @@ -611,15 +619,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 } @@ -677,9 +686,10 @@ func (fake *FakeUI) DisplayKeyValueTable(arg1 string, arg2 [][]string, arg3 int) arg2 [][]string arg3 int }{arg1, arg2Copy, arg3}) + stub := fake.DisplayKeyValueTableStub fake.recordInvocation("DisplayKeyValueTable", []interface{}{arg1, arg2Copy, arg3}) fake.displayKeyValueTableMutex.Unlock() - if fake.DisplayKeyValueTableStub != nil { + if stub != nil { fake.DisplayKeyValueTableStub(arg1, arg2, arg3) } } @@ -713,9 +723,10 @@ func (fake *FakeUI) DisplayKeyValueTableForApp(arg1 [][]string) { fake.displayKeyValueTableForAppArgsForCall = append(fake.displayKeyValueTableForAppArgsForCall, struct { arg1 [][]string }{arg1Copy}) + stub := fake.DisplayKeyValueTableForAppStub fake.recordInvocation("DisplayKeyValueTableForApp", []interface{}{arg1Copy}) fake.displayKeyValueTableForAppMutex.Unlock() - if fake.DisplayKeyValueTableForAppStub != nil { + if stub != nil { fake.DisplayKeyValueTableForAppStub(arg1) } } @@ -745,9 +756,10 @@ func (fake *FakeUI) DisplayLogMessage(arg1 ui.LogMessage, arg2 bool) { arg1 ui.LogMessage arg2 bool }{arg1, arg2}) + stub := fake.DisplayLogMessageStub fake.recordInvocation("DisplayLogMessage", []interface{}{arg1, arg2}) fake.displayLogMessageMutex.Unlock() - if fake.DisplayLogMessageStub != nil { + if stub != nil { fake.DisplayLogMessageStub(arg1, arg2) } } @@ -775,9 +787,10 @@ func (fake *FakeUI) DisplayNewline() { fake.displayNewlineMutex.Lock() fake.displayNewlineArgsForCall = append(fake.displayNewlineArgsForCall, struct { }{}) + stub := fake.DisplayNewlineStub fake.recordInvocation("DisplayNewline", []interface{}{}) fake.displayNewlineMutex.Unlock() - if fake.DisplayNewlineStub != nil { + if stub != nil { fake.DisplayNewlineStub() } } @@ -806,9 +819,10 @@ func (fake *FakeUI) DisplayNonWrappingTable(arg1 string, arg2 [][]string, arg3 i arg2 [][]string arg3 int }{arg1, arg2Copy, arg3}) + stub := fake.DisplayNonWrappingTableStub fake.recordInvocation("DisplayNonWrappingTable", []interface{}{arg1, arg2Copy, arg3}) fake.displayNonWrappingTableMutex.Unlock() - if fake.DisplayNonWrappingTableStub != nil { + if stub != nil { fake.DisplayNonWrappingTableStub(arg1, arg2, arg3) } } @@ -836,9 +850,10 @@ func (fake *FakeUI) DisplayOK() { fake.displayOKMutex.Lock() fake.displayOKArgsForCall = append(fake.displayOKArgsForCall, struct { }{}) + stub := fake.DisplayOKStub fake.recordInvocation("DisplayOK", []interface{}{}) fake.displayOKMutex.Unlock() - if fake.DisplayOKStub != nil { + if stub != nil { fake.DisplayOKStub() } } @@ -863,15 +878,16 @@ func (fake *FakeUI) DisplayOptionalTextPrompt(arg1 string, arg2 string, arg3 ... arg2 string arg3 []map[string]interface{} }{arg1, arg2, arg3}) + stub := fake.DisplayOptionalTextPromptStub + fakeReturns := fake.displayOptionalTextPromptReturns fake.recordInvocation("DisplayOptionalTextPrompt", []interface{}{arg1, arg2, arg3}) fake.displayOptionalTextPromptMutex.Unlock() - if fake.DisplayOptionalTextPromptStub != nil { - return fake.DisplayOptionalTextPromptStub(arg1, arg2, arg3...) + if stub != nil { + return stub(arg1, arg2, arg3...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.displayOptionalTextPromptReturns return fakeReturns.result1, fakeReturns.result2 } @@ -927,15 +943,16 @@ func (fake *FakeUI) DisplayPasswordPrompt(arg1 string, arg2 ...map[string]interf arg1 string arg2 []map[string]interface{} }{arg1, arg2}) + stub := fake.DisplayPasswordPromptStub + fakeReturns := fake.displayPasswordPromptReturns fake.recordInvocation("DisplayPasswordPrompt", []interface{}{arg1, arg2}) fake.displayPasswordPromptMutex.Unlock() - if fake.DisplayPasswordPromptStub != nil { - return fake.DisplayPasswordPromptStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.displayPasswordPromptReturns return fakeReturns.result1, fakeReturns.result2 } @@ -996,9 +1013,10 @@ func (fake *FakeUI) DisplayTableWithHeader(arg1 string, arg2 [][]string, arg3 in arg2 [][]string arg3 int }{arg1, arg2Copy, arg3}) + stub := fake.DisplayTableWithHeaderStub fake.recordInvocation("DisplayTableWithHeader", []interface{}{arg1, arg2Copy, arg3}) fake.displayTableWithHeaderMutex.Unlock() - if fake.DisplayTableWithHeaderStub != nil { + if stub != nil { fake.DisplayTableWithHeaderStub(arg1, arg2, arg3) } } @@ -1028,9 +1046,10 @@ func (fake *FakeUI) DisplayText(arg1 string, arg2 ...map[string]interface{}) { arg1 string arg2 []map[string]interface{} }{arg1, arg2}) + stub := fake.DisplayTextStub fake.recordInvocation("DisplayText", []interface{}{arg1, arg2}) fake.displayTextMutex.Unlock() - if fake.DisplayTextStub != nil { + if stub != nil { fake.DisplayTextStub(arg1, arg2...) } } @@ -1099,15 +1118,16 @@ func (fake *FakeUI) DisplayTextMenu(arg1 []string, arg2 string, arg3 ...map[stri arg2 string arg3 []map[string]interface{} }{arg1Copy, arg2, arg3}) + stub := fake.DisplayTextMenuStub + fakeReturns := fake.displayTextMenuReturns fake.recordInvocation("DisplayTextMenu", []interface{}{arg1Copy, arg2, arg3}) fake.displayTextMenuMutex.Unlock() - if fake.DisplayTextMenuStub != nil { - return fake.DisplayTextMenuStub(arg1, arg2, arg3...) + if stub != nil { + return stub(arg1, arg2, arg3...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.displayTextMenuReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1163,15 +1183,16 @@ func (fake *FakeUI) DisplayTextPrompt(arg1 string, arg2 ...map[string]interface{ arg1 string arg2 []map[string]interface{} }{arg1, arg2}) + stub := fake.DisplayTextPromptStub + fakeReturns := fake.displayTextPromptReturns fake.recordInvocation("DisplayTextPrompt", []interface{}{arg1, arg2}) fake.displayTextPromptMutex.Unlock() - if fake.DisplayTextPromptStub != nil { - return fake.DisplayTextPromptStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.displayTextPromptReturns return fakeReturns.result1, fakeReturns.result2 } @@ -1226,9 +1247,10 @@ func (fake *FakeUI) DisplayTextWithBold(arg1 string, arg2 ...map[string]interfac arg1 string arg2 []map[string]interface{} }{arg1, arg2}) + stub := fake.DisplayTextWithBoldStub fake.recordInvocation("DisplayTextWithBold", []interface{}{arg1, arg2}) fake.displayTextWithBoldMutex.Unlock() - if fake.DisplayTextWithBoldStub != nil { + if stub != nil { fake.DisplayTextWithBoldStub(arg1, arg2...) } } @@ -1258,9 +1280,10 @@ func (fake *FakeUI) DisplayTextWithFlavor(arg1 string, arg2 ...map[string]interf arg1 string arg2 []map[string]interface{} }{arg1, arg2}) + stub := fake.DisplayTextWithFlavorStub fake.recordInvocation("DisplayTextWithFlavor", []interface{}{arg1, arg2}) fake.displayTextWithFlavorMutex.Unlock() - if fake.DisplayTextWithFlavorStub != nil { + if stub != nil { fake.DisplayTextWithFlavorStub(arg1, arg2...) } } @@ -1290,9 +1313,10 @@ func (fake *FakeUI) DisplayWarning(arg1 string, arg2 ...map[string]interface{}) arg1 string arg2 []map[string]interface{} }{arg1, arg2}) + stub := fake.DisplayWarningStub fake.recordInvocation("DisplayWarning", []interface{}{arg1, arg2}) fake.displayWarningMutex.Unlock() - if fake.DisplayWarningStub != nil { + if stub != nil { fake.DisplayWarningStub(arg1, arg2...) } } @@ -1326,9 +1350,10 @@ func (fake *FakeUI) DisplayWarnings(arg1 []string) { fake.displayWarningsArgsForCall = append(fake.displayWarningsArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.DisplayWarningsStub fake.recordInvocation("DisplayWarnings", []interface{}{arg1Copy}) fake.displayWarningsMutex.Unlock() - if fake.DisplayWarningsStub != nil { + if stub != nil { fake.DisplayWarningsStub(arg1) } } @@ -1357,15 +1382,16 @@ func (fake *FakeUI) GetErr() io.Writer { ret, specificReturn := fake.getErrReturnsOnCall[len(fake.getErrArgsForCall)] fake.getErrArgsForCall = append(fake.getErrArgsForCall, struct { }{}) + stub := fake.GetErrStub + fakeReturns := fake.getErrReturns fake.recordInvocation("GetErr", []interface{}{}) fake.getErrMutex.Unlock() - if fake.GetErrStub != nil { - return fake.GetErrStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getErrReturns return fakeReturns.result1 } @@ -1409,15 +1435,16 @@ func (fake *FakeUI) GetIn() io.Reader { ret, specificReturn := fake.getInReturnsOnCall[len(fake.getInArgsForCall)] fake.getInArgsForCall = append(fake.getInArgsForCall, struct { }{}) + stub := fake.GetInStub + fakeReturns := fake.getInReturns fake.recordInvocation("GetIn", []interface{}{}) fake.getInMutex.Unlock() - if fake.GetInStub != nil { - return fake.GetInStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getInReturns return fakeReturns.result1 } @@ -1461,15 +1488,16 @@ func (fake *FakeUI) GetOut() io.Writer { ret, specificReturn := fake.getOutReturnsOnCall[len(fake.getOutArgsForCall)] fake.getOutArgsForCall = append(fake.getOutArgsForCall, struct { }{}) + stub := fake.GetOutStub + fakeReturns := fake.getOutReturns fake.recordInvocation("GetOut", []interface{}{}) fake.getOutMutex.Unlock() - if fake.GetOutStub != nil { - return fake.GetOutStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.getOutReturns return fakeReturns.result1 } @@ -1519,15 +1547,16 @@ func (fake *FakeUI) RequestLoggerFileWriter(arg1 []string) *ui.RequestLoggerFile fake.requestLoggerFileWriterArgsForCall = append(fake.requestLoggerFileWriterArgsForCall, struct { arg1 []string }{arg1Copy}) + stub := fake.RequestLoggerFileWriterStub + fakeReturns := fake.requestLoggerFileWriterReturns fake.recordInvocation("RequestLoggerFileWriter", []interface{}{arg1Copy}) fake.requestLoggerFileWriterMutex.Unlock() - if fake.RequestLoggerFileWriterStub != nil { - return fake.RequestLoggerFileWriterStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.requestLoggerFileWriterReturns return fakeReturns.result1 } @@ -1578,15 +1607,16 @@ func (fake *FakeUI) RequestLoggerTerminalDisplay() *ui.RequestLoggerTerminalDisp ret, specificReturn := fake.requestLoggerTerminalDisplayReturnsOnCall[len(fake.requestLoggerTerminalDisplayArgsForCall)] fake.requestLoggerTerminalDisplayArgsForCall = append(fake.requestLoggerTerminalDisplayArgsForCall, struct { }{}) + stub := fake.RequestLoggerTerminalDisplayStub + fakeReturns := fake.requestLoggerTerminalDisplayReturns fake.recordInvocation("RequestLoggerTerminalDisplay", []interface{}{}) fake.requestLoggerTerminalDisplayMutex.Unlock() - if fake.RequestLoggerTerminalDisplayStub != nil { - return fake.RequestLoggerTerminalDisplayStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.requestLoggerTerminalDisplayReturns return fakeReturns.result1 } @@ -1632,15 +1662,16 @@ func (fake *FakeUI) TranslateText(arg1 string, arg2 ...map[string]interface{}) s arg1 string arg2 []map[string]interface{} }{arg1, arg2}) + stub := fake.TranslateTextStub + fakeReturns := fake.translateTextReturns fake.recordInvocation("TranslateText", []interface{}{arg1, arg2}) fake.translateTextMutex.Unlock() - if fake.TranslateTextStub != nil { - return fake.TranslateTextStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1 } - fakeReturns := fake.translateTextReturns return fakeReturns.result1 } @@ -1692,15 +1723,16 @@ func (fake *FakeUI) UserFriendlyDate(arg1 time.Time) string { fake.userFriendlyDateArgsForCall = append(fake.userFriendlyDateArgsForCall, struct { arg1 time.Time }{arg1}) + stub := fake.UserFriendlyDateStub + fakeReturns := fake.userFriendlyDateReturns fake.recordInvocation("UserFriendlyDate", []interface{}{arg1}) fake.userFriendlyDateMutex.Unlock() - if fake.UserFriendlyDateStub != nil { - return fake.UserFriendlyDateStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.userFriendlyDateReturns return fakeReturns.result1 } @@ -1751,15 +1783,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/command/common/commonfakes/fake_help_actor.go b/command/common/commonfakes/fake_help_actor.go index f6dc80efd30..e0592965679 100644 --- a/command/common/commonfakes/fake_help_actor.go +++ b/command/common/commonfakes/fake_help_actor.go @@ -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 b4254b68c6f..b5bc7d2894a 100644 --- a/command/common/commonfakes/fake_install_plugin_actor.go +++ b/command/common/commonfakes/fake_install_plugin_actor.go @@ -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/plugin/pluginfakes/fake_add_plugin_repo_actor.go b/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go index c6219881b22..f6e23cce02f 100644 --- a/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go +++ b/command/plugin/pluginfakes/fake_add_plugin_repo_actor.go @@ -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 637b773ab48..dac786304ec 100644 --- a/command/plugin/pluginfakes/fake_plugins_actor.go +++ b/command/plugin/pluginfakes/fake_plugins_actor.go @@ -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 7f021930057..05ba5cb2bf2 100644 --- a/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go +++ b/command/plugin/pluginfakes/fake_uninstall_plugin_actor.go @@ -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/translatableerror/translatableerrorfakes/fake_translatable_error.go b/command/translatableerror/translatableerrorfakes/fake_translatable_error.go index 141e4b3ca61..7cc4e6df489 100644 --- a/command/translatableerror/translatableerrorfakes/fake_translatable_error.go +++ b/command/translatableerror/translatableerrorfakes/fake_translatable_error.go @@ -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/v6/shared/new_networking_client.go b/command/v6/shared/new_networking_client.go index 069ab9349f3..c6a0b4a928a 100644 --- a/command/v6/shared/new_networking_client.go +++ b/command/v6/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/v7/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/wrapper" "code.cloudfoundry.org/cli/v7/api/uaa" "code.cloudfoundry.org/cli/v7/command" "code.cloudfoundry.org/cli/v7/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/v6/shared/sharedfakes/fake_application_summary_actor.go b/command/v6/shared/sharedfakes/fake_application_summary_actor.go index f16a4f42ec9..0d35a82ea94 100644 --- a/command/v6/shared/sharedfakes/fake_application_summary_actor.go +++ b/command/v6/shared/sharedfakes/fake_application_summary_actor.go @@ -45,15 +45,16 @@ func (fake *FakeApplicationSummaryActor) CloudControllerV3APIVersion() string { ret, specificReturn := fake.cloudControllerV3APIVersionReturnsOnCall[len(fake.cloudControllerV3APIVersionArgsForCall)] fake.cloudControllerV3APIVersionArgsForCall = append(fake.cloudControllerV3APIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerV3APIVersionStub + fakeReturns := fake.cloudControllerV3APIVersionReturns fake.recordInvocation("CloudControllerV3APIVersion", []interface{}{}) fake.cloudControllerV3APIVersionMutex.Unlock() - if fake.CloudControllerV3APIVersionStub != nil { - return fake.CloudControllerV3APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerV3APIVersionReturns return fakeReturns.result1 } @@ -100,15 +101,16 @@ func (fake *FakeApplicationSummaryActor) GetApplicationSummaryByNameAndSpace(arg arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.GetApplicationSummaryByNameAndSpaceStub + fakeReturns := fake.getApplicationSummaryByNameAndSpaceReturns fake.recordInvocation("GetApplicationSummaryByNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.getApplicationSummaryByNameAndSpaceMutex.Unlock() - if fake.GetApplicationSummaryByNameAndSpaceStub != nil { - return fake.GetApplicationSummaryByNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationSummaryByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v6/shared/sharedfakes/fake_v2app_actor.go b/command/v6/shared/sharedfakes/fake_v2app_actor.go index 757762dc375..4641350da01 100644 --- a/command/v6/shared/sharedfakes/fake_v2app_actor.go +++ b/command/v6/shared/sharedfakes/fake_v2app_actor.go @@ -49,15 +49,16 @@ func (fake *FakeV2AppActor) GetApplicationInstancesWithStatsByApplication(arg1 s fake.getApplicationInstancesWithStatsByApplicationArgsForCall = append(fake.getApplicationInstancesWithStatsByApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationInstancesWithStatsByApplicationStub + fakeReturns := fake.getApplicationInstancesWithStatsByApplicationReturns fake.recordInvocation("GetApplicationInstancesWithStatsByApplication", []interface{}{arg1}) fake.getApplicationInstancesWithStatsByApplicationMutex.Unlock() - if fake.GetApplicationInstancesWithStatsByApplicationStub != nil { - return fake.GetApplicationInstancesWithStatsByApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationInstancesWithStatsByApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -115,15 +116,16 @@ func (fake *FakeV2AppActor) GetApplicationRoutes(arg1 string) (v2action.Routes, fake.getApplicationRoutesArgsForCall = append(fake.getApplicationRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRoutesStub + fakeReturns := fake.getApplicationRoutesReturns fake.recordInvocation("GetApplicationRoutes", []interface{}{arg1}) fake.getApplicationRoutesMutex.Unlock() - if fake.GetApplicationRoutesStub != nil { - return fake.GetApplicationRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v6/shared/sharedfakes/fake_v3app_summary_actor.go b/command/v6/shared/sharedfakes/fake_v3app_summary_actor.go index 896290ba036..57cefc1895e 100644 --- a/command/v6/shared/sharedfakes/fake_v3app_summary_actor.go +++ b/command/v6/shared/sharedfakes/fake_v3app_summary_actor.go @@ -38,15 +38,16 @@ func (fake *FakeV3AppSummaryActor) GetApplicationSummaryByNameAndSpace(arg1 stri arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.GetApplicationSummaryByNameAndSpaceStub + fakeReturns := fake.getApplicationSummaryByNameAndSpaceReturns fake.recordInvocation("GetApplicationSummaryByNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.getApplicationSummaryByNameAndSpaceMutex.Unlock() - if fake.GetApplicationSummaryByNameAndSpaceStub != nil { - return fake.GetApplicationSummaryByNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationSummaryByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v6/v6fakes/fake_bind_service_actor.go b/command/v6/v6fakes/fake_bind_service_actor.go index 3fa7971af78..6ba80e1c0ce 100644 --- a/command/v6/v6fakes/fake_bind_service_actor.go +++ b/command/v6/v6fakes/fake_bind_service_actor.go @@ -52,15 +52,16 @@ func (fake *FakeBindServiceActor) BindServiceBySpace(arg1 string, arg2 string, a arg4 string arg5 map[string]interface{} }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.BindServiceBySpaceStub + fakeReturns := fake.bindServiceBySpaceReturns fake.recordInvocation("BindServiceBySpace", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.bindServiceBySpaceMutex.Unlock() - if fake.BindServiceBySpaceStub != nil { - return fake.BindServiceBySpaceStub(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.bindServiceBySpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -117,15 +118,16 @@ func (fake *FakeBindServiceActor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } diff --git a/command/v6/v6fakes/fake_create_service_actor.go b/command/v6/v6fakes/fake_create_service_actor.go index 6a11fc44cfd..1336315b49c 100644 --- a/command/v6/v6fakes/fake_create_service_actor.go +++ b/command/v6/v6fakes/fake_create_service_actor.go @@ -51,15 +51,16 @@ func (fake *FakeCreateServiceActor) CreateServiceInstance(arg1 string, arg2 stri arg6 map[string]interface{} arg7 []string }{arg1, arg2, arg3, arg4, arg5, arg6, arg7Copy}) + stub := fake.CreateServiceInstanceStub + fakeReturns := fake.createServiceInstanceReturns fake.recordInvocation("CreateServiceInstance", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7Copy}) fake.createServiceInstanceMutex.Unlock() - if fake.CreateServiceInstanceStub != nil { - return fake.CreateServiceInstanceStub(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.createServiceInstanceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v6/v6fakes/fake_create_service_key_actor.go b/command/v6/v6fakes/fake_create_service_key_actor.go index 8ae04f5ea0c..d151130761a 100644 --- a/command/v6/v6fakes/fake_create_service_key_actor.go +++ b/command/v6/v6fakes/fake_create_service_key_actor.go @@ -40,15 +40,16 @@ func (fake *FakeCreateServiceKeyActor) CreateServiceKey(arg1 string, arg2 string arg3 string arg4 map[string]interface{} }{arg1, arg2, arg3, arg4}) + stub := fake.CreateServiceKeyStub + fakeReturns := fake.createServiceKeyReturns fake.recordInvocation("CreateServiceKey", []interface{}{arg1, arg2, arg3, arg4}) fake.createServiceKeyMutex.Unlock() - if fake.CreateServiceKeyStub != nil { - return fake.CreateServiceKeyStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createServiceKeyReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v6/v6fakes/fake_service_actor.go b/command/v6/v6fakes/fake_service_actor.go index 768d9c0b400..96214a308cf 100644 --- a/command/v6/v6fakes/fake_service_actor.go +++ b/command/v6/v6fakes/fake_service_actor.go @@ -60,15 +60,16 @@ func (fake *FakeServiceActor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -114,15 +115,16 @@ func (fake *FakeServiceActor) GetServiceInstanceByNameAndSpace(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceInstanceByNameAndSpaceStub + fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns fake.recordInvocation("GetServiceInstanceByNameAndSpace", []interface{}{arg1, arg2}) fake.getServiceInstanceByNameAndSpaceMutex.Unlock() - if fake.GetServiceInstanceByNameAndSpaceStub != nil { - return fake.GetServiceInstanceByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -181,15 +183,16 @@ func (fake *FakeServiceActor) GetServiceInstanceSummaryByNameAndSpace(arg1 strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceInstanceSummaryByNameAndSpaceStub + fakeReturns := fake.getServiceInstanceSummaryByNameAndSpaceReturns fake.recordInvocation("GetServiceInstanceSummaryByNameAndSpace", []interface{}{arg1, arg2}) fake.getServiceInstanceSummaryByNameAndSpaceMutex.Unlock() - if fake.GetServiceInstanceSummaryByNameAndSpaceStub != nil { - return fake.GetServiceInstanceSummaryByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceSummaryByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v6/v6fakes/fake_service_instances_actor.go b/command/v6/v6fakes/fake_service_instances_actor.go index 21cecf60949..741808a097a 100644 --- a/command/v6/v6fakes/fake_service_instances_actor.go +++ b/command/v6/v6fakes/fake_service_instances_actor.go @@ -43,15 +43,16 @@ func (fake *FakeServiceInstancesActor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -96,15 +97,16 @@ func (fake *FakeServiceInstancesActor) GetServiceInstancesSummaryBySpace(arg1 st fake.getServiceInstancesSummaryBySpaceArgsForCall = append(fake.getServiceInstancesSummaryBySpaceArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceInstancesSummaryBySpaceStub + fakeReturns := fake.getServiceInstancesSummaryBySpaceReturns fake.recordInvocation("GetServiceInstancesSummaryBySpace", []interface{}{arg1}) fake.getServiceInstancesSummaryBySpaceMutex.Unlock() - if fake.GetServiceInstancesSummaryBySpaceStub != nil { - return fake.GetServiceInstancesSummaryBySpaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstancesSummaryBySpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v6/v6fakes/fake_share_service_actor.go b/command/v6/v6fakes/fake_share_service_actor.go index 8a706d553bb..32fb900b6b8 100644 --- a/command/v6/v6fakes/fake_share_service_actor.go +++ b/command/v6/v6fakes/fake_share_service_actor.go @@ -60,15 +60,16 @@ func (fake *FakeShareServiceActor) CloudControllerV3APIVersion() string { ret, specificReturn := fake.cloudControllerV3APIVersionReturnsOnCall[len(fake.cloudControllerV3APIVersionArgsForCall)] fake.cloudControllerV3APIVersionArgsForCall = append(fake.cloudControllerV3APIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerV3APIVersionStub + fakeReturns := fake.cloudControllerV3APIVersionReturns fake.recordInvocation("CloudControllerV3APIVersion", []interface{}{}) fake.cloudControllerV3APIVersionMutex.Unlock() - if fake.CloudControllerV3APIVersionStub != nil { - return fake.CloudControllerV3APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerV3APIVersionReturns return fakeReturns.result1 } @@ -116,15 +117,16 @@ func (fake *FakeShareServiceActor) ShareServiceInstanceToSpaceNameByNameAndSpace arg3 string arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationStub + fakeReturns := fake.shareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationReturns fake.recordInvocation("ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganization", []interface{}{arg1, arg2, arg3, arg4}) fake.shareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationMutex.Unlock() - if fake.ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationStub != nil { - return fake.ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.shareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -182,15 +184,16 @@ func (fake *FakeShareServiceActor) ShareServiceInstanceToSpaceNameByNameAndSpace arg3 string arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationNameStub + fakeReturns := fake.shareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationNameReturns fake.recordInvocation("ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationName", []interface{}{arg1, arg2, arg3, arg4}) fake.shareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationNameMutex.Unlock() - if fake.ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationNameStub != nil { - return fake.ShareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationNameStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.shareServiceInstanceToSpaceNameByNameAndSpaceAndOrganizationNameReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v6/v6fakes/fake_unbind_service_actor.go b/command/v6/v6fakes/fake_unbind_service_actor.go index 60705e081ff..a6b5898ec2d 100644 --- a/command/v6/v6fakes/fake_unbind_service_actor.go +++ b/command/v6/v6fakes/fake_unbind_service_actor.go @@ -38,15 +38,16 @@ func (fake *FakeUnbindServiceActor) UnbindServiceBySpace(arg1 string, arg2 strin arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.UnbindServiceBySpaceStub + fakeReturns := fake.unbindServiceBySpaceReturns fake.recordInvocation("UnbindServiceBySpace", []interface{}{arg1, arg2, arg3}) fake.unbindServiceBySpaceMutex.Unlock() - if fake.UnbindServiceBySpaceStub != nil { - return fake.UnbindServiceBySpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.unbindServiceBySpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } diff --git a/command/v6/v6fakes/fake_unshare_service_actor.go b/command/v6/v6fakes/fake_unshare_service_actor.go index db5d9dbbd52..a903deb4e42 100644 --- a/command/v6/v6fakes/fake_unshare_service_actor.go +++ b/command/v6/v6fakes/fake_unshare_service_actor.go @@ -44,15 +44,16 @@ func (fake *FakeUnshareServiceActor) CloudControllerV3APIVersion() string { ret, specificReturn := fake.cloudControllerV3APIVersionReturnsOnCall[len(fake.cloudControllerV3APIVersionArgsForCall)] fake.cloudControllerV3APIVersionArgsForCall = append(fake.cloudControllerV3APIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerV3APIVersionStub + fakeReturns := fake.cloudControllerV3APIVersionReturns fake.recordInvocation("CloudControllerV3APIVersion", []interface{}{}) fake.cloudControllerV3APIVersionMutex.Unlock() - if fake.CloudControllerV3APIVersionStub != nil { - return fake.CloudControllerV3APIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerV3APIVersionReturns return fakeReturns.result1 } @@ -100,15 +101,16 @@ func (fake *FakeUnshareServiceActor) UnshareServiceInstanceFromOrganizationNameA arg3 string arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.UnshareServiceInstanceFromOrganizationNameAndSpaceNameByNameAndSpaceStub + fakeReturns := fake.unshareServiceInstanceFromOrganizationNameAndSpaceNameByNameAndSpaceReturns fake.recordInvocation("UnshareServiceInstanceFromOrganizationNameAndSpaceNameByNameAndSpace", []interface{}{arg1, arg2, arg3, arg4}) fake.unshareServiceInstanceFromOrganizationNameAndSpaceNameByNameAndSpaceMutex.Unlock() - if fake.UnshareServiceInstanceFromOrganizationNameAndSpaceNameByNameAndSpaceStub != nil { - return fake.UnshareServiceInstanceFromOrganizationNameAndSpaceNameByNameAndSpaceStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unshareServiceInstanceFromOrganizationNameAndSpaceNameByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v6/v6fakes/fake_update_service_actor.go b/command/v6/v6fakes/fake_update_service_actor.go index 61ee2f3a362..6515c6744ce 100644 --- a/command/v6/v6fakes/fake_update_service_actor.go +++ b/command/v6/v6fakes/fake_update_service_actor.go @@ -57,15 +57,16 @@ func (fake *FakeUpdateServiceActor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -111,15 +112,16 @@ func (fake *FakeUpdateServiceActor) GetServiceInstanceByNameAndSpace(arg1 string arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceInstanceByNameAndSpaceStub + fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns fake.recordInvocation("GetServiceInstanceByNameAndSpace", []interface{}{arg1, arg2}) fake.getServiceInstanceByNameAndSpaceMutex.Unlock() - if fake.GetServiceInstanceByNameAndSpaceStub != nil { - return fake.GetServiceInstanceByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -177,15 +179,16 @@ func (fake *FakeUpdateServiceActor) UpgradeServiceInstance(arg1 v2action.Service fake.upgradeServiceInstanceArgsForCall = append(fake.upgradeServiceInstanceArgsForCall, struct { arg1 v2action.ServiceInstance }{arg1}) + stub := fake.UpgradeServiceInstanceStub + fakeReturns := fake.upgradeServiceInstanceReturns fake.recordInvocation("UpgradeServiceInstance", []interface{}{arg1}) fake.upgradeServiceInstanceMutex.Unlock() - if fake.UpgradeServiceInstanceStub != nil { - return fake.UpgradeServiceInstanceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.upgradeServiceInstanceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v6/v6fakes/fake_update_user_provided_service_actor.go b/command/v6/v6fakes/fake_update_user_provided_service_actor.go index eb80b13082e..cf88340580a 100644 --- a/command/v6/v6fakes/fake_update_user_provided_service_actor.go +++ b/command/v6/v6fakes/fake_update_user_provided_service_actor.go @@ -50,15 +50,16 @@ func (fake *FakeUpdateUserProvidedServiceActor) GetServiceInstanceByNameAndSpace arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceInstanceByNameAndSpaceStub + fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns fake.recordInvocation("GetServiceInstanceByNameAndSpace", []interface{}{arg1, arg2}) fake.getServiceInstanceByNameAndSpaceMutex.Unlock() - if fake.GetServiceInstanceByNameAndSpaceStub != nil { - return fake.GetServiceInstanceByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceInstanceByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -117,15 +118,16 @@ func (fake *FakeUpdateUserProvidedServiceActor) UpdateUserProvidedServiceInstanc arg1 string arg2 v2action.UserProvidedServiceInstance }{arg1, arg2}) + stub := fake.UpdateUserProvidedServiceInstanceStub + fakeReturns := fake.updateUserProvidedServiceInstanceReturns fake.recordInvocation("UpdateUserProvidedServiceInstance", []interface{}{arg1, arg2}) fake.updateUserProvidedServiceInstanceMutex.Unlock() - if fake.UpdateUserProvidedServiceInstanceStub != nil { - return fake.UpdateUserProvidedServiceInstanceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateUserProvidedServiceInstanceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v6/v6fakes/fake_v3cancel_zdt_push_actor.go b/command/v6/v6fakes/fake_v3cancel_zdt_push_actor.go index 9fb6ff8e8b7..2e7c569d35f 100644 --- a/command/v6/v6fakes/fake_v3cancel_zdt_push_actor.go +++ b/command/v6/v6fakes/fake_v3cancel_zdt_push_actor.go @@ -34,15 +34,16 @@ func (fake *FakeV3CancelZdtPushActor) CancelDeploymentByAppNameAndSpace(arg1 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.CancelDeploymentByAppNameAndSpaceStub + fakeReturns := fake.cancelDeploymentByAppNameAndSpaceReturns fake.recordInvocation("CancelDeploymentByAppNameAndSpace", []interface{}{arg1, arg2}) fake.cancelDeploymentByAppNameAndSpaceMutex.Unlock() - if fake.CancelDeploymentByAppNameAndSpaceStub != nil { - return fake.CancelDeploymentByAppNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.cancelDeploymentByAppNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v6/v6fakes/fake_v3zero_downtime_restart_actor.go b/command/v6/v6fakes/fake_v3zero_downtime_restart_actor.go index e3189f86911..de3b8121610 100644 --- a/command/v6/v6fakes/fake_v3zero_downtime_restart_actor.go +++ b/command/v6/v6fakes/fake_v3zero_downtime_restart_actor.go @@ -85,15 +85,16 @@ func (fake *FakeV3ZeroDowntimeRestartActor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -139,15 +140,16 @@ func (fake *FakeV3ZeroDowntimeRestartActor) CreateDeployment(arg1 string, arg2 s arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateDeploymentStub + fakeReturns := fake.createDeploymentReturns fake.recordInvocation("CreateDeployment", []interface{}{arg1, arg2}) fake.createDeploymentMutex.Unlock() - if fake.CreateDeploymentStub != nil { - return fake.CreateDeploymentStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDeploymentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -206,15 +208,16 @@ func (fake *FakeV3ZeroDowntimeRestartActor) GetApplicationByNameAndSpace(arg1 st 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 } @@ -272,15 +275,16 @@ func (fake *FakeV3ZeroDowntimeRestartActor) StartApplication(arg1 string) (v3act fake.startApplicationArgsForCall = append(fake.startApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StartApplicationStub + fakeReturns := fake.startApplicationReturns fake.recordInvocation("StartApplication", []interface{}{arg1}) fake.startApplicationMutex.Unlock() - if fake.StartApplicationStub != nil { - return fake.StartApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.startApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -336,15 +340,16 @@ func (fake *FakeV3ZeroDowntimeRestartActor) ZeroDowntimePollStart(arg1 string, a arg1 string arg2 chan<- v3action.Warnings }{arg1, arg2}) + stub := fake.ZeroDowntimePollStartStub + fakeReturns := fake.zeroDowntimePollStartReturns fake.recordInvocation("ZeroDowntimePollStart", []interface{}{arg1, arg2}) fake.zeroDowntimePollStartMutex.Unlock() - if fake.ZeroDowntimePollStartStub != nil { - return fake.ZeroDowntimePollStartStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1 } - fakeReturns := fake.zeroDowntimePollStartReturns return fakeReturns.result1 } diff --git a/command/v7/shared/new_networking_client.go b/command/v7/shared/new_networking_client.go index 069ab9349f3..c6a0b4a928a 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/v7/api/cfnetworking/cfnetv1" + "code.cloudfoundry.org/cli/v7/api/cfnetworking/wrapper" "code.cloudfoundry.org/cli/v7/api/uaa" "code.cloudfoundry.org/cli/v7/command" "code.cloudfoundry.org/cli/v7/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/shared/sharedfakes/fake_app_stager.go b/command/v7/shared/sharedfakes/fake_app_stager.go index 26066058674..1c2ec29c8bc 100644 --- a/command/v7/shared/sharedfakes/fake_app_stager.go +++ b/command/v7/shared/sharedfakes/fake_app_stager.go @@ -76,15 +76,16 @@ func (fake *FakeAppStager) StageAndStart(arg1 resources.Application, arg2 config arg6 bool arg7 constant.ApplicationAction }{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) + stub := fake.StageAndStartStub + fakeReturns := fake.stageAndStartReturns fake.recordInvocation("StageAndStart", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) fake.stageAndStartMutex.Unlock() - if fake.StageAndStartStub != nil { - return fake.StageAndStartStub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) } if specificReturn { return ret.result1 } - fakeReturns := fake.stageAndStartReturns return fakeReturns.result1 } @@ -138,15 +139,16 @@ func (fake *FakeAppStager) StageApp(arg1 resources.Application, arg2 string, arg arg2 string arg3 configv3.Space }{arg1, arg2, arg3}) + stub := fake.StageAppStub + fakeReturns := fake.stageAppReturns fake.recordInvocation("StageApp", []interface{}{arg1, arg2, arg3}) fake.stageAppMutex.Unlock() - if fake.StageAppStub != nil { - return fake.StageAppStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stageAppReturns return fakeReturns.result1, fakeReturns.result2 } @@ -207,15 +209,16 @@ func (fake *FakeAppStager) StartApp(arg1 resources.Application, arg2 string, arg arg6 configv3.Organization arg7 constant.ApplicationAction }{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) + stub := fake.StartAppStub + fakeReturns := fake.startAppReturns fake.recordInvocation("StartApp", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6, arg7}) fake.startAppMutex.Unlock() - if fake.StartAppStub != nil { - return fake.StartAppStub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6, arg7) } if specificReturn { return ret.result1 } - fakeReturns := fake.startAppReturns return fakeReturns.result1 } diff --git a/command/v7/v7fakes/fake_actor.go b/command/v7/v7fakes/fake_actor.go index 51b6d7facef..04fb6dfb9b4 100644 --- a/command/v7/v7fakes/fake_actor.go +++ b/command/v7/v7fakes/fake_actor.go @@ -3121,15 +3121,16 @@ func (fake *FakeActor) ApplyOrganizationQuotaByName(arg1 string, arg2 string) (v arg1 string arg2 string }{arg1, arg2}) + stub := fake.ApplyOrganizationQuotaByNameStub + fakeReturns := fake.applyOrganizationQuotaByNameReturns fake.recordInvocation("ApplyOrganizationQuotaByName", []interface{}{arg1, arg2}) fake.applyOrganizationQuotaByNameMutex.Unlock() - if fake.ApplyOrganizationQuotaByNameStub != nil { - return fake.ApplyOrganizationQuotaByNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.applyOrganizationQuotaByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -3186,15 +3187,16 @@ func (fake *FakeActor) ApplySpaceQuotaByName(arg1 string, arg2 string, arg3 stri arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.ApplySpaceQuotaByNameStub + fakeReturns := fake.applySpaceQuotaByNameReturns fake.recordInvocation("ApplySpaceQuotaByName", []interface{}{arg1, arg2, arg3}) fake.applySpaceQuotaByNameMutex.Unlock() - if fake.ApplySpaceQuotaByNameStub != nil { - return fake.ApplySpaceQuotaByNameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.applySpaceQuotaByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -3250,15 +3252,16 @@ func (fake *FakeActor) AssignIsolationSegmentToSpaceByNameAndSpace(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.AssignIsolationSegmentToSpaceByNameAndSpaceStub + fakeReturns := fake.assignIsolationSegmentToSpaceByNameAndSpaceReturns fake.recordInvocation("AssignIsolationSegmentToSpaceByNameAndSpace", []interface{}{arg1, arg2}) fake.assignIsolationSegmentToSpaceByNameAndSpaceMutex.Unlock() - if fake.AssignIsolationSegmentToSpaceByNameAndSpaceStub != nil { - return fake.AssignIsolationSegmentToSpaceByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.assignIsolationSegmentToSpaceByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -3315,15 +3318,16 @@ func (fake *FakeActor) Authenticate(arg1 map[string]string, arg2 string, arg3 co 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 } - fakeReturns := fake.authenticateReturns return fakeReturns.result1 } @@ -3382,15 +3386,16 @@ func (fake *FakeActor) BindSecurityGroupToSpaces(arg1 string, arg2 []resources.S arg2 []resources.Space arg3 constanta.SecurityGroupLifecycle }{arg1, arg2Copy, arg3}) + stub := fake.BindSecurityGroupToSpacesStub + fakeReturns := fake.bindSecurityGroupToSpacesReturns fake.recordInvocation("BindSecurityGroupToSpaces", []interface{}{arg1, arg2Copy, arg3}) fake.bindSecurityGroupToSpacesMutex.Unlock() - if fake.BindSecurityGroupToSpacesStub != nil { - return fake.BindSecurityGroupToSpacesStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.bindSecurityGroupToSpacesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -3445,15 +3450,16 @@ func (fake *FakeActor) CancelDeployment(arg1 string) (v7action.Warnings, error) fake.cancelDeploymentArgsForCall = append(fake.cancelDeploymentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CancelDeploymentStub + fakeReturns := fake.cancelDeploymentReturns fake.recordInvocation("CancelDeployment", []interface{}{arg1}) fake.cancelDeploymentMutex.Unlock() - if fake.CancelDeploymentStub != nil { - return fake.CancelDeploymentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.cancelDeploymentReturns return fakeReturns.result1, fakeReturns.result2 } @@ -3511,15 +3517,16 @@ func (fake *FakeActor) CheckRoute(arg1 string, arg2 string, arg3 string, arg4 in arg3 string arg4 int }{arg1, arg2, arg3, arg4}) + stub := fake.CheckRouteStub + fakeReturns := fake.checkRouteReturns fake.recordInvocation("CheckRoute", []interface{}{arg1, arg2, arg3, arg4}) fake.checkRouteMutex.Unlock() - if fake.CheckRouteStub != nil { - return fake.CheckRouteStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.checkRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3575,9 +3582,10 @@ func (fake *FakeActor) ClearTarget() { fake.clearTargetMutex.Lock() fake.clearTargetArgsForCall = append(fake.clearTargetArgsForCall, struct { }{}) + stub := fake.ClearTargetStub fake.recordInvocation("ClearTarget", []interface{}{}) fake.clearTargetMutex.Unlock() - if fake.ClearTargetStub != nil { + if stub != nil { fake.ClearTargetStub() } } @@ -3599,15 +3607,16 @@ func (fake *FakeActor) CloudControllerAPIVersion() string { ret, specificReturn := fake.cloudControllerAPIVersionReturnsOnCall[len(fake.cloudControllerAPIVersionArgsForCall)] fake.cloudControllerAPIVersionArgsForCall = append(fake.cloudControllerAPIVersionArgsForCall, struct { }{}) + stub := fake.CloudControllerAPIVersionStub + fakeReturns := fake.cloudControllerAPIVersionReturns fake.recordInvocation("CloudControllerAPIVersion", []interface{}{}) fake.cloudControllerAPIVersionMutex.Unlock() - if fake.CloudControllerAPIVersionStub != nil { - return fake.CloudControllerAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.cloudControllerAPIVersionReturns return fakeReturns.result1 } @@ -3653,15 +3662,16 @@ func (fake *FakeActor) CopyPackage(arg1 resources.Application, arg2 resources.Ap arg1 resources.Application arg2 resources.Application }{arg1, arg2}) + stub := fake.CopyPackageStub + fakeReturns := fake.copyPackageReturns fake.recordInvocation("CopyPackage", []interface{}{arg1, arg2}) fake.copyPackageMutex.Unlock() - if fake.CopyPackageStub != nil { - return fake.CopyPackageStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.copyPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3721,15 +3731,16 @@ func (fake *FakeActor) CreateAndUploadBitsPackageByApplicationNameAndSpace(arg1 arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.CreateAndUploadBitsPackageByApplicationNameAndSpaceStub + fakeReturns := fake.createAndUploadBitsPackageByApplicationNameAndSpaceReturns fake.recordInvocation("CreateAndUploadBitsPackageByApplicationNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.createAndUploadBitsPackageByApplicationNameAndSpaceMutex.Unlock() - if fake.CreateAndUploadBitsPackageByApplicationNameAndSpaceStub != nil { - return fake.CreateAndUploadBitsPackageByApplicationNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createAndUploadBitsPackageByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3787,15 +3798,16 @@ func (fake *FakeActor) CreateApplicationDroplet(arg1 string) (resources.Droplet, fake.createApplicationDropletArgsForCall = append(fake.createApplicationDropletArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateApplicationDropletStub + fakeReturns := fake.createApplicationDropletReturns fake.recordInvocation("CreateApplicationDroplet", []interface{}{arg1}) fake.createApplicationDropletMutex.Unlock() - if fake.CreateApplicationDropletStub != nil { - return fake.CreateApplicationDropletStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3854,15 +3866,16 @@ func (fake *FakeActor) CreateApplicationInSpace(arg1 resources.Application, arg2 arg1 resources.Application arg2 string }{arg1, arg2}) + stub := fake.CreateApplicationInSpaceStub + fakeReturns := fake.createApplicationInSpaceReturns fake.recordInvocation("CreateApplicationInSpace", []interface{}{arg1, arg2}) fake.createApplicationInSpaceMutex.Unlock() - if fake.CreateApplicationInSpaceStub != nil { - return fake.CreateApplicationInSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createApplicationInSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3920,15 +3933,16 @@ func (fake *FakeActor) CreateBitsPackageByApplication(arg1 string) (resources.Pa fake.createBitsPackageByApplicationArgsForCall = append(fake.createBitsPackageByApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateBitsPackageByApplicationStub + fakeReturns := fake.createBitsPackageByApplicationReturns fake.recordInvocation("CreateBitsPackageByApplication", []interface{}{arg1}) fake.createBitsPackageByApplicationMutex.Unlock() - if fake.CreateBitsPackageByApplicationStub != nil { - return fake.CreateBitsPackageByApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBitsPackageByApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -3986,15 +4000,16 @@ func (fake *FakeActor) CreateBuildpack(arg1 resources.Buildpack) (resources.Buil fake.createBuildpackArgsForCall = append(fake.createBuildpackArgsForCall, struct { arg1 resources.Buildpack }{arg1}) + stub := fake.CreateBuildpackStub + fakeReturns := fake.createBuildpackReturns fake.recordInvocation("CreateBuildpack", []interface{}{arg1}) fake.createBuildpackMutex.Unlock() - if fake.CreateBuildpackStub != nil { - return fake.CreateBuildpackStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createBuildpackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4053,15 +4068,16 @@ func (fake *FakeActor) CreateDeploymentByApplicationAndDroplet(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateDeploymentByApplicationAndDropletStub + fakeReturns := fake.createDeploymentByApplicationAndDropletReturns fake.recordInvocation("CreateDeploymentByApplicationAndDroplet", []interface{}{arg1, arg2}) fake.createDeploymentByApplicationAndDropletMutex.Unlock() - if fake.CreateDeploymentByApplicationAndDropletStub != nil { - return fake.CreateDeploymentByApplicationAndDropletStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDeploymentByApplicationAndDropletReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4120,15 +4136,16 @@ func (fake *FakeActor) CreateDeploymentByApplicationAndRevision(arg1 string, arg arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateDeploymentByApplicationAndRevisionStub + fakeReturns := fake.createDeploymentByApplicationAndRevisionReturns fake.recordInvocation("CreateDeploymentByApplicationAndRevision", []interface{}{arg1, arg2}) fake.createDeploymentByApplicationAndRevisionMutex.Unlock() - if fake.CreateDeploymentByApplicationAndRevisionStub != nil { - return fake.CreateDeploymentByApplicationAndRevisionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDeploymentByApplicationAndRevisionReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4187,15 +4204,16 @@ func (fake *FakeActor) CreateDockerPackageByApplication(arg1 string, arg2 v7acti arg1 string arg2 v7action.DockerImageCredentials }{arg1, arg2}) + stub := fake.CreateDockerPackageByApplicationStub + fakeReturns := fake.createDockerPackageByApplicationReturns fake.recordInvocation("CreateDockerPackageByApplication", []interface{}{arg1, arg2}) fake.createDockerPackageByApplicationMutex.Unlock() - if fake.CreateDockerPackageByApplicationStub != nil { - return fake.CreateDockerPackageByApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDockerPackageByApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4255,15 +4273,16 @@ func (fake *FakeActor) CreateDockerPackageByApplicationNameAndSpace(arg1 string, arg2 string arg3 v7action.DockerImageCredentials }{arg1, arg2, arg3}) + stub := fake.CreateDockerPackageByApplicationNameAndSpaceStub + fakeReturns := fake.createDockerPackageByApplicationNameAndSpaceReturns fake.recordInvocation("CreateDockerPackageByApplicationNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.createDockerPackageByApplicationNameAndSpaceMutex.Unlock() - if fake.CreateDockerPackageByApplicationNameAndSpaceStub != nil { - return fake.CreateDockerPackageByApplicationNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createDockerPackageByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4321,15 +4340,16 @@ func (fake *FakeActor) CreateIsolationSegmentByName(arg1 resources.IsolationSegm fake.createIsolationSegmentByNameArgsForCall = append(fake.createIsolationSegmentByNameArgsForCall, struct { arg1 resources.IsolationSegment }{arg1}) + stub := fake.CreateIsolationSegmentByNameStub + fakeReturns := fake.createIsolationSegmentByNameReturns fake.recordInvocation("CreateIsolationSegmentByName", []interface{}{arg1}) fake.createIsolationSegmentByNameMutex.Unlock() - if fake.CreateIsolationSegmentByNameStub != nil { - return fake.CreateIsolationSegmentByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createIsolationSegmentByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4388,15 +4408,16 @@ func (fake *FakeActor) CreateOrgRole(arg1 constanta.RoleType, arg2 string, arg3 arg4 string arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateOrgRoleStub + fakeReturns := fake.createOrgRoleReturns fake.recordInvocation("CreateOrgRole", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createOrgRoleMutex.Unlock() - if fake.CreateOrgRoleStub != nil { - return fake.CreateOrgRoleStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createOrgRoleReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4451,15 +4472,16 @@ func (fake *FakeActor) CreateOrganization(arg1 string) (resources.Organization, fake.createOrganizationArgsForCall = append(fake.createOrganizationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.CreateOrganizationStub + fakeReturns := fake.createOrganizationReturns fake.recordInvocation("CreateOrganization", []interface{}{arg1}) fake.createOrganizationMutex.Unlock() - if fake.CreateOrganizationStub != nil { - return fake.CreateOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4518,15 +4540,16 @@ func (fake *FakeActor) CreateOrganizationQuota(arg1 string, arg2 v7action.QuotaL arg1 string arg2 v7action.QuotaLimits }{arg1, arg2}) + stub := fake.CreateOrganizationQuotaStub + fakeReturns := fake.createOrganizationQuotaReturns fake.recordInvocation("CreateOrganizationQuota", []interface{}{arg1, arg2}) fake.createOrganizationQuotaMutex.Unlock() - if fake.CreateOrganizationQuotaStub != nil { - return fake.CreateOrganizationQuotaStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4582,15 +4605,16 @@ func (fake *FakeActor) CreatePrivateDomain(arg1 string, arg2 string) (v7action.W arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreatePrivateDomainStub + fakeReturns := fake.createPrivateDomainReturns fake.recordInvocation("CreatePrivateDomain", []interface{}{arg1, arg2}) fake.createPrivateDomainMutex.Unlock() - if fake.CreatePrivateDomainStub != nil { - return fake.CreatePrivateDomainStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createPrivateDomainReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4649,15 +4673,16 @@ func (fake *FakeActor) CreateRoute(arg1 string, arg2 string, arg3 string, arg4 s arg4 string arg5 int }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.CreateRouteStub + fakeReturns := fake.createRouteReturns fake.recordInvocation("CreateRoute", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.createRouteMutex.Unlock() - if fake.CreateRouteStub != nil { - return fake.CreateRouteStub(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.createRouteReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4716,15 +4741,16 @@ func (fake *FakeActor) CreateSecurityGroup(arg1 string, arg2 string) (v7action.W arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateSecurityGroupStub + fakeReturns := fake.createSecurityGroupReturns fake.recordInvocation("CreateSecurityGroup", []interface{}{arg1, arg2}) fake.createSecurityGroupMutex.Unlock() - if fake.CreateSecurityGroupStub != nil { - return fake.CreateSecurityGroupStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createSecurityGroupReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4779,15 +4805,16 @@ func (fake *FakeActor) CreateServiceBroker(arg1 resources.ServiceBroker) (v7acti fake.createServiceBrokerArgsForCall = append(fake.createServiceBrokerArgsForCall, struct { arg1 resources.ServiceBroker }{arg1}) + stub := fake.CreateServiceBrokerStub + fakeReturns := fake.createServiceBrokerReturns fake.recordInvocation("CreateServiceBroker", []interface{}{arg1}) fake.createServiceBrokerMutex.Unlock() - if fake.CreateServiceBrokerStub != nil { - return fake.CreateServiceBrokerStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createServiceBrokerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4844,15 +4871,16 @@ func (fake *FakeActor) CreateSharedDomain(arg1 string, arg2 bool, arg3 string) ( arg2 bool arg3 string }{arg1, arg2, arg3}) + stub := fake.CreateSharedDomainStub + fakeReturns := fake.createSharedDomainReturns fake.recordInvocation("CreateSharedDomain", []interface{}{arg1, arg2, arg3}) fake.createSharedDomainMutex.Unlock() - if fake.CreateSharedDomainStub != nil { - return fake.CreateSharedDomainStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createSharedDomainReturns return fakeReturns.result1, fakeReturns.result2 } @@ -4908,15 +4936,16 @@ func (fake *FakeActor) CreateSpace(arg1 string, arg2 string) (resources.Space, v arg1 string arg2 string }{arg1, arg2}) + stub := fake.CreateSpaceStub + fakeReturns := fake.createSpaceReturns fake.recordInvocation("CreateSpace", []interface{}{arg1, arg2}) fake.createSpaceMutex.Unlock() - if fake.CreateSpaceStub != nil { - return fake.CreateSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.createSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -4976,15 +5005,16 @@ func (fake *FakeActor) CreateSpaceQuota(arg1 string, arg2 string, arg3 v7action. arg2 string arg3 v7action.QuotaLimits }{arg1, arg2, arg3}) + stub := fake.CreateSpaceQuotaStub + fakeReturns := fake.createSpaceQuotaReturns fake.recordInvocation("CreateSpaceQuota", []interface{}{arg1, arg2, arg3}) fake.createSpaceQuotaMutex.Unlock() - if fake.CreateSpaceQuotaStub != nil { - return fake.CreateSpaceQuotaStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.createSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5044,15 +5074,16 @@ func (fake *FakeActor) CreateSpaceRole(arg1 constanta.RoleType, arg2 string, arg arg5 string arg6 bool }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.CreateSpaceRoleStub + fakeReturns := fake.createSpaceRoleReturns fake.recordInvocation("CreateSpaceRole", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) fake.createSpaceRoleMutex.Unlock() - if fake.CreateSpaceRoleStub != nil { - return fake.CreateSpaceRoleStub(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.createSpaceRoleReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5109,15 +5140,16 @@ func (fake *FakeActor) CreateUser(arg1 string, arg2 string, arg3 string) (resour 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, ret.result3 } - fakeReturns := fake.createUserReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -5177,15 +5209,16 @@ func (fake *FakeActor) DeleteApplicationByNameAndSpace(arg1 string, arg2 string, arg2 string arg3 bool }{arg1, arg2, arg3}) + stub := fake.DeleteApplicationByNameAndSpaceStub + fakeReturns := fake.deleteApplicationByNameAndSpaceReturns fake.recordInvocation("DeleteApplicationByNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.deleteApplicationByNameAndSpaceMutex.Unlock() - if fake.DeleteApplicationByNameAndSpaceStub != nil { - return fake.DeleteApplicationByNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteApplicationByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5241,15 +5274,16 @@ func (fake *FakeActor) DeleteBuildpackByNameAndStack(arg1 string, arg2 string) ( arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteBuildpackByNameAndStackStub + fakeReturns := fake.deleteBuildpackByNameAndStackReturns fake.recordInvocation("DeleteBuildpackByNameAndStack", []interface{}{arg1, arg2}) fake.deleteBuildpackByNameAndStackMutex.Unlock() - if fake.DeleteBuildpackByNameAndStackStub != nil { - return fake.DeleteBuildpackByNameAndStackStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteBuildpackByNameAndStackReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5304,15 +5338,16 @@ func (fake *FakeActor) DeleteDomain(arg1 resources.Domain) (v7action.Warnings, e fake.deleteDomainArgsForCall = append(fake.deleteDomainArgsForCall, struct { arg1 resources.Domain }{arg1}) + stub := fake.DeleteDomainStub + fakeReturns := fake.deleteDomainReturns fake.recordInvocation("DeleteDomain", []interface{}{arg1}) fake.deleteDomainMutex.Unlock() - if fake.DeleteDomainStub != nil { - return fake.DeleteDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteDomainReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5370,15 +5405,16 @@ func (fake *FakeActor) DeleteInstanceByApplicationNameSpaceProcessTypeAndIndex(a arg3 string arg4 int }{arg1, arg2, arg3, arg4}) + stub := fake.DeleteInstanceByApplicationNameSpaceProcessTypeAndIndexStub + fakeReturns := fake.deleteInstanceByApplicationNameSpaceProcessTypeAndIndexReturns fake.recordInvocation("DeleteInstanceByApplicationNameSpaceProcessTypeAndIndex", []interface{}{arg1, arg2, arg3, arg4}) fake.deleteInstanceByApplicationNameSpaceProcessTypeAndIndexMutex.Unlock() - if fake.DeleteInstanceByApplicationNameSpaceProcessTypeAndIndexStub != nil { - return fake.DeleteInstanceByApplicationNameSpaceProcessTypeAndIndexStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteInstanceByApplicationNameSpaceProcessTypeAndIndexReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5433,15 +5469,16 @@ func (fake *FakeActor) DeleteIsolationSegmentByName(arg1 string) (v7action.Warni fake.deleteIsolationSegmentByNameArgsForCall = append(fake.deleteIsolationSegmentByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteIsolationSegmentByNameStub + fakeReturns := fake.deleteIsolationSegmentByNameReturns fake.recordInvocation("DeleteIsolationSegmentByName", []interface{}{arg1}) fake.deleteIsolationSegmentByNameMutex.Unlock() - if fake.DeleteIsolationSegmentByNameStub != nil { - return fake.DeleteIsolationSegmentByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteIsolationSegmentByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5497,15 +5534,16 @@ func (fake *FakeActor) DeleteIsolationSegmentOrganizationByName(arg1 string, arg arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteIsolationSegmentOrganizationByNameStub + fakeReturns := fake.deleteIsolationSegmentOrganizationByNameReturns fake.recordInvocation("DeleteIsolationSegmentOrganizationByName", []interface{}{arg1, arg2}) fake.deleteIsolationSegmentOrganizationByNameMutex.Unlock() - if fake.DeleteIsolationSegmentOrganizationByNameStub != nil { - return fake.DeleteIsolationSegmentOrganizationByNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteIsolationSegmentOrganizationByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5564,15 +5602,16 @@ func (fake *FakeActor) DeleteOrgRole(arg1 constanta.RoleType, arg2 string, arg3 arg4 string arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.DeleteOrgRoleStub + fakeReturns := fake.deleteOrgRoleReturns fake.recordInvocation("DeleteOrgRole", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.deleteOrgRoleMutex.Unlock() - if fake.DeleteOrgRoleStub != nil { - return fake.DeleteOrgRoleStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteOrgRoleReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5627,15 +5666,16 @@ func (fake *FakeActor) DeleteOrganization(arg1 string) (v7action.Warnings, error fake.deleteOrganizationArgsForCall = append(fake.deleteOrganizationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteOrganizationStub + fakeReturns := fake.deleteOrganizationReturns fake.recordInvocation("DeleteOrganization", []interface{}{arg1}) fake.deleteOrganizationMutex.Unlock() - if fake.DeleteOrganizationStub != nil { - return fake.DeleteOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteOrganizationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5690,15 +5730,16 @@ func (fake *FakeActor) DeleteOrganizationQuota(arg1 string) (v7action.Warnings, fake.deleteOrganizationQuotaArgsForCall = append(fake.deleteOrganizationQuotaArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteOrganizationQuotaStub + fakeReturns := fake.deleteOrganizationQuotaReturns fake.recordInvocation("DeleteOrganizationQuota", []interface{}{arg1}) fake.deleteOrganizationQuotaMutex.Unlock() - if fake.DeleteOrganizationQuotaStub != nil { - return fake.DeleteOrganizationQuotaStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5753,15 +5794,16 @@ func (fake *FakeActor) DeleteOrphanedRoutes(arg1 string) (v7action.Warnings, err fake.deleteOrphanedRoutesArgsForCall = append(fake.deleteOrphanedRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteOrphanedRoutesStub + fakeReturns := fake.deleteOrphanedRoutesReturns fake.recordInvocation("DeleteOrphanedRoutes", []interface{}{arg1}) fake.deleteOrphanedRoutesMutex.Unlock() - if fake.DeleteOrphanedRoutesStub != nil { - return fake.DeleteOrphanedRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteOrphanedRoutesReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5819,15 +5861,16 @@ func (fake *FakeActor) DeleteRoute(arg1 string, arg2 string, arg3 string, arg4 i arg3 string arg4 int }{arg1, arg2, arg3, arg4}) + stub := fake.DeleteRouteStub + fakeReturns := fake.deleteRouteReturns fake.recordInvocation("DeleteRoute", []interface{}{arg1, arg2, arg3, arg4}) fake.deleteRouteMutex.Unlock() - if fake.DeleteRouteStub != nil { - return fake.DeleteRouteStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5882,15 +5925,16 @@ func (fake *FakeActor) DeleteSecurityGroup(arg1 string) (v7action.Warnings, erro fake.deleteSecurityGroupArgsForCall = append(fake.deleteSecurityGroupArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteSecurityGroupStub + fakeReturns := fake.deleteSecurityGroupReturns fake.recordInvocation("DeleteSecurityGroup", []interface{}{arg1}) fake.deleteSecurityGroupMutex.Unlock() - if fake.DeleteSecurityGroupStub != nil { - return fake.DeleteSecurityGroupStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteSecurityGroupReturns return fakeReturns.result1, fakeReturns.result2 } @@ -5945,15 +5989,16 @@ func (fake *FakeActor) DeleteServiceBroker(arg1 string) (v7action.Warnings, erro fake.deleteServiceBrokerArgsForCall = append(fake.deleteServiceBrokerArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DeleteServiceBrokerStub + fakeReturns := fake.deleteServiceBrokerReturns fake.recordInvocation("DeleteServiceBroker", []interface{}{arg1}) fake.deleteServiceBrokerMutex.Unlock() - if fake.DeleteServiceBrokerStub != nil { - return fake.DeleteServiceBrokerStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteServiceBrokerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6009,15 +6054,16 @@ func (fake *FakeActor) DeleteSpaceByNameAndOrganizationName(arg1 string, arg2 st arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteSpaceByNameAndOrganizationNameStub + fakeReturns := fake.deleteSpaceByNameAndOrganizationNameReturns fake.recordInvocation("DeleteSpaceByNameAndOrganizationName", []interface{}{arg1, arg2}) fake.deleteSpaceByNameAndOrganizationNameMutex.Unlock() - if fake.DeleteSpaceByNameAndOrganizationNameStub != nil { - return fake.DeleteSpaceByNameAndOrganizationNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteSpaceByNameAndOrganizationNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6073,15 +6119,16 @@ func (fake *FakeActor) DeleteSpaceQuotaByName(arg1 string, arg2 string) (v7actio arg1 string arg2 string }{arg1, arg2}) + stub := fake.DeleteSpaceQuotaByNameStub + fakeReturns := fake.deleteSpaceQuotaByNameReturns fake.recordInvocation("DeleteSpaceQuotaByName", []interface{}{arg1, arg2}) fake.deleteSpaceQuotaByNameMutex.Unlock() - if fake.DeleteSpaceQuotaByNameStub != nil { - return fake.DeleteSpaceQuotaByNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteSpaceQuotaByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6140,15 +6187,16 @@ func (fake *FakeActor) DeleteSpaceRole(arg1 constanta.RoleType, arg2 string, arg arg4 string arg5 bool }{arg1, arg2, arg3, arg4, arg5}) + stub := fake.DeleteSpaceRoleStub + fakeReturns := fake.deleteSpaceRoleReturns fake.recordInvocation("DeleteSpaceRole", []interface{}{arg1, arg2, arg3, arg4, arg5}) fake.deleteSpaceRoleMutex.Unlock() - if fake.DeleteSpaceRoleStub != nil { - return fake.DeleteSpaceRoleStub(arg1, arg2, arg3, arg4, arg5) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.deleteSpaceRoleReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6203,15 +6251,16 @@ func (fake *FakeActor) DeleteUser(arg1 string) (v7action.Warnings, 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 } @@ -6266,15 +6315,16 @@ func (fake *FakeActor) DisableFeatureFlag(arg1 string) (v7action.Warnings, error fake.disableFeatureFlagArgsForCall = append(fake.disableFeatureFlagArgsForCall, struct { arg1 string }{arg1}) + stub := fake.DisableFeatureFlagStub + fakeReturns := fake.disableFeatureFlagReturns fake.recordInvocation("DisableFeatureFlag", []interface{}{arg1}) fake.disableFeatureFlagMutex.Unlock() - if fake.DisableFeatureFlagStub != nil { - return fake.DisableFeatureFlagStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.disableFeatureFlagReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6332,15 +6382,16 @@ func (fake *FakeActor) DisableServiceAccess(arg1 string, arg2 string, arg3 strin arg3 string arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.DisableServiceAccessStub + fakeReturns := fake.disableServiceAccessReturns fake.recordInvocation("DisableServiceAccess", []interface{}{arg1, arg2, arg3, arg4}) fake.disableServiceAccessMutex.Unlock() - if fake.DisableServiceAccessStub != nil { - return fake.DisableServiceAccessStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.disableServiceAccessReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6399,15 +6450,16 @@ func (fake *FakeActor) DownloadCurrentDropletByAppName(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.DownloadCurrentDropletByAppNameStub + fakeReturns := fake.downloadCurrentDropletByAppNameReturns fake.recordInvocation("DownloadCurrentDropletByAppName", []interface{}{arg1, arg2}) fake.downloadCurrentDropletByAppNameMutex.Unlock() - if fake.DownloadCurrentDropletByAppNameStub != nil { - return fake.DownloadCurrentDropletByAppNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3, ret.result4 } - fakeReturns := fake.downloadCurrentDropletByAppNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3, fakeReturns.result4 } @@ -6470,15 +6522,16 @@ func (fake *FakeActor) DownloadDropletByGUIDAndAppName(arg1 string, arg2 string, arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.DownloadDropletByGUIDAndAppNameStub + fakeReturns := fake.downloadDropletByGUIDAndAppNameReturns fake.recordInvocation("DownloadDropletByGUIDAndAppName", []interface{}{arg1, arg2, arg3}) fake.downloadDropletByGUIDAndAppNameMutex.Unlock() - if fake.DownloadDropletByGUIDAndAppNameStub != nil { - return fake.DownloadDropletByGUIDAndAppNameStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.downloadDropletByGUIDAndAppNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6536,15 +6589,16 @@ func (fake *FakeActor) EnableFeatureFlag(arg1 string) (v7action.Warnings, error) fake.enableFeatureFlagArgsForCall = append(fake.enableFeatureFlagArgsForCall, struct { arg1 string }{arg1}) + stub := fake.EnableFeatureFlagStub + fakeReturns := fake.enableFeatureFlagReturns fake.recordInvocation("EnableFeatureFlag", []interface{}{arg1}) fake.enableFeatureFlagMutex.Unlock() - if fake.EnableFeatureFlagStub != nil { - return fake.EnableFeatureFlagStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.enableFeatureFlagReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6602,15 +6656,16 @@ func (fake *FakeActor) EnableServiceAccess(arg1 string, arg2 string, arg3 string arg3 string arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.EnableServiceAccessStub + fakeReturns := fake.enableServiceAccessReturns fake.recordInvocation("EnableServiceAccess", []interface{}{arg1, arg2, arg3, arg4}) fake.enableServiceAccessMutex.Unlock() - if fake.EnableServiceAccessStub != nil { - return fake.EnableServiceAccessStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.enableServiceAccessReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6669,15 +6724,16 @@ func (fake *FakeActor) EntitleIsolationSegmentToOrganizationByName(arg1 string, arg1 string arg2 string }{arg1, arg2}) + stub := fake.EntitleIsolationSegmentToOrganizationByNameStub + fakeReturns := fake.entitleIsolationSegmentToOrganizationByNameReturns fake.recordInvocation("EntitleIsolationSegmentToOrganizationByName", []interface{}{arg1, arg2}) fake.entitleIsolationSegmentToOrganizationByNameMutex.Unlock() - if fake.EntitleIsolationSegmentToOrganizationByNameStub != nil { - return fake.EntitleIsolationSegmentToOrganizationByNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.entitleIsolationSegmentToOrganizationByNameReturns return fakeReturns.result1, fakeReturns.result2 } @@ -6733,15 +6789,16 @@ func (fake *FakeActor) GetAppFeature(arg1 string, arg2 string) (resources.Applic arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetAppFeatureStub + fakeReturns := fake.getAppFeatureReturns fake.recordInvocation("GetAppFeature", []interface{}{arg1, arg2}) fake.getAppFeatureMutex.Unlock() - if fake.GetAppFeatureStub != nil { - return fake.GetAppFeatureStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getAppFeatureReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6800,15 +6857,16 @@ func (fake *FakeActor) GetAppSummariesForSpace(arg1 string, arg2 string) ([]v7ac arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetAppSummariesForSpaceStub + fakeReturns := fake.getAppSummariesForSpaceReturns fake.recordInvocation("GetAppSummariesForSpace", []interface{}{arg1, arg2}) fake.getAppSummariesForSpaceMutex.Unlock() - if fake.GetAppSummariesForSpaceStub != nil { - return fake.GetAppSummariesForSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getAppSummariesForSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -6867,15 +6925,16 @@ func (fake *FakeActor) GetApplicationByNameAndSpace(arg1 string, arg2 string) (r 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 } @@ -6934,15 +6993,16 @@ func (fake *FakeActor) GetApplicationDroplets(arg1 string, arg2 string) ([]resou arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationDropletsStub + fakeReturns := fake.getApplicationDropletsReturns fake.recordInvocation("GetApplicationDroplets", []interface{}{arg1, arg2}) fake.getApplicationDropletsMutex.Unlock() - if fake.GetApplicationDropletsStub != nil { - return fake.GetApplicationDropletsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationDropletsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7001,15 +7061,16 @@ func (fake *FakeActor) GetApplicationLabels(arg1 string, arg2 string) (map[strin arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationLabelsStub + fakeReturns := fake.getApplicationLabelsReturns fake.recordInvocation("GetApplicationLabels", []interface{}{arg1, arg2}) fake.getApplicationLabelsMutex.Unlock() - if fake.GetApplicationLabelsStub != nil { - return fake.GetApplicationLabelsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7068,15 +7129,16 @@ func (fake *FakeActor) GetApplicationPackages(arg1 string, arg2 string) ([]resou arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationPackagesStub + fakeReturns := fake.getApplicationPackagesReturns fake.recordInvocation("GetApplicationPackages", []interface{}{arg1, arg2}) fake.getApplicationPackagesMutex.Unlock() - if fake.GetApplicationPackagesStub != nil { - return fake.GetApplicationPackagesStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationPackagesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7135,15 +7197,16 @@ func (fake *FakeActor) GetApplicationProcessHealthChecksByNameAndSpace(arg1 stri arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetApplicationProcessHealthChecksByNameAndSpaceStub + fakeReturns := fake.getApplicationProcessHealthChecksByNameAndSpaceReturns fake.recordInvocation("GetApplicationProcessHealthChecksByNameAndSpace", []interface{}{arg1, arg2}) fake.getApplicationProcessHealthChecksByNameAndSpaceMutex.Unlock() - if fake.GetApplicationProcessHealthChecksByNameAndSpaceStub != nil { - return fake.GetApplicationProcessHealthChecksByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationProcessHealthChecksByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7201,15 +7264,16 @@ func (fake *FakeActor) GetApplicationRevisionsDeployed(arg1 string) ([]resources fake.getApplicationRevisionsDeployedArgsForCall = append(fake.getApplicationRevisionsDeployedArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRevisionsDeployedStub + fakeReturns := fake.getApplicationRevisionsDeployedReturns fake.recordInvocation("GetApplicationRevisionsDeployed", []interface{}{arg1}) fake.getApplicationRevisionsDeployedMutex.Unlock() - if fake.GetApplicationRevisionsDeployedStub != nil { - return fake.GetApplicationRevisionsDeployedStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRevisionsDeployedReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7267,15 +7331,16 @@ func (fake *FakeActor) GetApplicationRoutes(arg1 string) ([]resources.Route, v7a fake.getApplicationRoutesArgsForCall = append(fake.getApplicationRoutesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetApplicationRoutesStub + fakeReturns := fake.getApplicationRoutesReturns fake.recordInvocation("GetApplicationRoutes", []interface{}{arg1}) fake.getApplicationRoutesMutex.Unlock() - if fake.GetApplicationRoutesStub != nil { - return fake.GetApplicationRoutesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationRoutesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7334,15 +7399,16 @@ func (fake *FakeActor) GetApplicationTasks(arg1 string, arg2 v7action.SortOrder) arg1 string arg2 v7action.SortOrder }{arg1, arg2}) + stub := fake.GetApplicationTasksStub + fakeReturns := fake.getApplicationTasksReturns fake.recordInvocation("GetApplicationTasks", []interface{}{arg1, arg2}) fake.getApplicationTasksMutex.Unlock() - if fake.GetApplicationTasksStub != nil { - return fake.GetApplicationTasksStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationTasksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7406,15 +7472,16 @@ func (fake *FakeActor) GetApplicationsByNamesAndSpace(arg1 []string, arg2 string arg1 []string arg2 string }{arg1Copy, arg2}) + stub := fake.GetApplicationsByNamesAndSpaceStub + fakeReturns := fake.getApplicationsByNamesAndSpaceReturns fake.recordInvocation("GetApplicationsByNamesAndSpace", []interface{}{arg1Copy, arg2}) fake.getApplicationsByNamesAndSpaceMutex.Unlock() - if fake.GetApplicationsByNamesAndSpaceStub != nil { - return fake.GetApplicationsByNamesAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getApplicationsByNamesAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7473,15 +7540,16 @@ func (fake *FakeActor) GetBuildpackLabels(arg1 string, arg2 string) (map[string] arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetBuildpackLabelsStub + fakeReturns := fake.getBuildpackLabelsReturns fake.recordInvocation("GetBuildpackLabels", []interface{}{arg1, arg2}) fake.getBuildpackLabelsMutex.Unlock() - if fake.GetBuildpackLabelsStub != nil { - return fake.GetBuildpackLabelsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getBuildpackLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7539,15 +7607,16 @@ func (fake *FakeActor) GetBuildpacks(arg1 string) ([]resources.Buildpack, v7acti fake.getBuildpacksArgsForCall = append(fake.getBuildpacksArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetBuildpacksStub + fakeReturns := fake.getBuildpacksReturns fake.recordInvocation("GetBuildpacks", []interface{}{arg1}) fake.getBuildpacksMutex.Unlock() - if fake.GetBuildpacksStub != nil { - return fake.GetBuildpacksStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getBuildpacksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7605,15 +7674,16 @@ func (fake *FakeActor) GetDefaultDomain(arg1 string) (resources.Domain, v7action fake.getDefaultDomainArgsForCall = append(fake.getDefaultDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDefaultDomainStub + fakeReturns := fake.getDefaultDomainReturns fake.recordInvocation("GetDefaultDomain", []interface{}{arg1}) fake.getDefaultDomainMutex.Unlock() - if fake.GetDefaultDomainStub != nil { - return fake.GetDefaultDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDefaultDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7673,15 +7743,16 @@ func (fake *FakeActor) GetDetailedAppSummary(arg1 string, arg2 string, arg3 bool 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 } @@ -7739,15 +7810,16 @@ func (fake *FakeActor) GetDomain(arg1 string) (resources.Domain, v7action.Warnin fake.getDomainArgsForCall = append(fake.getDomainArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDomainStub + fakeReturns := fake.getDomainReturns fake.recordInvocation("GetDomain", []interface{}{arg1}) fake.getDomainMutex.Unlock() - if fake.GetDomainStub != nil { - return fake.GetDomainStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDomainReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7805,15 +7877,16 @@ func (fake *FakeActor) GetDomainByName(arg1 string) (resources.Domain, v7action. fake.getDomainByNameArgsForCall = append(fake.getDomainByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDomainByNameStub + fakeReturns := fake.getDomainByNameReturns fake.recordInvocation("GetDomainByName", []interface{}{arg1}) fake.getDomainByNameMutex.Unlock() - if fake.GetDomainByNameStub != nil { - return fake.GetDomainByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDomainByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7871,15 +7944,16 @@ func (fake *FakeActor) GetDomainLabels(arg1 string) (map[string]types.NullString fake.getDomainLabelsArgsForCall = append(fake.getDomainLabelsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetDomainLabelsStub + fakeReturns := fake.getDomainLabelsReturns fake.recordInvocation("GetDomainLabels", []interface{}{arg1}) fake.getDomainLabelsMutex.Unlock() - if fake.GetDomainLabelsStub != nil { - return fake.GetDomainLabelsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getDomainLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -7938,15 +8012,16 @@ func (fake *FakeActor) GetEffectiveIsolationSegmentBySpace(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetEffectiveIsolationSegmentBySpaceStub + fakeReturns := fake.getEffectiveIsolationSegmentBySpaceReturns fake.recordInvocation("GetEffectiveIsolationSegmentBySpace", []interface{}{arg1, arg2}) fake.getEffectiveIsolationSegmentBySpaceMutex.Unlock() - if fake.GetEffectiveIsolationSegmentBySpaceStub != nil { - return fake.GetEffectiveIsolationSegmentBySpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getEffectiveIsolationSegmentBySpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8004,15 +8079,16 @@ func (fake *FakeActor) GetEnvironmentVariableGroup(arg1 constanta.EnvironmentVar fake.getEnvironmentVariableGroupArgsForCall = append(fake.getEnvironmentVariableGroupArgsForCall, struct { arg1 constanta.EnvironmentVariableGroupName }{arg1}) + stub := fake.GetEnvironmentVariableGroupStub + fakeReturns := fake.getEnvironmentVariableGroupReturns fake.recordInvocation("GetEnvironmentVariableGroup", []interface{}{arg1}) fake.getEnvironmentVariableGroupMutex.Unlock() - if fake.GetEnvironmentVariableGroupStub != nil { - return fake.GetEnvironmentVariableGroupStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getEnvironmentVariableGroupReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8071,15 +8147,16 @@ func (fake *FakeActor) GetEnvironmentVariablesByApplicationNameAndSpace(arg1 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetEnvironmentVariablesByApplicationNameAndSpaceStub + fakeReturns := fake.getEnvironmentVariablesByApplicationNameAndSpaceReturns fake.recordInvocation("GetEnvironmentVariablesByApplicationNameAndSpace", []interface{}{arg1, arg2}) fake.getEnvironmentVariablesByApplicationNameAndSpaceMutex.Unlock() - if fake.GetEnvironmentVariablesByApplicationNameAndSpaceStub != nil { - return fake.GetEnvironmentVariablesByApplicationNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getEnvironmentVariablesByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8137,15 +8214,16 @@ func (fake *FakeActor) GetFeatureFlagByName(arg1 string) (resources.FeatureFlag, fake.getFeatureFlagByNameArgsForCall = append(fake.getFeatureFlagByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetFeatureFlagByNameStub + fakeReturns := fake.getFeatureFlagByNameReturns fake.recordInvocation("GetFeatureFlagByName", []interface{}{arg1}) fake.getFeatureFlagByNameMutex.Unlock() - if fake.GetFeatureFlagByNameStub != nil { - return fake.GetFeatureFlagByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getFeatureFlagByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8202,15 +8280,16 @@ func (fake *FakeActor) GetFeatureFlags() ([]resources.FeatureFlag, v7action.Warn ret, specificReturn := fake.getFeatureFlagsReturnsOnCall[len(fake.getFeatureFlagsArgsForCall)] fake.getFeatureFlagsArgsForCall = append(fake.getFeatureFlagsArgsForCall, struct { }{}) + stub := fake.GetFeatureFlagsStub + fakeReturns := fake.getFeatureFlagsReturns fake.recordInvocation("GetFeatureFlags", []interface{}{}) fake.getFeatureFlagsMutex.Unlock() - if fake.GetFeatureFlagsStub != nil { - return fake.GetFeatureFlagsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getFeatureFlagsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8260,15 +8339,16 @@ func (fake *FakeActor) GetGlobalRunningSecurityGroups() ([]resources.SecurityGro ret, specificReturn := fake.getGlobalRunningSecurityGroupsReturnsOnCall[len(fake.getGlobalRunningSecurityGroupsArgsForCall)] fake.getGlobalRunningSecurityGroupsArgsForCall = append(fake.getGlobalRunningSecurityGroupsArgsForCall, struct { }{}) + stub := fake.GetGlobalRunningSecurityGroupsStub + fakeReturns := fake.getGlobalRunningSecurityGroupsReturns fake.recordInvocation("GetGlobalRunningSecurityGroups", []interface{}{}) fake.getGlobalRunningSecurityGroupsMutex.Unlock() - if fake.GetGlobalRunningSecurityGroupsStub != nil { - return fake.GetGlobalRunningSecurityGroupsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getGlobalRunningSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8318,15 +8398,16 @@ func (fake *FakeActor) GetGlobalStagingSecurityGroups() ([]resources.SecurityGro ret, specificReturn := fake.getGlobalStagingSecurityGroupsReturnsOnCall[len(fake.getGlobalStagingSecurityGroupsArgsForCall)] fake.getGlobalStagingSecurityGroupsArgsForCall = append(fake.getGlobalStagingSecurityGroupsArgsForCall, struct { }{}) + stub := fake.GetGlobalStagingSecurityGroupsStub + fakeReturns := fake.getGlobalStagingSecurityGroupsReturns fake.recordInvocation("GetGlobalStagingSecurityGroups", []interface{}{}) fake.getGlobalStagingSecurityGroupsMutex.Unlock() - if fake.GetGlobalStagingSecurityGroupsStub != nil { - return fake.GetGlobalStagingSecurityGroupsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getGlobalStagingSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8377,15 +8458,16 @@ func (fake *FakeActor) GetIsolationSegmentByName(arg1 string) (resources.Isolati fake.getIsolationSegmentByNameArgsForCall = append(fake.getIsolationSegmentByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetIsolationSegmentByNameStub + fakeReturns := fake.getIsolationSegmentByNameReturns fake.recordInvocation("GetIsolationSegmentByName", []interface{}{arg1}) fake.getIsolationSegmentByNameMutex.Unlock() - if fake.GetIsolationSegmentByNameStub != nil { - return fake.GetIsolationSegmentByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8442,15 +8524,16 @@ func (fake *FakeActor) GetIsolationSegmentSummaries() ([]v7action.IsolationSegme ret, specificReturn := fake.getIsolationSegmentSummariesReturnsOnCall[len(fake.getIsolationSegmentSummariesArgsForCall)] fake.getIsolationSegmentSummariesArgsForCall = append(fake.getIsolationSegmentSummariesArgsForCall, struct { }{}) + stub := fake.GetIsolationSegmentSummariesStub + fakeReturns := fake.getIsolationSegmentSummariesReturns fake.recordInvocation("GetIsolationSegmentSummaries", []interface{}{}) fake.getIsolationSegmentSummariesMutex.Unlock() - if fake.GetIsolationSegmentSummariesStub != nil { - return fake.GetIsolationSegmentSummariesStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentSummariesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8501,15 +8584,16 @@ func (fake *FakeActor) GetIsolationSegmentsByOrganization(arg1 string) ([]resour fake.getIsolationSegmentsByOrganizationArgsForCall = append(fake.getIsolationSegmentsByOrganizationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetIsolationSegmentsByOrganizationStub + fakeReturns := fake.getIsolationSegmentsByOrganizationReturns fake.recordInvocation("GetIsolationSegmentsByOrganization", []interface{}{arg1}) fake.getIsolationSegmentsByOrganizationMutex.Unlock() - if fake.GetIsolationSegmentsByOrganizationStub != nil { - return fake.GetIsolationSegmentsByOrganizationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getIsolationSegmentsByOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8567,15 +8651,16 @@ func (fake *FakeActor) GetLatestActiveDeploymentForApp(arg1 string) (resources.D fake.getLatestActiveDeploymentForAppArgsForCall = append(fake.getLatestActiveDeploymentForAppArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetLatestActiveDeploymentForAppStub + fakeReturns := fake.getLatestActiveDeploymentForAppReturns fake.recordInvocation("GetLatestActiveDeploymentForApp", []interface{}{arg1}) fake.getLatestActiveDeploymentForAppMutex.Unlock() - if fake.GetLatestActiveDeploymentForAppStub != nil { - return fake.GetLatestActiveDeploymentForAppStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getLatestActiveDeploymentForAppReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8632,15 +8717,16 @@ func (fake *FakeActor) GetLogCacheEndpoint() (string, v7action.Warnings, error) ret, specificReturn := fake.getLogCacheEndpointReturnsOnCall[len(fake.getLogCacheEndpointArgsForCall)] fake.getLogCacheEndpointArgsForCall = append(fake.getLogCacheEndpointArgsForCall, struct { }{}) + stub := fake.GetLogCacheEndpointStub + fakeReturns := fake.getLogCacheEndpointReturns fake.recordInvocation("GetLogCacheEndpoint", []interface{}{}) fake.getLogCacheEndpointMutex.Unlock() - if fake.GetLogCacheEndpointStub != nil { - return fake.GetLogCacheEndpointStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getLogCacheEndpointReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8690,15 +8776,16 @@ func (fake *FakeActor) GetLoginPrompts() map[string]coreconfig.AuthPrompt { 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 } - fakeReturns := fake.getLoginPromptsReturns return fakeReturns.result1 } @@ -8743,15 +8830,16 @@ func (fake *FakeActor) GetNewestReadyPackageForApplication(arg1 resources.Applic fake.getNewestReadyPackageForApplicationArgsForCall = append(fake.getNewestReadyPackageForApplicationArgsForCall, struct { arg1 resources.Application }{arg1}) + stub := fake.GetNewestReadyPackageForApplicationStub + fakeReturns := fake.getNewestReadyPackageForApplicationReturns fake.recordInvocation("GetNewestReadyPackageForApplication", []interface{}{arg1}) fake.getNewestReadyPackageForApplicationMutex.Unlock() - if fake.GetNewestReadyPackageForApplicationStub != nil { - return fake.GetNewestReadyPackageForApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getNewestReadyPackageForApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8809,15 +8897,16 @@ func (fake *FakeActor) GetOrgUsersByRoleType(arg1 string) (map[constanta.RoleTyp fake.getOrgUsersByRoleTypeArgsForCall = append(fake.getOrgUsersByRoleTypeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrgUsersByRoleTypeStub + fakeReturns := fake.getOrgUsersByRoleTypeReturns fake.recordInvocation("GetOrgUsersByRoleType", []interface{}{arg1}) fake.getOrgUsersByRoleTypeMutex.Unlock() - if fake.GetOrgUsersByRoleTypeStub != nil { - return fake.GetOrgUsersByRoleTypeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrgUsersByRoleTypeReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8875,15 +8964,16 @@ func (fake *FakeActor) GetOrganizationByName(arg1 string) (resources.Organizatio fake.getOrganizationByNameArgsForCall = append(fake.getOrganizationByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationByNameStub + fakeReturns := fake.getOrganizationByNameReturns fake.recordInvocation("GetOrganizationByName", []interface{}{arg1}) fake.getOrganizationByNameMutex.Unlock() - if fake.GetOrganizationByNameStub != nil { - return fake.GetOrganizationByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -8942,15 +9032,16 @@ func (fake *FakeActor) GetOrganizationDomains(arg1 string, arg2 string) ([]resou arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetOrganizationDomainsStub + fakeReturns := fake.getOrganizationDomainsReturns fake.recordInvocation("GetOrganizationDomains", []interface{}{arg1, arg2}) fake.getOrganizationDomainsMutex.Unlock() - if fake.GetOrganizationDomainsStub != nil { - return fake.GetOrganizationDomainsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationDomainsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9008,15 +9099,16 @@ func (fake *FakeActor) GetOrganizationLabels(arg1 string) (map[string]types.Null fake.getOrganizationLabelsArgsForCall = append(fake.getOrganizationLabelsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationLabelsStub + fakeReturns := fake.getOrganizationLabelsReturns fake.recordInvocation("GetOrganizationLabels", []interface{}{arg1}) fake.getOrganizationLabelsMutex.Unlock() - if fake.GetOrganizationLabelsStub != nil { - return fake.GetOrganizationLabelsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9074,15 +9166,16 @@ func (fake *FakeActor) GetOrganizationQuotaByName(arg1 string) (resources.Organi fake.getOrganizationQuotaByNameArgsForCall = append(fake.getOrganizationQuotaByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationQuotaByNameStub + fakeReturns := fake.getOrganizationQuotaByNameReturns fake.recordInvocation("GetOrganizationQuotaByName", []interface{}{arg1}) fake.getOrganizationQuotaByNameMutex.Unlock() - if fake.GetOrganizationQuotaByNameStub != nil { - return fake.GetOrganizationQuotaByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationQuotaByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9139,15 +9232,16 @@ func (fake *FakeActor) GetOrganizationQuotas() ([]resources.OrganizationQuota, v ret, specificReturn := fake.getOrganizationQuotasReturnsOnCall[len(fake.getOrganizationQuotasArgsForCall)] fake.getOrganizationQuotasArgsForCall = append(fake.getOrganizationQuotasArgsForCall, struct { }{}) + stub := fake.GetOrganizationQuotasStub + fakeReturns := fake.getOrganizationQuotasReturns fake.recordInvocation("GetOrganizationQuotas", []interface{}{}) fake.getOrganizationQuotasMutex.Unlock() - if fake.GetOrganizationQuotasStub != nil { - return fake.GetOrganizationQuotasStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationQuotasReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9198,15 +9292,16 @@ func (fake *FakeActor) GetOrganizationSpaces(arg1 string) ([]resources.Space, v7 fake.getOrganizationSpacesArgsForCall = append(fake.getOrganizationSpacesArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationSpacesStub + fakeReturns := fake.getOrganizationSpacesReturns fake.recordInvocation("GetOrganizationSpaces", []interface{}{arg1}) fake.getOrganizationSpacesMutex.Unlock() - if fake.GetOrganizationSpacesStub != nil { - return fake.GetOrganizationSpacesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationSpacesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9265,15 +9360,16 @@ func (fake *FakeActor) GetOrganizationSpacesWithLabelSelector(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetOrganizationSpacesWithLabelSelectorStub + fakeReturns := fake.getOrganizationSpacesWithLabelSelectorReturns fake.recordInvocation("GetOrganizationSpacesWithLabelSelector", []interface{}{arg1, arg2}) fake.getOrganizationSpacesWithLabelSelectorMutex.Unlock() - if fake.GetOrganizationSpacesWithLabelSelectorStub != nil { - return fake.GetOrganizationSpacesWithLabelSelectorStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationSpacesWithLabelSelectorReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9331,15 +9427,16 @@ func (fake *FakeActor) GetOrganizationSummaryByName(arg1 string) (v7action.Organ fake.getOrganizationSummaryByNameArgsForCall = append(fake.getOrganizationSummaryByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetOrganizationSummaryByNameStub + fakeReturns := fake.getOrganizationSummaryByNameReturns fake.recordInvocation("GetOrganizationSummaryByName", []interface{}{arg1}) fake.getOrganizationSummaryByNameMutex.Unlock() - if fake.GetOrganizationSummaryByNameStub != nil { - return fake.GetOrganizationSummaryByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getOrganizationSummaryByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9397,15 +9494,16 @@ func (fake *FakeActor) GetOrganizations(arg1 string) ([]resources.Organization, fake.getOrganizationsArgsForCall = append(fake.getOrganizationsArgsForCall, struct { arg1 string }{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 } @@ -9464,15 +9562,16 @@ func (fake *FakeActor) GetProcessByTypeAndApplication(arg1 string, arg2 string) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetProcessByTypeAndApplicationStub + fakeReturns := fake.getProcessByTypeAndApplicationReturns fake.recordInvocation("GetProcessByTypeAndApplication", []interface{}{arg1, arg2}) fake.getProcessByTypeAndApplicationMutex.Unlock() - if fake.GetProcessByTypeAndApplicationStub != nil { - return fake.GetProcessByTypeAndApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getProcessByTypeAndApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9531,15 +9630,16 @@ func (fake *FakeActor) GetRawApplicationManifestByNameAndSpace(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetRawApplicationManifestByNameAndSpaceStub + fakeReturns := fake.getRawApplicationManifestByNameAndSpaceReturns fake.recordInvocation("GetRawApplicationManifestByNameAndSpace", []interface{}{arg1, arg2}) fake.getRawApplicationManifestByNameAndSpaceMutex.Unlock() - if fake.GetRawApplicationManifestByNameAndSpaceStub != nil { - return fake.GetRawApplicationManifestByNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRawApplicationManifestByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9598,15 +9698,16 @@ func (fake *FakeActor) GetRecentEventsByApplicationNameAndSpace(arg1 string, arg arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetRecentEventsByApplicationNameAndSpaceStub + fakeReturns := fake.getRecentEventsByApplicationNameAndSpaceReturns fake.recordInvocation("GetRecentEventsByApplicationNameAndSpace", []interface{}{arg1, arg2}) fake.getRecentEventsByApplicationNameAndSpaceMutex.Unlock() - if fake.GetRecentEventsByApplicationNameAndSpaceStub != nil { - return fake.GetRecentEventsByApplicationNameAndSpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRecentEventsByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9666,15 +9767,16 @@ func (fake *FakeActor) GetRecentLogsForApplicationByNameAndSpace(arg1 string, ar arg2 string arg3 sharedaction.LogCacheClient }{arg1, arg2, arg3}) + stub := fake.GetRecentLogsForApplicationByNameAndSpaceStub + fakeReturns := fake.getRecentLogsForApplicationByNameAndSpaceReturns fake.recordInvocation("GetRecentLogsForApplicationByNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.getRecentLogsForApplicationByNameAndSpaceMutex.Unlock() - if fake.GetRecentLogsForApplicationByNameAndSpaceStub != nil { - return fake.GetRecentLogsForApplicationByNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRecentLogsForApplicationByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9733,15 +9835,16 @@ func (fake *FakeActor) GetRevisionByApplicationAndVersion(arg1 string, arg2 int) arg1 string arg2 int }{arg1, arg2}) + stub := fake.GetRevisionByApplicationAndVersionStub + fakeReturns := fake.getRevisionByApplicationAndVersionReturns fake.recordInvocation("GetRevisionByApplicationAndVersion", []interface{}{arg1, arg2}) fake.getRevisionByApplicationAndVersionMutex.Unlock() - if fake.GetRevisionByApplicationAndVersionStub != nil { - return fake.GetRevisionByApplicationAndVersionStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRevisionByApplicationAndVersionReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9800,15 +9903,16 @@ func (fake *FakeActor) GetRevisionsByApplicationNameAndSpace(arg1 string, arg2 s 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 } @@ -9869,15 +9973,16 @@ func (fake *FakeActor) GetRouteByAttributes(arg1 resources.Domain, arg2 string, arg3 string arg4 int }{arg1, arg2, arg3, arg4}) + stub := fake.GetRouteByAttributesStub + fakeReturns := fake.getRouteByAttributesReturns fake.recordInvocation("GetRouteByAttributes", []interface{}{arg1, arg2, arg3, arg4}) fake.getRouteByAttributesMutex.Unlock() - if fake.GetRouteByAttributesStub != nil { - return fake.GetRouteByAttributesStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRouteByAttributesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -9936,15 +10041,16 @@ func (fake *FakeActor) GetRouteDestinationByAppGUID(arg1 resources.Route, arg2 s arg1 resources.Route arg2 string }{arg1, arg2}) + stub := fake.GetRouteDestinationByAppGUIDStub + fakeReturns := fake.getRouteDestinationByAppGUIDReturns fake.recordInvocation("GetRouteDestinationByAppGUID", []interface{}{arg1, arg2}) fake.getRouteDestinationByAppGUIDMutex.Unlock() - if fake.GetRouteDestinationByAppGUIDStub != nil { - return fake.GetRouteDestinationByAppGUIDStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getRouteDestinationByAppGUIDReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10000,15 +10106,16 @@ func (fake *FakeActor) GetRouteLabels(arg1 string, arg2 string) (map[string]type arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetRouteLabelsStub + fakeReturns := fake.getRouteLabelsReturns fake.recordInvocation("GetRouteLabels", []interface{}{arg1, arg2}) fake.getRouteLabelsMutex.Unlock() - if fake.GetRouteLabelsStub != nil { - return fake.GetRouteLabelsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRouteLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10071,15 +10178,16 @@ func (fake *FakeActor) GetRouteSummaries(arg1 []resources.Route) ([]v7action.Rou fake.getRouteSummariesArgsForCall = append(fake.getRouteSummariesArgsForCall, struct { arg1 []resources.Route }{arg1Copy}) + stub := fake.GetRouteSummariesStub + fakeReturns := fake.getRouteSummariesReturns fake.recordInvocation("GetRouteSummaries", []interface{}{arg1Copy}) fake.getRouteSummariesMutex.Unlock() - if fake.GetRouteSummariesStub != nil { - return fake.GetRouteSummariesStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRouteSummariesReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10136,15 +10244,16 @@ func (fake *FakeActor) GetRouterGroups() ([]v7action.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 } @@ -10193,15 +10302,16 @@ func (fake *FakeActor) GetRoutesByOrg(arg1 string, arg2 string) ([]resources.Rou arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetRoutesByOrgStub + fakeReturns := fake.getRoutesByOrgReturns fake.recordInvocation("GetRoutesByOrg", []interface{}{arg1, arg2}) fake.getRoutesByOrgMutex.Unlock() - if fake.GetRoutesByOrgStub != nil { - return fake.GetRoutesByOrgStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRoutesByOrgReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10260,15 +10370,16 @@ func (fake *FakeActor) GetRoutesBySpace(arg1 string, arg2 string) ([]resources.R arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetRoutesBySpaceStub + fakeReturns := fake.getRoutesBySpaceReturns fake.recordInvocation("GetRoutesBySpace", []interface{}{arg1, arg2}) fake.getRoutesBySpaceMutex.Unlock() - if fake.GetRoutesBySpaceStub != nil { - return fake.GetRoutesBySpaceStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getRoutesBySpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10326,15 +10437,16 @@ func (fake *FakeActor) GetSSHEnabled(arg1 string) (ccv3.SSHEnabled, v7action.War fake.getSSHEnabledArgsForCall = append(fake.getSSHEnabledArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSSHEnabledStub + fakeReturns := fake.getSSHEnabledReturns fake.recordInvocation("GetSSHEnabled", []interface{}{arg1}) fake.getSSHEnabledMutex.Unlock() - if fake.GetSSHEnabledStub != nil { - return fake.GetSSHEnabledStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSSHEnabledReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10393,15 +10505,16 @@ func (fake *FakeActor) GetSSHEnabledByAppName(arg1 string, arg2 string) (ccv3.SS arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSSHEnabledByAppNameStub + fakeReturns := fake.getSSHEnabledByAppNameReturns fake.recordInvocation("GetSSHEnabledByAppName", []interface{}{arg1, arg2}) fake.getSSHEnabledByAppNameMutex.Unlock() - if fake.GetSSHEnabledByAppNameStub != nil { - return fake.GetSSHEnabledByAppNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSSHEnabledByAppNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10458,15 +10571,16 @@ func (fake *FakeActor) GetSSHPasscode() (string, error) { ret, specificReturn := fake.getSSHPasscodeReturnsOnCall[len(fake.getSSHPasscodeArgsForCall)] fake.getSSHPasscodeArgsForCall = append(fake.getSSHPasscodeArgsForCall, struct { }{}) + stub := fake.GetSSHPasscodeStub + fakeReturns := fake.getSSHPasscodeReturns fake.recordInvocation("GetSSHPasscode", []interface{}{}) fake.getSSHPasscodeMutex.Unlock() - if fake.GetSSHPasscodeStub != nil { - return fake.GetSSHPasscodeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getSSHPasscodeReturns return fakeReturns.result1, fakeReturns.result2 } @@ -10517,15 +10631,16 @@ func (fake *FakeActor) GetSecureShellConfigurationByApplicationNameSpaceProcessT arg3 string arg4 uint }{arg1, arg2, arg3, arg4}) + stub := fake.GetSecureShellConfigurationByApplicationNameSpaceProcessTypeAndIndexStub + fakeReturns := fake.getSecureShellConfigurationByApplicationNameSpaceProcessTypeAndIndexReturns fake.recordInvocation("GetSecureShellConfigurationByApplicationNameSpaceProcessTypeAndIndex", []interface{}{arg1, arg2, arg3, arg4}) fake.getSecureShellConfigurationByApplicationNameSpaceProcessTypeAndIndexMutex.Unlock() - if fake.GetSecureShellConfigurationByApplicationNameSpaceProcessTypeAndIndexStub != nil { - return fake.GetSecureShellConfigurationByApplicationNameSpaceProcessTypeAndIndexStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSecureShellConfigurationByApplicationNameSpaceProcessTypeAndIndexReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10583,15 +10698,16 @@ func (fake *FakeActor) GetSecurityGroup(arg1 string) (resources.SecurityGroup, v fake.getSecurityGroupArgsForCall = append(fake.getSecurityGroupArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSecurityGroupStub + fakeReturns := fake.getSecurityGroupReturns fake.recordInvocation("GetSecurityGroup", []interface{}{arg1}) fake.getSecurityGroupMutex.Unlock() - if fake.GetSecurityGroupStub != nil { - return fake.GetSecurityGroupStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSecurityGroupReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10649,15 +10765,16 @@ func (fake *FakeActor) GetSecurityGroupSummary(arg1 string) (v7action.SecurityGr fake.getSecurityGroupSummaryArgsForCall = append(fake.getSecurityGroupSummaryArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSecurityGroupSummaryStub + fakeReturns := fake.getSecurityGroupSummaryReturns fake.recordInvocation("GetSecurityGroupSummary", []interface{}{arg1}) fake.getSecurityGroupSummaryMutex.Unlock() - if fake.GetSecurityGroupSummaryStub != nil { - return fake.GetSecurityGroupSummaryStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSecurityGroupSummaryReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10714,15 +10831,16 @@ func (fake *FakeActor) GetSecurityGroups() ([]v7action.SecurityGroupSummary, v7a ret, specificReturn := fake.getSecurityGroupsReturnsOnCall[len(fake.getSecurityGroupsArgsForCall)] fake.getSecurityGroupsArgsForCall = append(fake.getSecurityGroupsArgsForCall, struct { }{}) + stub := fake.GetSecurityGroupsStub + fakeReturns := fake.getSecurityGroupsReturns fake.recordInvocation("GetSecurityGroups", []interface{}{}) fake.getSecurityGroupsMutex.Unlock() - if fake.GetSecurityGroupsStub != nil { - return fake.GetSecurityGroupsStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSecurityGroupsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10775,15 +10893,16 @@ func (fake *FakeActor) GetServiceAccess(arg1 string, arg2 string, arg3 string) ( arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.GetServiceAccessStub + fakeReturns := fake.getServiceAccessReturns fake.recordInvocation("GetServiceAccess", []interface{}{arg1, arg2, arg3}) fake.getServiceAccessMutex.Unlock() - if fake.GetServiceAccessStub != nil { - return fake.GetServiceAccessStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceAccessReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10841,15 +10960,16 @@ func (fake *FakeActor) GetServiceBrokerByName(arg1 string) (resources.ServiceBro fake.getServiceBrokerByNameArgsForCall = append(fake.getServiceBrokerByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceBrokerByNameStub + fakeReturns := fake.getServiceBrokerByNameReturns fake.recordInvocation("GetServiceBrokerByName", []interface{}{arg1}) fake.getServiceBrokerByNameMutex.Unlock() - if fake.GetServiceBrokerByNameStub != nil { - return fake.GetServiceBrokerByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceBrokerByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10907,15 +11027,16 @@ func (fake *FakeActor) GetServiceBrokerLabels(arg1 string) (map[string]types.Nul fake.getServiceBrokerLabelsArgsForCall = append(fake.getServiceBrokerLabelsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetServiceBrokerLabelsStub + fakeReturns := fake.getServiceBrokerLabelsReturns fake.recordInvocation("GetServiceBrokerLabels", []interface{}{arg1}) fake.getServiceBrokerLabelsMutex.Unlock() - if fake.GetServiceBrokerLabelsStub != nil { - return fake.GetServiceBrokerLabelsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceBrokerLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -10972,15 +11093,16 @@ func (fake *FakeActor) GetServiceBrokers() ([]resources.ServiceBroker, v7action. ret, specificReturn := fake.getServiceBrokersReturnsOnCall[len(fake.getServiceBrokersArgsForCall)] fake.getServiceBrokersArgsForCall = append(fake.getServiceBrokersArgsForCall, struct { }{}) + stub := fake.GetServiceBrokersStub + fakeReturns := fake.getServiceBrokersReturns fake.recordInvocation("GetServiceBrokers", []interface{}{}) fake.getServiceBrokersMutex.Unlock() - if fake.GetServiceBrokersStub != nil { - return fake.GetServiceBrokersStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceBrokersReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11032,15 +11154,16 @@ func (fake *FakeActor) GetServiceOfferingLabels(arg1 string, arg2 string) (map[s arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetServiceOfferingLabelsStub + fakeReturns := fake.getServiceOfferingLabelsReturns fake.recordInvocation("GetServiceOfferingLabels", []interface{}{arg1, arg2}) fake.getServiceOfferingLabelsMutex.Unlock() - if fake.GetServiceOfferingLabelsStub != nil { - return fake.GetServiceOfferingLabelsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServiceOfferingLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11100,15 +11223,16 @@ func (fake *FakeActor) GetServicePlanLabels(arg1 string, arg2 string, arg3 strin arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.GetServicePlanLabelsStub + fakeReturns := fake.getServicePlanLabelsReturns fake.recordInvocation("GetServicePlanLabels", []interface{}{arg1, arg2, arg3}) fake.getServicePlanLabelsMutex.Unlock() - if fake.GetServicePlanLabelsStub != nil { - return fake.GetServicePlanLabelsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getServicePlanLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11167,15 +11291,16 @@ func (fake *FakeActor) GetSpaceByNameAndOrganization(arg1 string, arg2 string) ( arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSpaceByNameAndOrganizationStub + fakeReturns := fake.getSpaceByNameAndOrganizationReturns fake.recordInvocation("GetSpaceByNameAndOrganization", []interface{}{arg1, arg2}) fake.getSpaceByNameAndOrganizationMutex.Unlock() - if fake.GetSpaceByNameAndOrganizationStub != nil { - return fake.GetSpaceByNameAndOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceByNameAndOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11235,15 +11360,16 @@ func (fake *FakeActor) GetSpaceFeature(arg1 string, arg2 string, arg3 string) (b arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.GetSpaceFeatureStub + fakeReturns := fake.getSpaceFeatureReturns fake.recordInvocation("GetSpaceFeature", []interface{}{arg1, arg2, arg3}) fake.getSpaceFeatureMutex.Unlock() - if fake.GetSpaceFeatureStub != nil { - return fake.GetSpaceFeatureStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceFeatureReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11302,15 +11428,16 @@ func (fake *FakeActor) GetSpaceLabels(arg1 string, arg2 string) (map[string]type arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSpaceLabelsStub + fakeReturns := fake.getSpaceLabelsReturns fake.recordInvocation("GetSpaceLabels", []interface{}{arg1, arg2}) fake.getSpaceLabelsMutex.Unlock() - if fake.GetSpaceLabelsStub != nil { - return fake.GetSpaceLabelsStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11369,15 +11496,16 @@ func (fake *FakeActor) GetSpaceQuotaByName(arg1 string, arg2 string) (resources. arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSpaceQuotaByNameStub + fakeReturns := fake.getSpaceQuotaByNameReturns fake.recordInvocation("GetSpaceQuotaByName", []interface{}{arg1, arg2}) fake.getSpaceQuotaByNameMutex.Unlock() - if fake.GetSpaceQuotaByNameStub != nil { - return fake.GetSpaceQuotaByNameStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceQuotaByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11435,15 +11563,16 @@ func (fake *FakeActor) GetSpaceQuotasByOrgGUID(arg1 string) ([]resources.SpaceQu fake.getSpaceQuotasByOrgGUIDArgsForCall = append(fake.getSpaceQuotasByOrgGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceQuotasByOrgGUIDStub + fakeReturns := fake.getSpaceQuotasByOrgGUIDReturns fake.recordInvocation("GetSpaceQuotasByOrgGUID", []interface{}{arg1}) fake.getSpaceQuotasByOrgGUIDMutex.Unlock() - if fake.GetSpaceQuotasByOrgGUIDStub != nil { - return fake.GetSpaceQuotasByOrgGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceQuotasByOrgGUIDReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11502,15 +11631,16 @@ func (fake *FakeActor) GetSpaceSummaryByNameAndOrganization(arg1 string, arg2 st arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetSpaceSummaryByNameAndOrganizationStub + fakeReturns := fake.getSpaceSummaryByNameAndOrganizationReturns fake.recordInvocation("GetSpaceSummaryByNameAndOrganization", []interface{}{arg1, arg2}) fake.getSpaceSummaryByNameAndOrganizationMutex.Unlock() - if fake.GetSpaceSummaryByNameAndOrganizationStub != nil { - return fake.GetSpaceSummaryByNameAndOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceSummaryByNameAndOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11568,15 +11698,16 @@ func (fake *FakeActor) GetSpaceUsersByRoleType(arg1 string) (map[constanta.RoleT fake.getSpaceUsersByRoleTypeArgsForCall = append(fake.getSpaceUsersByRoleTypeArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetSpaceUsersByRoleTypeStub + fakeReturns := fake.getSpaceUsersByRoleTypeReturns fake.recordInvocation("GetSpaceUsersByRoleType", []interface{}{arg1}) fake.getSpaceUsersByRoleTypeMutex.Unlock() - if fake.GetSpaceUsersByRoleTypeStub != nil { - return fake.GetSpaceUsersByRoleTypeStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getSpaceUsersByRoleTypeReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11634,15 +11765,16 @@ func (fake *FakeActor) GetStackByName(arg1 string) (resources.Stack, v7action.Wa fake.getStackByNameArgsForCall = append(fake.getStackByNameArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetStackByNameStub + fakeReturns := fake.getStackByNameReturns fake.recordInvocation("GetStackByName", []interface{}{arg1}) fake.getStackByNameMutex.Unlock() - if fake.GetStackByNameStub != nil { - return fake.GetStackByNameStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStackByNameReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11700,15 +11832,16 @@ func (fake *FakeActor) GetStackLabels(arg1 string) (map[string]types.NullString, fake.getStackLabelsArgsForCall = append(fake.getStackLabelsArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetStackLabelsStub + fakeReturns := fake.getStackLabelsReturns fake.recordInvocation("GetStackLabels", []interface{}{arg1}) fake.getStackLabelsMutex.Unlock() - if fake.GetStackLabelsStub != nil { - return fake.GetStackLabelsStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStackLabelsReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11766,15 +11899,16 @@ func (fake *FakeActor) GetStacks(arg1 string) ([]resources.Stack, v7action.Warni fake.getStacksArgsForCall = append(fake.getStacksArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetStacksStub + fakeReturns := fake.getStacksReturns fake.recordInvocation("GetStacks", []interface{}{arg1}) fake.getStacksMutex.Unlock() - if fake.GetStacksStub != nil { - return fake.GetStacksStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getStacksReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11834,15 +11968,16 @@ func (fake *FakeActor) GetStreamingLogsForApplicationByNameAndSpace(arg1 string, 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 } @@ -11907,15 +12042,16 @@ func (fake *FakeActor) GetTaskBySequenceIDAndApplication(arg1 int, arg2 string) arg1 int arg2 string }{arg1, arg2}) + stub := fake.GetTaskBySequenceIDAndApplicationStub + fakeReturns := fake.getTaskBySequenceIDAndApplicationReturns fake.recordInvocation("GetTaskBySequenceIDAndApplication", []interface{}{arg1, arg2}) fake.getTaskBySequenceIDAndApplicationMutex.Unlock() - if fake.GetTaskBySequenceIDAndApplicationStub != nil { - return fake.GetTaskBySequenceIDAndApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getTaskBySequenceIDAndApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -11973,15 +12109,16 @@ func (fake *FakeActor) GetUnstagedNewestPackageGUID(arg1 string) (string, v7acti fake.getUnstagedNewestPackageGUIDArgsForCall = append(fake.getUnstagedNewestPackageGUIDArgsForCall, struct { arg1 string }{arg1}) + stub := fake.GetUnstagedNewestPackageGUIDStub + fakeReturns := fake.getUnstagedNewestPackageGUIDReturns fake.recordInvocation("GetUnstagedNewestPackageGUID", []interface{}{arg1}) fake.getUnstagedNewestPackageGUIDMutex.Unlock() - if fake.GetUnstagedNewestPackageGUIDStub != nil { - return fake.GetUnstagedNewestPackageGUIDStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.getUnstagedNewestPackageGUIDReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12040,15 +12177,16 @@ func (fake *FakeActor) GetUser(arg1 string, arg2 string) (resources.User, error) arg1 string arg2 string }{arg1, arg2}) + stub := fake.GetUserStub + fakeReturns := fake.getUserReturns fake.recordInvocation("GetUser", []interface{}{arg1, arg2}) fake.getUserMutex.Unlock() - if fake.GetUserStub != nil { - return fake.GetUserStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.getUserReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12104,15 +12242,16 @@ func (fake *FakeActor) MapRoute(arg1 string, arg2 string) (v7action.Warnings, er arg1 string arg2 string }{arg1, arg2}) + stub := fake.MapRouteStub + fakeReturns := fake.mapRouteReturns fake.recordInvocation("MapRoute", []interface{}{arg1, arg2}) fake.mapRouteMutex.Unlock() - if fake.MapRouteStub != nil { - return fake.MapRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.mapRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12167,15 +12306,16 @@ func (fake *FakeActor) Marketplace(arg1 v7action.MarketplaceFilter) ([]v7action. fake.marketplaceArgsForCall = append(fake.marketplaceArgsForCall, struct { arg1 v7action.MarketplaceFilter }{arg1}) + stub := fake.MarketplaceStub + fakeReturns := fake.marketplaceReturns fake.recordInvocation("Marketplace", []interface{}{arg1}) fake.marketplaceMutex.Unlock() - if fake.MarketplaceStub != nil { - return fake.MarketplaceStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.marketplaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12233,15 +12373,16 @@ func (fake *FakeActor) ParseAccessToken(arg1 string) (jwt.JWT, error) { fake.parseAccessTokenArgsForCall = append(fake.parseAccessTokenArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ParseAccessTokenStub + fakeReturns := fake.parseAccessTokenReturns fake.recordInvocation("ParseAccessToken", []interface{}{arg1}) fake.parseAccessTokenMutex.Unlock() - if fake.ParseAccessTokenStub != nil { - return fake.ParseAccessTokenStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.parseAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12297,15 +12438,16 @@ func (fake *FakeActor) PollBuild(arg1 string, arg2 string) (resources.Droplet, v arg1 string arg2 string }{arg1, arg2}) + stub := fake.PollBuildStub + fakeReturns := fake.pollBuildReturns fake.recordInvocation("PollBuild", []interface{}{arg1, arg2}) fake.pollBuildMutex.Unlock() - if fake.PollBuildStub != nil { - return fake.PollBuildStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pollBuildReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12363,15 +12505,16 @@ func (fake *FakeActor) PollPackage(arg1 resources.Package) (resources.Package, v fake.pollPackageArgsForCall = append(fake.pollPackageArgsForCall, struct { arg1 resources.Package }{arg1}) + stub := fake.PollPackageStub + fakeReturns := fake.pollPackageReturns fake.recordInvocation("PollPackage", []interface{}{arg1}) fake.pollPackageMutex.Unlock() - if fake.PollPackageStub != nil { - return fake.PollPackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pollPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12431,15 +12574,16 @@ func (fake *FakeActor) PollStart(arg1 resources.Application, arg2 bool, arg3 fun arg2 bool arg3 func(string) }{arg1, arg2, arg3}) + stub := fake.PollStartStub + fakeReturns := fake.pollStartReturns fake.recordInvocation("PollStart", []interface{}{arg1, arg2, arg3}) fake.pollStartMutex.Unlock() - if fake.PollStartStub != nil { - return fake.PollStartStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollStartReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12497,15 +12641,16 @@ func (fake *FakeActor) PollStartForRolling(arg1 resources.Application, arg2 stri arg3 bool arg4 func(string) }{arg1, arg2, arg3, arg4}) + stub := fake.PollStartForRollingStub + fakeReturns := fake.pollStartForRollingReturns fake.recordInvocation("PollStartForRolling", []interface{}{arg1, arg2, arg3, arg4}) fake.pollStartForRollingMutex.Unlock() - if fake.PollStartForRollingStub != nil { - return fake.PollStartForRollingStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollStartForRollingReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12560,15 +12705,16 @@ func (fake *FakeActor) PollTask(arg1 resources.Task) (resources.Task, v7action.W fake.pollTaskArgsForCall = append(fake.pollTaskArgsForCall, struct { arg1 resources.Task }{arg1}) + stub := fake.PollTaskStub + fakeReturns := fake.pollTaskReturns fake.recordInvocation("PollTask", []interface{}{arg1}) fake.pollTaskMutex.Unlock() - if fake.PollTaskStub != nil { - return fake.PollTaskStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.pollTaskReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12626,15 +12772,16 @@ func (fake *FakeActor) PollUploadBuildpackJob(arg1 ccv3.JobURL) (v7action.Warnin fake.pollUploadBuildpackJobArgsForCall = append(fake.pollUploadBuildpackJobArgsForCall, struct { arg1 ccv3.JobURL }{arg1}) + stub := fake.PollUploadBuildpackJobStub + fakeReturns := fake.pollUploadBuildpackJobReturns fake.recordInvocation("PollUploadBuildpackJob", []interface{}{arg1}) fake.pollUploadBuildpackJobMutex.Unlock() - if fake.PollUploadBuildpackJobStub != nil { - return fake.PollUploadBuildpackJobStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.pollUploadBuildpackJobReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12691,15 +12838,16 @@ func (fake *FakeActor) PrepareBuildpackBits(arg1 string, arg2 string, arg3 v7act arg2 string arg3 v7action.Downloader }{arg1, arg2, arg3}) + stub := fake.PrepareBuildpackBitsStub + fakeReturns := fake.prepareBuildpackBitsReturns fake.recordInvocation("PrepareBuildpackBits", []interface{}{arg1, arg2, arg3}) fake.prepareBuildpackBitsMutex.Unlock() - if fake.PrepareBuildpackBitsStub != nil { - return fake.PrepareBuildpackBitsStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.prepareBuildpackBitsReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12755,15 +12903,16 @@ func (fake *FakeActor) PurgeServiceOfferingByNameAndBroker(arg1 string, arg2 str arg1 string arg2 string }{arg1, arg2}) + stub := fake.PurgeServiceOfferingByNameAndBrokerStub + fakeReturns := fake.purgeServiceOfferingByNameAndBrokerReturns fake.recordInvocation("PurgeServiceOfferingByNameAndBroker", []interface{}{arg1, arg2}) fake.purgeServiceOfferingByNameAndBrokerMutex.Unlock() - if fake.PurgeServiceOfferingByNameAndBrokerStub != nil { - return fake.PurgeServiceOfferingByNameAndBrokerStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.purgeServiceOfferingByNameAndBrokerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12817,15 +12966,16 @@ func (fake *FakeActor) RefreshAccessToken() (string, error) { ret, specificReturn := fake.refreshAccessTokenReturnsOnCall[len(fake.refreshAccessTokenArgsForCall)] fake.refreshAccessTokenArgsForCall = append(fake.refreshAccessTokenArgsForCall, struct { }{}) + stub := fake.RefreshAccessTokenStub + fakeReturns := fake.refreshAccessTokenReturns fake.recordInvocation("RefreshAccessToken", []interface{}{}) fake.refreshAccessTokenMutex.Unlock() - if fake.RefreshAccessTokenStub != nil { - return fake.RefreshAccessTokenStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.refreshAccessTokenReturns return fakeReturns.result1, fakeReturns.result2 } @@ -12875,15 +13025,16 @@ func (fake *FakeActor) RenameApplicationByNameAndSpaceGUID(arg1 string, arg2 str arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.RenameApplicationByNameAndSpaceGUIDStub + fakeReturns := fake.renameApplicationByNameAndSpaceGUIDReturns fake.recordInvocation("RenameApplicationByNameAndSpaceGUID", []interface{}{arg1, arg2, arg3}) fake.renameApplicationByNameAndSpaceGUIDMutex.Unlock() - if fake.RenameApplicationByNameAndSpaceGUIDStub != nil { - return fake.RenameApplicationByNameAndSpaceGUIDStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.renameApplicationByNameAndSpaceGUIDReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -12942,15 +13093,16 @@ func (fake *FakeActor) RenameOrganization(arg1 string, arg2 string) (resources.O arg1 string arg2 string }{arg1, arg2}) + stub := fake.RenameOrganizationStub + fakeReturns := fake.renameOrganizationReturns fake.recordInvocation("RenameOrganization", []interface{}{arg1, arg2}) fake.renameOrganizationMutex.Unlock() - if fake.RenameOrganizationStub != nil { - return fake.RenameOrganizationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.renameOrganizationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -13010,15 +13162,16 @@ func (fake *FakeActor) RenameSpaceByNameAndOrganizationGUID(arg1 string, arg2 st arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.RenameSpaceByNameAndOrganizationGUIDStub + fakeReturns := fake.renameSpaceByNameAndOrganizationGUIDReturns fake.recordInvocation("RenameSpaceByNameAndOrganizationGUID", []interface{}{arg1, arg2, arg3}) fake.renameSpaceByNameAndOrganizationGUIDMutex.Unlock() - if fake.RenameSpaceByNameAndOrganizationGUIDStub != nil { - return fake.RenameSpaceByNameAndOrganizationGUIDStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.renameSpaceByNameAndOrganizationGUIDReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -13076,15 +13229,16 @@ func (fake *FakeActor) ResetOrganizationDefaultIsolationSegment(arg1 string) (v7 fake.resetOrganizationDefaultIsolationSegmentArgsForCall = append(fake.resetOrganizationDefaultIsolationSegmentArgsForCall, struct { arg1 string }{arg1}) + stub := fake.ResetOrganizationDefaultIsolationSegmentStub + fakeReturns := fake.resetOrganizationDefaultIsolationSegmentReturns fake.recordInvocation("ResetOrganizationDefaultIsolationSegment", []interface{}{arg1}) fake.resetOrganizationDefaultIsolationSegmentMutex.Unlock() - if fake.ResetOrganizationDefaultIsolationSegmentStub != nil { - return fake.ResetOrganizationDefaultIsolationSegmentStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.resetOrganizationDefaultIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2 } @@ -13140,15 +13294,16 @@ func (fake *FakeActor) ResetSpaceIsolationSegment(arg1 string, arg2 string) (str arg1 string arg2 string }{arg1, arg2}) + stub := fake.ResetSpaceIsolationSegmentStub + fakeReturns := fake.resetSpaceIsolationSegmentReturns fake.recordInvocation("ResetSpaceIsolationSegment", []interface{}{arg1, arg2}) fake.resetSpaceIsolationSegmentMutex.Unlock() - if fake.ResetSpaceIsolationSegmentStub != nil { - return fake.ResetSpaceIsolationSegmentStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.resetSpaceIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -13211,15 +13366,16 @@ func (fake *FakeActor) ResourceMatch(arg1 []sharedaction.V3Resource) ([]sharedac fake.resourceMatchArgsForCall = append(fake.resourceMatchArgsForCall, struct { arg1 []sharedaction.V3Resource }{arg1Copy}) + stub := fake.ResourceMatchStub + fakeReturns := fake.resourceMatchReturns fake.recordInvocation("ResourceMatch", []interface{}{arg1Copy}) fake.resourceMatchMutex.Unlock() - if fake.ResourceMatchStub != nil { - return fake.ResourceMatchStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.resourceMatchReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -13278,15 +13434,16 @@ func (fake *FakeActor) RestartApplication(arg1 string, arg2 bool) (v7action.Warn 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 } @@ -13340,15 +13497,16 @@ func (fake *FakeActor) RevokeAccessAndRefreshTokens() error { ret, specificReturn := fake.revokeAccessAndRefreshTokensReturnsOnCall[len(fake.revokeAccessAndRefreshTokensArgsForCall)] fake.revokeAccessAndRefreshTokensArgsForCall = append(fake.revokeAccessAndRefreshTokensArgsForCall, struct { }{}) + stub := fake.RevokeAccessAndRefreshTokensStub + fakeReturns := fake.revokeAccessAndRefreshTokensReturns fake.recordInvocation("RevokeAccessAndRefreshTokens", []interface{}{}) fake.revokeAccessAndRefreshTokensMutex.Unlock() - if fake.RevokeAccessAndRefreshTokensStub != nil { - return fake.RevokeAccessAndRefreshTokensStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.revokeAccessAndRefreshTokensReturns return fakeReturns.result1 } @@ -13394,15 +13552,16 @@ func (fake *FakeActor) RunTask(arg1 string, arg2 resources.Task) (resources.Task arg1 string arg2 resources.Task }{arg1, arg2}) + stub := fake.RunTaskStub + fakeReturns := fake.runTaskReturns fake.recordInvocation("RunTask", []interface{}{arg1, arg2}) fake.runTaskMutex.Unlock() - if fake.RunTaskStub != nil { - return fake.RunTaskStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.runTaskReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -13461,15 +13620,16 @@ func (fake *FakeActor) ScaleProcessByApplication(arg1 string, arg2 resources.Pro arg1 string arg2 resources.Process }{arg1, arg2}) + stub := fake.ScaleProcessByApplicationStub + fakeReturns := fake.scaleProcessByApplicationReturns fake.recordInvocation("ScaleProcessByApplication", []interface{}{arg1, arg2}) fake.scaleProcessByApplicationMutex.Unlock() - if fake.ScaleProcessByApplicationStub != nil { - return fake.ScaleProcessByApplicationStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.scaleProcessByApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -13526,15 +13686,16 @@ func (fake *FakeActor) ScheduleTokenRefresh(arg1 func(time.Duration) <-chan time arg2 chan struct{} arg3 chan struct{} }{arg1, arg2, arg3}) + stub := fake.ScheduleTokenRefreshStub + fakeReturns := fake.scheduleTokenRefreshReturns fake.recordInvocation("ScheduleTokenRefresh", []interface{}{arg1, arg2, arg3}) fake.scheduleTokenRefreshMutex.Unlock() - if fake.ScheduleTokenRefreshStub != nil { - return fake.ScheduleTokenRefreshStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.scheduleTokenRefreshReturns return fakeReturns.result1, fakeReturns.result2 } @@ -13590,15 +13751,16 @@ func (fake *FakeActor) SetApplicationDroplet(arg1 string, arg2 string) (v7action arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetApplicationDropletStub + fakeReturns := fake.setApplicationDropletReturns fake.recordInvocation("SetApplicationDroplet", []interface{}{arg1, arg2}) fake.setApplicationDropletMutex.Unlock() - if fake.SetApplicationDropletStub != nil { - return fake.SetApplicationDropletStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setApplicationDropletReturns return fakeReturns.result1, fakeReturns.result2 } @@ -13655,15 +13817,16 @@ func (fake *FakeActor) SetApplicationDropletByApplicationNameAndSpace(arg1 strin arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.SetApplicationDropletByApplicationNameAndSpaceStub + fakeReturns := fake.setApplicationDropletByApplicationNameAndSpaceReturns fake.recordInvocation("SetApplicationDropletByApplicationNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.setApplicationDropletByApplicationNameAndSpaceMutex.Unlock() - if fake.SetApplicationDropletByApplicationNameAndSpaceStub != nil { - return fake.SetApplicationDropletByApplicationNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setApplicationDropletByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -13724,15 +13887,16 @@ func (fake *FakeActor) SetApplicationManifest(arg1 string, arg2 []byte) (v7actio arg1 string arg2 []byte }{arg1, arg2Copy}) + stub := fake.SetApplicationManifestStub + fakeReturns := fake.setApplicationManifestReturns fake.recordInvocation("SetApplicationManifest", []interface{}{arg1, arg2Copy}) fake.setApplicationManifestMutex.Unlock() - if fake.SetApplicationManifestStub != nil { - return fake.SetApplicationManifestStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setApplicationManifestReturns return fakeReturns.result1, fakeReturns.result2 } @@ -13792,15 +13956,16 @@ func (fake *FakeActor) SetApplicationProcessHealthCheckTypeByNameAndSpace(arg1 s arg5 string arg6 int64 }{arg1, arg2, arg3, arg4, arg5, arg6}) + stub := fake.SetApplicationProcessHealthCheckTypeByNameAndSpaceStub + fakeReturns := fake.setApplicationProcessHealthCheckTypeByNameAndSpaceReturns fake.recordInvocation("SetApplicationProcessHealthCheckTypeByNameAndSpace", []interface{}{arg1, arg2, arg3, arg4, arg5, arg6}) fake.setApplicationProcessHealthCheckTypeByNameAndSpaceMutex.Unlock() - if fake.SetApplicationProcessHealthCheckTypeByNameAndSpaceStub != nil { - return fake.SetApplicationProcessHealthCheckTypeByNameAndSpaceStub(arg1, arg2, arg3, arg4, arg5, arg6) + if stub != nil { + return stub(arg1, arg2, arg3, arg4, arg5, arg6) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.setApplicationProcessHealthCheckTypeByNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -13860,15 +14025,16 @@ func (fake *FakeActor) SetEnvironmentVariableByApplicationNameAndSpace(arg1 stri arg2 string arg3 v7action.EnvironmentVariablePair }{arg1, arg2, arg3}) + stub := fake.SetEnvironmentVariableByApplicationNameAndSpaceStub + fakeReturns := fake.setEnvironmentVariableByApplicationNameAndSpaceReturns fake.recordInvocation("SetEnvironmentVariableByApplicationNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.setEnvironmentVariableByApplicationNameAndSpaceMutex.Unlock() - if fake.SetEnvironmentVariableByApplicationNameAndSpaceStub != nil { - return fake.SetEnvironmentVariableByApplicationNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setEnvironmentVariableByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -13924,15 +14090,16 @@ func (fake *FakeActor) SetEnvironmentVariableGroup(arg1 constanta.EnvironmentVar arg1 constanta.EnvironmentVariableGroupName arg2 resources.EnvironmentVariables }{arg1, arg2}) + stub := fake.SetEnvironmentVariableGroupStub + fakeReturns := fake.setEnvironmentVariableGroupReturns fake.recordInvocation("SetEnvironmentVariableGroup", []interface{}{arg1, arg2}) fake.setEnvironmentVariableGroupMutex.Unlock() - if fake.SetEnvironmentVariableGroupStub != nil { - return fake.SetEnvironmentVariableGroupStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setEnvironmentVariableGroupReturns return fakeReturns.result1, fakeReturns.result2 } @@ -13988,15 +14155,16 @@ func (fake *FakeActor) SetOrganizationDefaultIsolationSegment(arg1 string, arg2 arg1 string arg2 string }{arg1, arg2}) + stub := fake.SetOrganizationDefaultIsolationSegmentStub + fakeReturns := fake.setOrganizationDefaultIsolationSegmentReturns fake.recordInvocation("SetOrganizationDefaultIsolationSegment", []interface{}{arg1, arg2}) fake.setOrganizationDefaultIsolationSegmentMutex.Unlock() - if fake.SetOrganizationDefaultIsolationSegmentStub != nil { - return fake.SetOrganizationDefaultIsolationSegmentStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setOrganizationDefaultIsolationSegmentReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14057,15 +14225,16 @@ func (fake *FakeActor) SetSpaceManifest(arg1 string, arg2 []byte) (v7action.Warn 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 } @@ -14120,15 +14289,16 @@ func (fake *FakeActor) SetTarget(arg1 v7action.TargetSettings) (v7action.Warning fake.setTargetArgsForCall = append(fake.setTargetArgsForCall, struct { arg1 v7action.TargetSettings }{arg1}) + stub := fake.SetTargetStub + fakeReturns := fake.setTargetReturns fake.recordInvocation("SetTarget", []interface{}{arg1}) fake.setTargetMutex.Unlock() - if fake.SetTargetStub != nil { - return fake.SetTargetStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.setTargetReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14184,15 +14354,16 @@ func (fake *FakeActor) SharePrivateDomain(arg1 string, arg2 string) (v7action.Wa 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, ret.result2 } - fakeReturns := fake.sharePrivateDomainReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14247,15 +14418,16 @@ func (fake *FakeActor) StageApplicationPackage(arg1 string) (resources.Build, v7 fake.stageApplicationPackageArgsForCall = append(fake.stageApplicationPackageArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StageApplicationPackageStub + fakeReturns := fake.stageApplicationPackageReturns fake.recordInvocation("StageApplicationPackage", []interface{}{arg1}) fake.stageApplicationPackageMutex.Unlock() - if fake.StageApplicationPackageStub != nil { - return fake.StageApplicationPackageStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.stageApplicationPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -14315,15 +14487,16 @@ func (fake *FakeActor) StagePackage(arg1 string, arg2 string, arg3 string) (<-ch arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.StagePackageStub + fakeReturns := fake.stagePackageReturns fake.recordInvocation("StagePackage", []interface{}{arg1, arg2, arg3}) fake.stagePackageMutex.Unlock() - if fake.StagePackageStub != nil { - return fake.StagePackageStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.stagePackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -14381,15 +14554,16 @@ func (fake *FakeActor) StartApplication(arg1 string) (v7action.Warnings, error) fake.startApplicationArgsForCall = append(fake.startApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StartApplicationStub + fakeReturns := fake.startApplicationReturns fake.recordInvocation("StartApplication", []interface{}{arg1}) fake.startApplicationMutex.Unlock() - if fake.StartApplicationStub != nil { - return fake.StartApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.startApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14444,15 +14618,16 @@ func (fake *FakeActor) StopApplication(arg1 string) (v7action.Warnings, error) { fake.stopApplicationArgsForCall = append(fake.stopApplicationArgsForCall, struct { arg1 string }{arg1}) + stub := fake.StopApplicationStub + fakeReturns := fake.stopApplicationReturns fake.recordInvocation("StopApplication", []interface{}{arg1}) fake.stopApplicationMutex.Unlock() - if fake.StopApplicationStub != nil { - return fake.StopApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.stopApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14507,15 +14682,16 @@ func (fake *FakeActor) TerminateTask(arg1 string) (resources.Task, v7action.Warn fake.terminateTaskArgsForCall = append(fake.terminateTaskArgsForCall, struct { arg1 string }{arg1}) + stub := fake.TerminateTaskStub + fakeReturns := fake.terminateTaskReturns fake.recordInvocation("TerminateTask", []interface{}{arg1}) fake.terminateTaskMutex.Unlock() - if fake.TerminateTaskStub != nil { - return fake.TerminateTaskStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.terminateTaskReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -14572,15 +14748,16 @@ func (fake *FakeActor) UAAAPIVersion() string { ret, specificReturn := fake.uAAAPIVersionReturnsOnCall[len(fake.uAAAPIVersionArgsForCall)] fake.uAAAPIVersionArgsForCall = append(fake.uAAAPIVersionArgsForCall, struct { }{}) + stub := fake.UAAAPIVersionStub + fakeReturns := fake.uAAAPIVersionReturns fake.recordInvocation("UAAAPIVersion", []interface{}{}) fake.uAAAPIVersionMutex.Unlock() - if fake.UAAAPIVersionStub != nil { - return fake.UAAAPIVersionStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.uAAAPIVersionReturns return fakeReturns.result1 } @@ -14628,15 +14805,16 @@ func (fake *FakeActor) UnbindSecurityGroup(arg1 string, arg2 string, arg3 string arg3 string arg4 constanta.SecurityGroupLifecycle }{arg1, arg2, arg3, arg4}) + stub := fake.UnbindSecurityGroupStub + fakeReturns := fake.unbindSecurityGroupReturns fake.recordInvocation("UnbindSecurityGroup", []interface{}{arg1, arg2, arg3, arg4}) fake.unbindSecurityGroupMutex.Unlock() - if fake.UnbindSecurityGroupStub != nil { - return fake.UnbindSecurityGroupStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unbindSecurityGroupReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14692,15 +14870,16 @@ func (fake *FakeActor) UnmapRoute(arg1 string, arg2 string) (v7action.Warnings, arg1 string arg2 string }{arg1, arg2}) + stub := fake.UnmapRouteStub + fakeReturns := fake.unmapRouteReturns fake.recordInvocation("UnmapRoute", []interface{}{arg1, arg2}) fake.unmapRouteMutex.Unlock() - if fake.UnmapRouteStub != nil { - return fake.UnmapRouteStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unmapRouteReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14757,15 +14936,16 @@ func (fake *FakeActor) UnsetEnvironmentVariableByApplicationNameAndSpace(arg1 st arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.UnsetEnvironmentVariableByApplicationNameAndSpaceStub + fakeReturns := fake.unsetEnvironmentVariableByApplicationNameAndSpaceReturns fake.recordInvocation("UnsetEnvironmentVariableByApplicationNameAndSpace", []interface{}{arg1, arg2, arg3}) fake.unsetEnvironmentVariableByApplicationNameAndSpaceMutex.Unlock() - if fake.UnsetEnvironmentVariableByApplicationNameAndSpaceStub != nil { - return fake.UnsetEnvironmentVariableByApplicationNameAndSpaceStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unsetEnvironmentVariableByApplicationNameAndSpaceReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14822,15 +15002,16 @@ func (fake *FakeActor) UnsetSpaceQuota(arg1 string, arg2 string, arg3 string) (v arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.UnsetSpaceQuotaStub + fakeReturns := fake.unsetSpaceQuotaReturns fake.recordInvocation("UnsetSpaceQuota", []interface{}{arg1, arg2, arg3}) fake.unsetSpaceQuotaMutex.Unlock() - if fake.UnsetSpaceQuotaStub != nil { - return fake.UnsetSpaceQuotaStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.unsetSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14886,15 +15067,16 @@ func (fake *FakeActor) UnsharePrivateDomain(arg1 string, arg2 string) (v7action. 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, ret.result2 } - fakeReturns := fake.unsharePrivateDomainReturns return fakeReturns.result1, fakeReturns.result2 } @@ -14951,15 +15133,16 @@ func (fake *FakeActor) UpdateAppFeature(arg1 resources.Application, arg2 bool, a arg2 bool arg3 string }{arg1, arg2, arg3}) + stub := fake.UpdateAppFeatureStub + fakeReturns := fake.updateAppFeatureReturns fake.recordInvocation("UpdateAppFeature", []interface{}{arg1, arg2, arg3}) fake.updateAppFeatureMutex.Unlock() - if fake.UpdateAppFeatureStub != nil { - return fake.UpdateAppFeatureStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateAppFeatureReturns return fakeReturns.result1, fakeReturns.result2 } @@ -15014,15 +15197,16 @@ func (fake *FakeActor) UpdateApplication(arg1 resources.Application) (resources. fake.updateApplicationArgsForCall = append(fake.updateApplicationArgsForCall, struct { arg1 resources.Application }{arg1}) + stub := fake.UpdateApplicationStub + fakeReturns := fake.updateApplicationReturns fake.recordInvocation("UpdateApplication", []interface{}{arg1}) fake.updateApplicationMutex.Unlock() - if fake.UpdateApplicationStub != nil { - return fake.UpdateApplicationStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateApplicationReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -15082,15 +15266,16 @@ func (fake *FakeActor) UpdateApplicationLabelsByApplicationName(arg1 string, arg 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 } @@ -15147,15 +15332,16 @@ func (fake *FakeActor) UpdateBuildpackByNameAndStack(arg1 string, arg2 string, a arg2 string arg3 resources.Buildpack }{arg1, arg2, arg3}) + stub := fake.UpdateBuildpackByNameAndStackStub + fakeReturns := fake.updateBuildpackByNameAndStackReturns fake.recordInvocation("UpdateBuildpackByNameAndStack", []interface{}{arg1, arg2, arg3}) fake.updateBuildpackByNameAndStackMutex.Unlock() - if fake.UpdateBuildpackByNameAndStackStub != nil { - return fake.UpdateBuildpackByNameAndStackStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.updateBuildpackByNameAndStackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -15215,15 +15401,16 @@ func (fake *FakeActor) UpdateBuildpackLabelsByBuildpackNameAndStack(arg1 string, 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 } @@ -15279,15 +15466,16 @@ func (fake *FakeActor) UpdateDomainLabelsByDomainName(arg1 string, arg2 map[stri 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 } @@ -15343,15 +15531,16 @@ func (fake *FakeActor) UpdateOrganizationLabelsByOrganizationName(arg1 string, a 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 } @@ -15408,15 +15597,16 @@ func (fake *FakeActor) UpdateOrganizationQuota(arg1 string, arg2 string, arg3 v7 arg2 string arg3 v7action.QuotaLimits }{arg1, arg2, arg3}) + stub := fake.UpdateOrganizationQuotaStub + fakeReturns := fake.updateOrganizationQuotaReturns fake.recordInvocation("UpdateOrganizationQuota", []interface{}{arg1, arg2, arg3}) fake.updateOrganizationQuotaMutex.Unlock() - if fake.UpdateOrganizationQuotaStub != nil { - return fake.UpdateOrganizationQuotaStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateOrganizationQuotaReturns return fakeReturns.result1, fakeReturns.result2 } @@ -15473,15 +15663,16 @@ func (fake *FakeActor) UpdateProcessByTypeAndApplication(arg1 string, arg2 strin arg2 string arg3 resources.Process }{arg1, arg2, arg3}) + stub := fake.UpdateProcessByTypeAndApplicationStub + fakeReturns := fake.updateProcessByTypeAndApplicationReturns fake.recordInvocation("UpdateProcessByTypeAndApplication", []interface{}{arg1, arg2, arg3}) fake.updateProcessByTypeAndApplicationMutex.Unlock() - if fake.UpdateProcessByTypeAndApplicationStub != nil { - return fake.UpdateProcessByTypeAndApplicationStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateProcessByTypeAndApplicationReturns return fakeReturns.result1, fakeReturns.result2 } @@ -15538,15 +15729,16 @@ func (fake *FakeActor) UpdateRouteLabels(arg1 string, arg2 string, arg3 map[stri 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 } @@ -15602,15 +15794,16 @@ func (fake *FakeActor) UpdateSecurityGroup(arg1 string, arg2 string) (v7action.W arg1 string arg2 string }{arg1, arg2}) + stub := fake.UpdateSecurityGroupStub + fakeReturns := fake.updateSecurityGroupReturns fake.recordInvocation("UpdateSecurityGroup", []interface{}{arg1, arg2}) fake.updateSecurityGroupMutex.Unlock() - if fake.UpdateSecurityGroupStub != nil { - return fake.UpdateSecurityGroupStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSecurityGroupReturns return fakeReturns.result1, fakeReturns.result2 } @@ -15667,15 +15860,16 @@ func (fake *FakeActor) UpdateSecurityGroupGloballyEnabled(arg1 string, arg2 cons arg2 constanta.SecurityGroupLifecycle arg3 bool }{arg1, arg2, arg3}) + stub := fake.UpdateSecurityGroupGloballyEnabledStub + fakeReturns := fake.updateSecurityGroupGloballyEnabledReturns fake.recordInvocation("UpdateSecurityGroupGloballyEnabled", []interface{}{arg1, arg2, arg3}) fake.updateSecurityGroupGloballyEnabledMutex.Unlock() - if fake.UpdateSecurityGroupGloballyEnabledStub != nil { - return fake.UpdateSecurityGroupGloballyEnabledStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSecurityGroupGloballyEnabledReturns return fakeReturns.result1, fakeReturns.result2 } @@ -15731,15 +15925,16 @@ func (fake *FakeActor) UpdateServiceBroker(arg1 string, arg2 resources.ServiceBr arg1 string arg2 resources.ServiceBroker }{arg1, arg2}) + stub := fake.UpdateServiceBrokerStub + fakeReturns := fake.updateServiceBrokerReturns fake.recordInvocation("UpdateServiceBroker", []interface{}{arg1, arg2}) fake.updateServiceBrokerMutex.Unlock() - if fake.UpdateServiceBrokerStub != nil { - return fake.UpdateServiceBrokerStub(arg1, arg2) + if stub != nil { + return stub(arg1, arg2) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateServiceBrokerReturns return fakeReturns.result1, fakeReturns.result2 } @@ -15795,15 +15990,16 @@ func (fake *FakeActor) UpdateServiceBrokerLabelsByServiceBrokerName(arg1 string, 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 } @@ -15860,15 +16056,16 @@ func (fake *FakeActor) UpdateServiceOfferingLabels(arg1 string, arg2 string, arg 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 } @@ -15926,15 +16123,16 @@ func (fake *FakeActor) UpdateServicePlanLabels(arg1 string, arg2 string, arg3 st 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 } @@ -15992,15 +16190,16 @@ func (fake *FakeActor) UpdateSpaceFeature(arg1 string, arg2 string, arg3 bool, a arg3 bool arg4 string }{arg1, arg2, arg3, arg4}) + stub := fake.UpdateSpaceFeatureStub + fakeReturns := fake.updateSpaceFeatureReturns fake.recordInvocation("UpdateSpaceFeature", []interface{}{arg1, arg2, arg3, arg4}) fake.updateSpaceFeatureMutex.Unlock() - if fake.UpdateSpaceFeatureStub != nil { - return fake.UpdateSpaceFeatureStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceFeatureReturns return fakeReturns.result1, fakeReturns.result2 } @@ -16057,15 +16256,16 @@ func (fake *FakeActor) UpdateSpaceLabelsBySpaceName(arg1 string, arg2 string, ar 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 } @@ -16123,15 +16323,16 @@ func (fake *FakeActor) UpdateSpaceQuota(arg1 string, arg2 string, arg3 string, a arg3 string arg4 v7action.QuotaLimits }{arg1, arg2, arg3, arg4}) + stub := fake.UpdateSpaceQuotaStub + fakeReturns := fake.updateSpaceQuotaReturns fake.recordInvocation("UpdateSpaceQuota", []interface{}{arg1, arg2, arg3, arg4}) fake.updateSpaceQuotaMutex.Unlock() - if fake.UpdateSpaceQuotaStub != nil { - return fake.UpdateSpaceQuotaStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.updateSpaceQuotaReturns return fakeReturns.result1, fakeReturns.result2 } @@ -16187,15 +16388,16 @@ func (fake *FakeActor) UpdateStackLabelsByStackName(arg1 string, arg2 map[string 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 } @@ -16252,15 +16454,16 @@ func (fake *FakeActor) UpdateUserPassword(arg1 string, arg2 string, arg3 string) arg2 string arg3 string }{arg1, arg2, arg3}) + stub := fake.UpdateUserPasswordStub + fakeReturns := fake.updateUserPasswordReturns fake.recordInvocation("UpdateUserPassword", []interface{}{arg1, arg2, arg3}) fake.updateUserPasswordMutex.Unlock() - if fake.UpdateUserPasswordStub != nil { - return fake.UpdateUserPasswordStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1 } - fakeReturns := fake.updateUserPasswordReturns return fakeReturns.result1 } @@ -16320,15 +16523,16 @@ func (fake *FakeActor) UploadBitsPackage(arg1 resources.Package, arg2 []sharedac arg3 io.Reader arg4 int64 }{arg1, arg2Copy, arg3, arg4}) + stub := fake.UploadBitsPackageStub + fakeReturns := fake.uploadBitsPackageReturns fake.recordInvocation("UploadBitsPackage", []interface{}{arg1, arg2Copy, arg3, arg4}) fake.uploadBitsPackageMutex.Unlock() - if fake.UploadBitsPackageStub != nil { - return fake.UploadBitsPackageStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2, ret.result3 } - fakeReturns := fake.uploadBitsPackageReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -16388,15 +16592,16 @@ func (fake *FakeActor) UploadBuildpack(arg1 string, arg2 string, arg3 v7action.S arg2 string arg3 v7action.SimpleProgressBar }{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, ret.result2, ret.result3 } - fakeReturns := fake.uploadBuildpackReturns return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 } @@ -16457,15 +16662,16 @@ func (fake *FakeActor) UploadDroplet(arg1 string, arg2 string, arg3 io.Reader, a arg3 io.Reader arg4 int64 }{arg1, arg2, arg3, arg4}) + stub := fake.UploadDropletStub + fakeReturns := fake.uploadDropletReturns fake.recordInvocation("UploadDroplet", []interface{}{arg1, arg2, arg3, arg4}) fake.uploadDropletMutex.Unlock() - if fake.UploadDropletStub != nil { - return fake.UploadDropletStub(arg1, arg2, arg3, arg4) + if stub != nil { + return stub(arg1, arg2, arg3, arg4) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.uploadDropletReturns return fakeReturns.result1, fakeReturns.result2 } diff --git a/command/v7/v7fakes/fake_actor_reloader.go b/command/v7/v7fakes/fake_actor_reloader.go index e1255ff3209..ea3f8b17378 100644 --- a/command/v7/v7fakes/fake_actor_reloader.go +++ b/command/v7/v7fakes/fake_actor_reloader.go @@ -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_label_setter.go b/command/v7/v7fakes/fake_label_setter.go index 02e22a142fb..6cb7b5ee0c3 100644 --- a/command/v7/v7fakes/fake_label_setter.go +++ b/command/v7/v7fakes/fake_label_setter.go @@ -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 2d90489126e..04e4d081579 100644 --- a/command/v7/v7fakes/fake_label_unsetter.go +++ b/command/v7/v7fakes/fake_label_unsetter.go @@ -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 bfc0b61fc80..fabf627cc39 100644 --- a/command/v7/v7fakes/fake_manifest_locator.go +++ b/command/v7/v7fakes/fake_manifest_locator.go @@ -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 13f65af079f..be340f233e8 100644 --- a/command/v7/v7fakes/fake_manifest_parser.go +++ b/command/v7/v7fakes/fake_manifest_parser.go @@ -60,15 +60,16 @@ func (fake *FakeManifestParser) InterpolateAndParse(arg1 string, arg2 []string, arg2 []string arg3 []template.VarKV }{arg1, arg2Copy, arg3Copy}) + stub := fake.InterpolateAndParseStub + fakeReturns := fake.interpolateAndParseReturns fake.recordInvocation("InterpolateAndParse", []interface{}{arg1, arg2Copy, arg3Copy}) fake.interpolateAndParseMutex.Unlock() - if fake.InterpolateAndParseStub != nil { - return fake.InterpolateAndParseStub(arg1, arg2, arg3) + if stub != nil { + return stub(arg1, arg2, arg3) } if specificReturn { return ret.result1, ret.result2 } - fakeReturns := fake.interpolateAndParseReturns return fakeReturns.result1, fakeReturns.result2 } @@ -123,15 +124,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 } diff --git a/command/v7/v7fakes/fake_network_policies_actor.go b/command/v7/v7fakes/fake_network_policies_actor.go index 211c3aee628..0608e3d0ede 100644 --- a/command/v7/v7fakes/fake_network_policies_actor.go +++ b/command/v7/v7fakes/fake_network_policies_actor.go @@ -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 26c2fd5df7b..285e453c16d 100644 --- a/command/v7/v7fakes/fake_networking_actor.go +++ b/command/v7/v7fakes/fake_networking_actor.go @@ -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 6c09fcc1cf2..ccb456edbfc 100644 --- a/command/v7/v7fakes/fake_progress_bar.go +++ b/command/v7/v7fakes/fake_progress_bar.go @@ -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 311cd4e267b..441bf33abc9 100644 --- a/command/v7/v7fakes/fake_push_actor.go +++ b/command/v7/v7fakes/fake_push_actor.go @@ -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 5730fd5e306..6fa73e103f3 100644 --- a/command/v7/v7fakes/fake_remove_network_policy_actor.go +++ b/command/v7/v7fakes/fake_remove_network_policy_actor.go @@ -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 fe3ea6c5287..3297b85e7d6 100644 --- a/command/v7/v7fakes/fake_revisions_actor.go +++ b/command/v7/v7fakes/fake_revisions_actor.go @@ -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 d5d4e4357c8..d2404eac526 100644 --- a/command/v7/v7fakes/fake_set_label_actor.go +++ b/command/v7/v7fakes/fake_set_label_actor.go @@ -169,15 +169,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 } @@ -234,15 +235,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 } @@ -298,15 +300,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 } @@ -362,15 +365,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 } @@ -427,15 +431,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 } @@ -491,15 +496,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 } @@ -556,15 +562,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 } @@ -622,15 +629,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 } @@ -687,15 +695,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 } @@ -751,15 +760,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 76c98ae6491..053bc29fb16 100644 --- a/command/v7/v7fakes/fake_shared_sshactor.go +++ b/command/v7/v7fakes/fake_shared_sshactor.go @@ -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 a7feb17cb28..a07df4f523e 100644 --- a/command/v7/v7fakes/fake_v7actor_for_push.go +++ b/command/v7/v7fakes/fake_v7actor_for_push.go @@ -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/go.mod b/go.mod index e682f50581f..93e146d94f1 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-20240701140235-0ab1c0e216c8 code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 code.cloudfoundry.org/clock v1.24.0 @@ -50,7 +49,6 @@ require ( ) require ( - code.cloudfoundry.org/cli v7.1.0+incompatible // indirect code.cloudfoundry.org/inigo v0.0.0-20230612153013-b300679e6ed6 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/bmatcuk/doublestar v1.3.4 // indirect diff --git a/go.sum b/go.sum index f6767b0bc8b..f65842c9fa4 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-20240701140235-0ab1c0e216c8 h1:U9t+5gylASZzKYjaLhW4azDnGvSH4GKVhmWoMAbaLRo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20240701140235-0ab1c0e216c8/go.mod h1:cf3zRgfxIBUHx8FmX9SgiQ0QWVxRsH+begnYUdigZag= code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 h1:O+j8afQWaDuxzKGcculsjgHGK+biBTn6iMjgFpBf54c= diff --git a/plugin/pluginfakes/fake_cli_connection.go b/plugin/pluginfakes/fake_cli_connection.go index 310e915c645..2d4b239943a 100644 --- a/plugin/pluginfakes/fake_cli_connection.go +++ b/plugin/pluginfakes/fake_cli_connection.go @@ -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/rpcfakes/fake_command_runner.go b/plugin/rpc/rpcfakes/fake_command_runner.go index b50ed8307bf..12cb7da6a5e 100644 --- a/plugin/rpc/rpcfakes/fake_command_runner.go +++ b/plugin/rpc/rpcfakes/fake_command_runner.go @@ -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 ed508b1cc75..28b3674049c 100644 --- a/plugin/rpc/rpcfakes/fake_output_capture.go +++ b/plugin/rpc/rpcfakes/fake_output_capture.go @@ -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 c1bccddae71..de895397fd9 100644 --- a/plugin/rpc/rpcfakes/fake_terminal_output_switch.go +++ b/plugin/rpc/rpcfakes/fake_terminal_output_switch.go @@ -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/util/clissh/clisshfakes/fake_listener_factory.go b/util/clissh/clisshfakes/fake_listener_factory.go index 5a8b58109bf..5931ff5a6b7 100644 --- a/util/clissh/clisshfakes/fake_listener_factory.go +++ b/util/clissh/clisshfakes/fake_listener_factory.go @@ -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 f2b5238af46..52aa8936764 100644 --- a/util/clissh/clisshfakes/fake_secure_client.go +++ b/util/clissh/clisshfakes/fake_secure_client.go @@ -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 1efb6ee95be..d575c50d879 100644 --- a/util/clissh/clisshfakes/fake_secure_dialer.go +++ b/util/clissh/clisshfakes/fake_secure_dialer.go @@ -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 e13197cc1b9..8eb57643828 100644 --- a/util/clissh/clisshfakes/fake_secure_session.go +++ b/util/clissh/clisshfakes/fake_secure_session.go @@ -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 09091440d55..9680250d566 100644 --- a/util/clissh/clisshfakes/fake_terminal_helper.go +++ b/util/clissh/clisshfakes/fake_terminal_helper.go @@ -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/download/downloadfakes/fake_httpclient.go b/util/download/downloadfakes/fake_httpclient.go index 786a66d75f0..0e0e0339e3e 100644 --- a/util/download/downloadfakes/fake_httpclient.go +++ b/util/download/downloadfakes/fake_httpclient.go @@ -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 4d10ec678c4..72bf6ebcf10 100644 --- a/util/download/downloadfakes/fake_progress_bar.go +++ b/util/download/downloadfakes/fake_progress_bar.go @@ -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/ui/uifakes/fake_config.go b/util/ui/uifakes/fake_config.go index 749a0d312df..584a8fbbcbf 100644 --- a/util/ui/uifakes/fake_config.go +++ b/util/ui/uifakes/fake_config.go @@ -58,15 +58,16 @@ func (fake *FakeConfig) ColorEnabled() configv3.ColorSetting { 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 } @@ -110,15 +111,16 @@ func (fake *FakeConfig) IsTTY() bool { ret, specificReturn := fake.isTTYReturnsOnCall[len(fake.isTTYArgsForCall)] fake.isTTYArgsForCall = append(fake.isTTYArgsForCall, struct { }{}) + stub := fake.IsTTYStub + fakeReturns := fake.isTTYReturns fake.recordInvocation("IsTTY", []interface{}{}) fake.isTTYMutex.Unlock() - if fake.IsTTYStub != nil { - return fake.IsTTYStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.isTTYReturns return fakeReturns.result1 } @@ -162,15 +164,16 @@ func (fake *FakeConfig) 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 } @@ -214,15 +217,16 @@ func (fake *FakeConfig) TerminalWidth() int { ret, specificReturn := fake.terminalWidthReturnsOnCall[len(fake.terminalWidthArgsForCall)] fake.terminalWidthArgsForCall = append(fake.terminalWidthArgsForCall, struct { }{}) + stub := fake.TerminalWidthStub + fakeReturns := fake.terminalWidthReturns fake.recordInvocation("TerminalWidth", []interface{}{}) fake.terminalWidthMutex.Unlock() - if fake.TerminalWidthStub != nil { - return fake.TerminalWidthStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.terminalWidthReturns return fakeReturns.result1 } diff --git a/util/ui/uifakes/fake_exiter.go b/util/ui/uifakes/fake_exiter.go index ecb7eda5890..1e99d4e9627 100644 --- a/util/ui/uifakes/fake_exiter.go +++ b/util/ui/uifakes/fake_exiter.go @@ -22,9 +22,10 @@ func (fake *FakeExiter) Exit(arg1 int) { fake.exitArgsForCall = append(fake.exitArgsForCall, struct { arg1 int }{arg1}) + stub := fake.ExitStub fake.recordInvocation("Exit", []interface{}{arg1}) fake.exitMutex.Unlock() - if fake.ExitStub != nil { + if stub != nil { fake.ExitStub(arg1) } } diff --git a/util/ui/uifakes/fake_interactor.go b/util/ui/uifakes/fake_interactor.go index 5b53fb095b5..3d7e87682ff 100644 --- a/util/ui/uifakes/fake_interactor.go +++ b/util/ui/uifakes/fake_interactor.go @@ -32,15 +32,16 @@ func (fake *FakeInteractor) NewInteraction(arg1 string, arg2 ...interact.Choice) arg1 string arg2 []interact.Choice }{arg1, arg2}) + stub := fake.NewInteractionStub + fakeReturns := fake.newInteractionReturns fake.recordInvocation("NewInteraction", []interface{}{arg1, arg2}) fake.newInteractionMutex.Unlock() - if fake.NewInteractionStub != nil { - return fake.NewInteractionStub(arg1, arg2...) + if stub != nil { + return stub(arg1, arg2...) } if specificReturn { return ret.result1 } - fakeReturns := fake.newInteractionReturns return fakeReturns.result1 } diff --git a/util/ui/uifakes/fake_log_message.go b/util/ui/uifakes/fake_log_message.go index 603ffc7c9d4..532f7c42725 100644 --- a/util/ui/uifakes/fake_log_message.go +++ b/util/ui/uifakes/fake_log_message.go @@ -68,15 +68,16 @@ func (fake *FakeLogMessage) Message() string { ret, specificReturn := fake.messageReturnsOnCall[len(fake.messageArgsForCall)] fake.messageArgsForCall = append(fake.messageArgsForCall, struct { }{}) + stub := fake.MessageStub + fakeReturns := fake.messageReturns fake.recordInvocation("Message", []interface{}{}) fake.messageMutex.Unlock() - if fake.MessageStub != nil { - return fake.MessageStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.messageReturns return fakeReturns.result1 } @@ -120,15 +121,16 @@ func (fake *FakeLogMessage) SourceInstance() string { ret, specificReturn := fake.sourceInstanceReturnsOnCall[len(fake.sourceInstanceArgsForCall)] fake.sourceInstanceArgsForCall = append(fake.sourceInstanceArgsForCall, struct { }{}) + stub := fake.SourceInstanceStub + fakeReturns := fake.sourceInstanceReturns fake.recordInvocation("SourceInstance", []interface{}{}) fake.sourceInstanceMutex.Unlock() - if fake.SourceInstanceStub != nil { - return fake.SourceInstanceStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.sourceInstanceReturns return fakeReturns.result1 } @@ -172,15 +174,16 @@ func (fake *FakeLogMessage) SourceType() string { ret, specificReturn := fake.sourceTypeReturnsOnCall[len(fake.sourceTypeArgsForCall)] fake.sourceTypeArgsForCall = append(fake.sourceTypeArgsForCall, struct { }{}) + stub := fake.SourceTypeStub + fakeReturns := fake.sourceTypeReturns fake.recordInvocation("SourceType", []interface{}{}) fake.sourceTypeMutex.Unlock() - if fake.SourceTypeStub != nil { - return fake.SourceTypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.sourceTypeReturns return fakeReturns.result1 } @@ -224,15 +227,16 @@ func (fake *FakeLogMessage) Timestamp() time.Time { ret, specificReturn := fake.timestampReturnsOnCall[len(fake.timestampArgsForCall)] fake.timestampArgsForCall = append(fake.timestampArgsForCall, struct { }{}) + stub := fake.TimestampStub + fakeReturns := fake.timestampReturns fake.recordInvocation("Timestamp", []interface{}{}) fake.timestampMutex.Unlock() - if fake.TimestampStub != nil { - return fake.TimestampStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.timestampReturns return fakeReturns.result1 } @@ -276,15 +280,16 @@ func (fake *FakeLogMessage) Type() string { ret, specificReturn := fake.typeReturnsOnCall[len(fake.typeArgsForCall)] fake.typeArgsForCall = append(fake.typeArgsForCall, struct { }{}) + stub := fake.TypeStub + fakeReturns := fake.typeReturns fake.recordInvocation("Type", []interface{}{}) fake.typeMutex.Unlock() - if fake.TypeStub != nil { - return fake.TypeStub() + if stub != nil { + return stub() } if specificReturn { return ret.result1 } - fakeReturns := fake.typeReturns return fakeReturns.result1 } diff --git a/util/ui/uifakes/fake_resolver.go b/util/ui/uifakes/fake_resolver.go index 54a16395e40..64ef4c0cff3 100644 --- a/util/ui/uifakes/fake_resolver.go +++ b/util/ui/uifakes/fake_resolver.go @@ -40,15 +40,16 @@ func (fake *FakeResolver) Resolve(arg1 interface{}) error { fake.resolveArgsForCall = append(fake.resolveArgsForCall, struct { arg1 interface{} }{arg1}) + stub := fake.ResolveStub + fakeReturns := fake.resolveReturns fake.recordInvocation("Resolve", []interface{}{arg1}) fake.resolveMutex.Unlock() - if fake.ResolveStub != nil { - return fake.ResolveStub(arg1) + if stub != nil { + return stub(arg1) } if specificReturn { return ret.result1 } - fakeReturns := fake.resolveReturns return fakeReturns.result1 } @@ -99,9 +100,10 @@ func (fake *FakeResolver) SetIn(arg1 io.Reader) { fake.setInArgsForCall = append(fake.setInArgsForCall, struct { arg1 io.Reader }{arg1}) + stub := fake.SetInStub fake.recordInvocation("SetIn", []interface{}{arg1}) fake.setInMutex.Unlock() - if fake.SetInStub != nil { + if stub != nil { fake.SetInStub(arg1) } } @@ -130,9 +132,10 @@ func (fake *FakeResolver) SetOut(arg1 io.Writer) { fake.setOutArgsForCall = append(fake.setOutArgsForCall, struct { arg1 io.Writer }{arg1}) + stub := fake.SetOutStub fake.recordInvocation("SetOut", []interface{}{arg1}) fake.setOutMutex.Unlock() - if fake.SetOutStub != nil { + if stub != nil { fake.SetOutStub(arg1) } } diff --git a/util/utilfakes/fake_sha1checksum.go b/util/utilfakes/fake_sha1checksum.go index 2acb609042f..509146c8208 100644 --- a/util/utilfakes/fake_sha1checksum.go +++ b/util/utilfakes/fake_sha1checksum.go @@ -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) } } From e6dead57f19e5b76456a9c169af6809ab7d94920 Mon Sep 17 00:00:00 2001 From: jcvrabo <122891959+jcvrabo@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:51:19 +0100 Subject: [PATCH 4/4] refresh go.sum with upstream dependency updates --- go.sum | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/go.sum b/go.sum index f65842c9fa4..9f5831ec89c 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.23.0 h1:9Uiv5p/Zbk90C8bM40yRvZLvJP/aS9Fa18et1TQ+LDU= +code.cloudfoundry.org/bytefmt v0.23.0/go.mod h1:TWmOCYLHeY0a4IqJt6BiVYZMrW9UjR7E6WDzPznhJ24= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20240701140235-0ab1c0e216c8 h1:U9t+5gylASZzKYjaLhW4azDnGvSH4GKVhmWoMAbaLRo= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20240701140235-0ab1c0e216c8/go.mod h1:cf3zRgfxIBUHx8FmX9SgiQ0QWVxRsH+begnYUdigZag= 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.26.0 h1:Udazq6dtP05PIijuNUpwVx4uTAYYDUyKJknQztdLk4o= +code.cloudfoundry.org/clock v1.26.0/go.mod h1:oHQbA1o/GKc6zNgvgl0jTLL0G7Yu2elP0RAfY0YpOBk= 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,10 +19,10 @@ 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.20.0 h1:aCjRDUuSaoAM2GT8QGnZEIru8uzpI+bn3sQY+jtQjFs= +code.cloudfoundry.org/lager/v3 v3.20.0/go.mod h1:GQeGmRFw0OlbsXHzTvu7mTKMA0nz1IoT5wvuoY9fYk8= +code.cloudfoundry.org/tlsconfig v0.14.0 h1:VqUDzLvrYTMF8tfuTSEFoynouR+7k2tZsIjIsHfepOM= +code.cloudfoundry.org/tlsconfig v0.14.0/go.mod h1:5PijwOC6oYPIrEGFmYmv+eqLnXjvVIxnGMz3RPn/4vA= 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= @@ -62,8 +62,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.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM= +github.com/cyphar/filepath-securejoin v0.3.6/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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -113,8 +113,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20241206021119-61a79c692802 h1:US08AXzP0bLurpzFUV3Poa9ZijrRdd1zAIOVtoHEiS8= -github.com/google/pprof v0.0.0-20241206021119-61a79c692802/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/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/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -152,8 +152,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D 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/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.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= @@ -171,8 +171,8 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.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.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM= +github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM= 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= @@ -181,8 +181,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= @@ -214,8 +214,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26 h1:mWCRvpoEMVlslxEvvptKgIUb35va9yj9Oq5wGw/er5I= github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26/go.mod h1:0uD3VMXkZ7Bw0ojGCwDzebBBzPBXtzEZeXai+56BLX4= github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958 h1:mueRRuRjR35dEOkHdhpoRcruNgBz0ohG659HxxmcAwA= @@ -226,8 +226,8 @@ github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmgl github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -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.56.0 h1:KcFfV76cI9Xaw8bdSc9x55skyuSdcHcTdL37vvVZnvY= +go.step.sm/crypto v0.56.0/go.mod h1:snWNloxY9s1W+HsFqcviq55nvzbqqX6LxVt0Vktv5mw= 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= @@ -263,8 +263,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -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.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -354,8 +354,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=