diff --git a/command/v7/app_command.go b/command/v7/app_command.go
index 5b43ea37d1c..329acdcf448 100644
--- a/command/v7/app_command.go
+++ b/command/v7/app_command.go
@@ -69,7 +69,7 @@ func (cmd AppCommand) Execute(args []string) error {
appSummaryDisplayer := shared.NewAppSummaryDisplayer(cmd.UI)
summary, warnings, err := cmd.Actor.GetDetailedAppSummary(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID, false)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -80,7 +80,7 @@ func (cmd AppCommand) Execute(args []string) error {
func (cmd AppCommand) displayAppGUID() error {
app, warnings, err := cmd.Actor.GetApplicationByNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/apply_manifest_command.go b/command/v7/apply_manifest_command.go
index 6829cabd042..f03b22b2856 100644
--- a/command/v7/apply_manifest_command.go
+++ b/command/v7/apply_manifest_command.go
@@ -102,7 +102,7 @@ func (cmd ApplyManifestCommand) Execute(args []string) error {
}
warnings, err := cmd.Actor.SetSpaceManifest(cmd.Config.TargetedSpace().GUID, cmd.Parser.FullRawManifest())
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/apps_command.go b/command/v7/apps_command.go
index 5a5554d0dc0..6be04328a1d 100644
--- a/command/v7/apps_command.go
+++ b/command/v7/apps_command.go
@@ -61,7 +61,7 @@ func (cmd AppsCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
summaries, warnings, err := cmd.Actor.GetAppSummariesForSpace(cmd.Config.TargetedSpace().GUID, cmd.Labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/buildpacks_command.go b/command/v7/buildpacks_command.go
index d9d46e1a336..c97259c3919 100644
--- a/command/v7/buildpacks_command.go
+++ b/command/v7/buildpacks_command.go
@@ -60,7 +60,7 @@ func (cmd BuildpacksCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
buildpacks, warnings, err := cmd.Actor.GetBuildpacks(cmd.Labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/cancel_deployment_command.go b/command/v7/cancel_deployment_command.go
index 248fc992e80..9cb7576a760 100644
--- a/command/v7/cancel_deployment_command.go
+++ b/command/v7/cancel_deployment_command.go
@@ -64,19 +64,19 @@ func (cmd *CancelDeploymentCommand) Execute(args []string) error {
)
application, warnings, err := cmd.Actor.GetApplicationByNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
deployment, warnings, err := cmd.Actor.GetLatestActiveDeploymentForApp(application.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
warnings, err = cmd.Actor.CancelDeployment(deployment.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/check_route_command.go b/command/v7/check_route_command.go
index 1076ae1562b..427564be8b5 100644
--- a/command/v7/check_route_command.go
+++ b/command/v7/check_route_command.go
@@ -57,7 +57,7 @@ func (cmd CheckRouteCommand) Execute(args []string) error {
path := cmd.Path.Path
matches, warnings, err := cmd.Actor.CheckRoute(cmd.RequiredArgs.Domain, cmd.Hostname, path)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
diff --git a/command/v7/create_app_command.go b/command/v7/create_app_command.go
index de9a64443a3..94201919c98 100644
--- a/command/v7/create_app_command.go
+++ b/command/v7/create_app_command.go
@@ -68,7 +68,7 @@ func (cmd CreateAppCommand) Execute(args []string) error {
},
cmd.Config.TargetedSpace().GUID,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
switch err.(type) {
case ccerror.NameNotUniqueInSpaceError:
diff --git a/command/v7/create_app_manifest_command.go b/command/v7/create_app_manifest_command.go
index 10306811321..f15bcd2558e 100644
--- a/command/v7/create_app_manifest_command.go
+++ b/command/v7/create_app_manifest_command.go
@@ -74,7 +74,7 @@ func (cmd CreateAppManifestCommand) Execute(args []string) error {
spaceGUID := cmd.Config.TargetedSpace().GUID
manifestBytes, warnings, err := cmd.Actor.GetRawApplicationManifestByNameAndSpace(appName, spaceGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/create_buildpack_command.go b/command/v7/create_buildpack_command.go
index 87715cfa801..4fe5ce23934 100644
--- a/command/v7/create_buildpack_command.go
+++ b/command/v7/create_buildpack_command.go
@@ -90,7 +90,7 @@ func (cmd CreateBuildpackCommand) Execute(args []string) error {
Position: types.NullInt{IsSet: true, Value: cmd.RequiredArgs.Position},
Enabled: types.NullBool{IsSet: true, Value: !cmd.Disable},
})
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -102,10 +102,10 @@ func (cmd CreateBuildpackCommand) Execute(args []string) error {
})
jobURL, warnings, err := cmd.Actor.UploadBuildpack(createdBuildpack.GUID, pathToBuildpackBits, cmd.ProgressBar)
if _, ok := err.(ccerror.InvalidAuthTokenError); ok {
- cmd.UI.DisplayWarnings([]string{"Failed to upload buildpack due to auth token expiration, retrying..."})
+ cmd.UI.DisplayWarningsV7([]string{"Failed to upload buildpack due to auth token expiration, retrying..."})
jobURL, warnings, err = cmd.Actor.UploadBuildpack(createdBuildpack.GUID, pathToBuildpackBits, cmd.ProgressBar)
}
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return cmd.wrapWithTip(err)
}
@@ -115,7 +115,7 @@ func (cmd CreateBuildpackCommand) Execute(args []string) error {
"BuildpackName": cmd.RequiredArgs.Buildpack,
})
warnings, err = cmd.Actor.PollUploadBuildpackJob(jobURL)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return cmd.wrapWithTip(err)
diff --git a/command/v7/create_org_command.go b/command/v7/create_org_command.go
index 436e9259193..5134770e369 100644
--- a/command/v7/create_org_command.go
+++ b/command/v7/create_org_command.go
@@ -62,7 +62,7 @@ func (cmd CreateOrgCommand) Execute(args []string) error {
_, warnings, err := cmd.Actor.CreateOrganization(orgName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(ccerror.OrganizationNameTakenError); ok {
cmd.UI.DisplayText(err.Error())
diff --git a/command/v7/create_package_command.go b/command/v7/create_package_command.go
index 64cfc37b21f..cbc50c15921 100644
--- a/command/v7/create_package_command.go
+++ b/command/v7/create_package_command.go
@@ -77,7 +77,7 @@ func (cmd CreatePackageCommand) Execute(args []string) error {
pkg, warnings, err = cmd.Actor.CreateAndUploadBitsPackageByApplicationNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID, string(cmd.AppPath))
}
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/create_private_domain_command.go b/command/v7/create_private_domain_command.go
index 59a967b262b..479b132de39 100644
--- a/command/v7/create_private_domain_command.go
+++ b/command/v7/create_private_domain_command.go
@@ -62,7 +62,7 @@ func (cmd CreatePrivateDomainCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.CreatePrivateDomain(domain, orgName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/create_route_command.go b/command/v7/create_route_command.go
index 6730a13a231..02f1b41c787 100644
--- a/command/v7/create_route_command.go
+++ b/command/v7/create_route_command.go
@@ -72,7 +72,7 @@ func (cmd CreateRouteCommand) Execute(args []string) error {
_, warnings, err := cmd.Actor.CreateRoute(spaceGUID, domain, hostname, pathName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(actionerror.RouteAlreadyExistsError); ok {
cmd.UI.DisplayWarningV7(err.Error())
diff --git a/command/v7/create_service_broker_command.go b/command/v7/create_service_broker_command.go
index 53e03f05f06..d2d146d0a25 100644
--- a/command/v7/create_service_broker_command.go
+++ b/command/v7/create_service_broker_command.go
@@ -77,7 +77,7 @@ func (cmd *CreateServiceBrokerCommand) Execute(args []string) error {
}
warnings, err := cmd.Actor.CreateServiceBroker(cmd.RequiredArgs.ServiceBroker, cmd.RequiredArgs.Username, cmd.RequiredArgs.Password, cmd.RequiredArgs.URL, space.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err == nil {
cmd.UI.DisplayOK()
diff --git a/command/v7/create_shared_domain_command.go b/command/v7/create_shared_domain_command.go
index 9228062850f..344c2061f56 100644
--- a/command/v7/create_shared_domain_command.go
+++ b/command/v7/create_shared_domain_command.go
@@ -61,7 +61,7 @@ func (cmd CreateSharedDomainCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.CreateSharedDomain(domain, cmd.Internal)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/create_space_command.go b/command/v7/create_space_command.go
index 3db63bfbc2d..f03e77ac746 100644
--- a/command/v7/create_space_command.go
+++ b/command/v7/create_space_command.go
@@ -63,7 +63,7 @@ func (cmd CreateSpaceCommand) Execute(args []string) error {
} else {
orgName = cmd.Organization
org, warnings, err := cmd.Actor.GetOrganizationByName(orgName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -86,7 +86,7 @@ func (cmd CreateSpaceCommand) Execute(args []string) error {
_, warnings, err := cmd.Actor.CreateSpace(spaceName, orgGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(actionerror.SpaceAlreadyExistsError); ok {
cmd.UI.DisplayText(err.Error())
diff --git a/command/v7/create_user_command.go b/command/v7/create_user_command.go
index 3aa08eee7da..6ff6695849d 100644
--- a/command/v7/create_user_command.go
+++ b/command/v7/create_user_command.go
@@ -103,7 +103,7 @@ func (cmd *CreateUserCommand) Execute(args []string) error {
})
_, warnings, err := cmd.Actor.CreateUser(cmd.Args.Username, password, cmd.Origin)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(uaa.ConflictError); ok {
diff --git a/command/v7/delete_buildpack_command.go b/command/v7/delete_buildpack_command.go
index 8ca8efaa6b6..882a2f27b73 100644
--- a/command/v7/delete_buildpack_command.go
+++ b/command/v7/delete_buildpack_command.go
@@ -76,7 +76,7 @@ func (cmd DeleteBuildpackCommand) Execute(args []string) error {
})
}
warnings, err := cmd.Actor.DeleteBuildpackByNameAndStack(cmd.RequiredArgs.Buildpack, cmd.Stack)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
switch err.(type) {
diff --git a/command/v7/delete_command.go b/command/v7/delete_command.go
index 5fc2772988e..ab3381b06c0 100644
--- a/command/v7/delete_command.go
+++ b/command/v7/delete_command.go
@@ -90,7 +90,7 @@ func (cmd DeleteCommand) Execute(args []string) error {
cmd.Config.TargetedSpace().GUID,
cmd.DeleteMappedRoutes,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
switch err.(type) {
case actionerror.ApplicationNotFoundError:
diff --git a/command/v7/delete_org_command.go b/command/v7/delete_org_command.go
index fd947f6d57b..c506728f3c7 100644
--- a/command/v7/delete_org_command.go
+++ b/command/v7/delete_org_command.go
@@ -76,7 +76,7 @@ func (cmd *DeleteOrgCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.DeleteOrganization(cmd.RequiredArgs.Organization)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
switch err.(type) {
case actionerror.OrganizationNotFoundError:
diff --git a/command/v7/delete_orphaned_routes_command.go b/command/v7/delete_orphaned_routes_command.go
index 5b1eee458c4..a5cf9fda3e8 100644
--- a/command/v7/delete_orphaned_routes_command.go
+++ b/command/v7/delete_orphaned_routes_command.go
@@ -74,7 +74,7 @@ func (cmd DeleteOrphanedRoutesCommand) Execute(args []string) error {
warnings, err := cmd.Actor.DeleteOrphanedRoutes(cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/delete_service_broker_command.go b/command/v7/delete_service_broker_command.go
index 9b94af7c3c7..103c99d329a 100644
--- a/command/v7/delete_service_broker_command.go
+++ b/command/v7/delete_service_broker_command.go
@@ -74,7 +74,7 @@ func (cmd DeleteServiceBrokerCommand) Execute(args []string) error {
serviceBroker, warnings, err := cmd.Actor.GetServiceBrokerByName(serviceBrokerName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(actionerror.ServiceBrokerNotFoundError); ok {
// TODO: Verify the correct error message to display for idempotent case
@@ -90,7 +90,7 @@ func (cmd DeleteServiceBrokerCommand) Execute(args []string) error {
warnings, err = cmd.Actor.DeleteServiceBroker(serviceBroker.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/delete_shared_domain_command.go b/command/v7/delete_shared_domain_command.go
index 7152826ff88..c233d5cfb7c 100644
--- a/command/v7/delete_shared_domain_command.go
+++ b/command/v7/delete_shared_domain_command.go
@@ -80,7 +80,7 @@ func (cmd DeleteSharedDomainCommand) Execute(args []string) error {
})
domain, warnings, err := cmd.Actor.GetDomainByName(domainName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(actionerror.DomainNotFoundError); ok {
@@ -99,7 +99,7 @@ func (cmd DeleteSharedDomainCommand) Execute(args []string) error {
}
warnings, err = cmd.Actor.DeleteDomain(domain)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/delete_space_command.go b/command/v7/delete_space_command.go
index c109790e571..140ee0886a8 100644
--- a/command/v7/delete_space_command.go
+++ b/command/v7/delete_space_command.go
@@ -92,7 +92,7 @@ func (cmd DeleteSpaceCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.DeleteSpaceByNameAndOrganizationName(cmd.RequiredArgs.Space, orgName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
switch err.(type) {
case actionerror.SpaceNotFoundError:
diff --git a/command/v7/delete_user_command.go b/command/v7/delete_user_command.go
index 28ea47e0cc9..40b0e76aca1 100644
--- a/command/v7/delete_user_command.go
+++ b/command/v7/delete_user_command.go
@@ -93,7 +93,7 @@ func (cmd *DeleteUserCommand) Execute(args []string) error {
return err
}
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
cmd.UI.DisplayOK()
return nil
diff --git a/command/v7/disable_feature_flag_command.go b/command/v7/disable_feature_flag_command.go
index d6151ce53ce..3e01278c898 100644
--- a/command/v7/disable_feature_flag_command.go
+++ b/command/v7/disable_feature_flag_command.go
@@ -58,7 +58,7 @@ func (cmd DisableFeatureFlagCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.DisableFeatureFlag(cmd.RequiredArgs.Feature)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/disable_ssh_command.go b/command/v7/disable_ssh_command.go
index 89a0823115a..dbc97d1b3c1 100644
--- a/command/v7/disable_ssh_command.go
+++ b/command/v7/disable_ssh_command.go
@@ -63,14 +63,14 @@ func (cmd *DisableSSHCommand) Execute(args []string) error {
if err != nil {
return err
}
- cmd.UI.DisplayWarnings(getAppWarnings)
+ cmd.UI.DisplayWarningsV7(getAppWarnings)
appFeature, getAppFeatureWarnings, err := cmd.Actor.GetAppFeature(app.GUID, "ssh")
if err != nil {
return err
}
- cmd.UI.DisplayWarnings(getAppFeatureWarnings)
+ cmd.UI.DisplayWarningsV7(getAppFeatureWarnings)
if !appFeature.Enabled {
cmd.UI.DisplayTextWithFlavor("ssh support for app '{{.AppName}}' is already disabled.", map[string]interface{}{
@@ -83,7 +83,7 @@ func (cmd *DisableSSHCommand) Execute(args []string) error {
return err
}
- cmd.UI.DisplayWarnings(updateSSHWarnings)
+ cmd.UI.DisplayWarningsV7(updateSSHWarnings)
cmd.UI.DisplayOK()
return nil
}
diff --git a/command/v7/domains_command.go b/command/v7/domains_command.go
index 76e6ee763cd..25f0215b7cd 100644
--- a/command/v7/domains_command.go
+++ b/command/v7/domains_command.go
@@ -60,7 +60,7 @@ func (cmd DomainsCommand) Execute(args []string) error {
})
domains, warnings, err := cmd.Actor.GetOrganizationDomains(targetedOrg.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/droplets_command.go b/command/v7/droplets_command.go
index 49f50191821..5e4c2d3d7bf 100644
--- a/command/v7/droplets_command.go
+++ b/command/v7/droplets_command.go
@@ -66,7 +66,7 @@ func (cmd DropletsCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
droplets, warnings, err := cmd.Actor.GetApplicationDroplets(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/enable_feature_flag_command.go b/command/v7/enable_feature_flag_command.go
index 14c667e63d1..968d09bb1f6 100644
--- a/command/v7/enable_feature_flag_command.go
+++ b/command/v7/enable_feature_flag_command.go
@@ -58,7 +58,7 @@ func (cmd EnableFeatureFlagCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.EnableFeatureFlag(cmd.RequiredArgs.Feature)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/enable_ssh_command.go b/command/v7/enable_ssh_command.go
index a29b54680ad..9747d7dacbd 100644
--- a/command/v7/enable_ssh_command.go
+++ b/command/v7/enable_ssh_command.go
@@ -64,14 +64,14 @@ func (cmd *EnableSSHCommand) Execute(args []string) error {
if err != nil {
return err
}
- cmd.UI.DisplayWarnings(getAppWarnings)
+ cmd.UI.DisplayWarningsV7(getAppWarnings)
appFeature, getAppFeatureWarnings, err := cmd.Actor.GetAppFeature(app.GUID, "ssh")
if err != nil {
return err
}
- cmd.UI.DisplayWarnings(getAppFeatureWarnings)
+ cmd.UI.DisplayWarningsV7(getAppFeatureWarnings)
if appFeature.Enabled {
cmd.UI.DisplayTextWithFlavor("ssh support for app '{{.AppName}}' is already enabled.", map[string]interface{}{
@@ -83,13 +83,13 @@ func (cmd *EnableSSHCommand) Execute(args []string) error {
if err != nil {
return err
}
- cmd.UI.DisplayWarnings(updateSSHWarnings)
+ cmd.UI.DisplayWarningsV7(updateSSHWarnings)
sshEnabled, getSSHEnabledWarnings, err := cmd.Actor.GetSSHEnabled(app.GUID)
if err != nil {
return err
}
- cmd.UI.DisplayWarnings(getSSHEnabledWarnings)
+ cmd.UI.DisplayWarningsV7(getSSHEnabledWarnings)
cmd.UI.DisplayOK()
diff --git a/command/v7/env_command.go b/command/v7/env_command.go
index 9a901a3cb7e..0f000a60ad7 100644
--- a/command/v7/env_command.go
+++ b/command/v7/env_command.go
@@ -69,7 +69,7 @@ func (cmd EnvCommand) Execute(_ []string) error {
appName,
cmd.Config.TargetedSpace().GUID,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/events_command.go b/command/v7/events_command.go
index 2ec5b994944..e4895d13ffb 100644
--- a/command/v7/events_command.go
+++ b/command/v7/events_command.go
@@ -64,7 +64,7 @@ func (cmd EventsCommand) Execute(_ []string) error {
appName,
cmd.Config.TargetedSpace().GUID,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/feature_flag_command.go b/command/v7/feature_flag_command.go
index abc9f843b12..c2d9b3cd6f8 100644
--- a/command/v7/feature_flag_command.go
+++ b/command/v7/feature_flag_command.go
@@ -60,7 +60,7 @@ func (cmd FeatureFlagCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
featureFlag, warnings, err := cmd.Actor.GetFeatureFlagByName(cmd.RequiredArgs.Feature)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/feature_flags_command.go b/command/v7/feature_flags_command.go
index 2f0431d685b..c4c6086ddcf 100644
--- a/command/v7/feature_flags_command.go
+++ b/command/v7/feature_flags_command.go
@@ -56,7 +56,7 @@ func (cmd FeatureFlagsCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
flags, warnings, err := cmd.Actor.GetFeatureFlags()
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/get_health_check_command.go b/command/v7/get_health_check_command.go
index 7c0122e23dd..fb1f0461566 100644
--- a/command/v7/get_health_check_command.go
+++ b/command/v7/get_health_check_command.go
@@ -62,7 +62,7 @@ func (cmd GetHealthCheckCommand) Execute(args []string) error {
})
processHealthChecks, warnings, err := cmd.Actor.GetApplicationProcessHealthChecksByNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/labels_command.go b/command/v7/labels_command.go
index e4d37666e58..5bb3114a01d 100644
--- a/command/v7/labels_command.go
+++ b/command/v7/labels_command.go
@@ -88,7 +88,7 @@ func (cmd LabelsCommand) Execute(args []string) error {
default:
err = fmt.Errorf("Unsupported resource type of '%s'", cmd.RequiredArgs.ResourceType)
}
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/map_route_command.go b/command/v7/map_route_command.go
index 712ea984f11..ada5fd26956 100644
--- a/command/v7/map_route_command.go
+++ b/command/v7/map_route_command.go
@@ -60,14 +60,14 @@ func (cmd MapRouteCommand) Execute(args []string) error {
}
domain, warnings, err := cmd.Actor.GetDomainByName(cmd.RequiredArgs.Domain)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
spaceGUID := cmd.Config.TargetedSpace().GUID
app, warnings, err := cmd.Actor.GetApplicationByNameAndSpace(cmd.RequiredArgs.App, spaceGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -75,7 +75,7 @@ func (cmd MapRouteCommand) Execute(args []string) error {
path := cmd.Path.Path
route, warnings, err := cmd.Actor.GetRouteByAttributes(domain.Name, domain.GUID, cmd.Hostname, path)
fqdn := desiredFQDN(domain.Name, cmd.Hostname, path)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(actionerror.RouteNotFoundError); !ok {
return err
@@ -93,7 +93,7 @@ func (cmd MapRouteCommand) Execute(args []string) error {
cmd.Hostname,
path,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -108,7 +108,7 @@ func (cmd MapRouteCommand) Execute(args []string) error {
"OrgName": cmd.Config.TargetedOrganization().Name,
})
dest, warnings, err := cmd.Actor.GetRouteDestinationByAppGUID(route.GUID, app.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(actionerror.RouteDestinationNotFoundError); !ok {
return err
@@ -123,7 +123,7 @@ func (cmd MapRouteCommand) Execute(args []string) error {
return nil
}
warnings, err = cmd.Actor.MapRoute(route.GUID, app.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/org_command.go b/command/v7/org_command.go
index 3bb035cbbf9..55d8d83fb80 100644
--- a/command/v7/org_command.go
+++ b/command/v7/org_command.go
@@ -64,7 +64,7 @@ func (cmd OrgCommand) Execute(args []string) error {
func (cmd OrgCommand) displayOrgGUID() error {
org, warnings, err := cmd.Actor.GetOrganizationByName(cmd.RequiredArgs.Organization)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -89,7 +89,7 @@ func (cmd OrgCommand) displayOrgSummary() error {
cmd.UI.DisplayNewline()
orgSummary, warnings, err := cmd.Actor.GetOrganizationSummaryByName(cmd.RequiredArgs.Organization)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -101,7 +101,7 @@ func (cmd OrgCommand) displayOrgSummary() error {
}
isolationSegments, v7Warnings, err := cmd.Actor.GetIsolationSegmentsByOrganization(orgSummary.GUID)
- cmd.UI.DisplayWarnings(v7Warnings)
+ cmd.UI.DisplayWarningsV7(v7Warnings)
if err != nil {
return err
}
diff --git a/command/v7/orgs_command.go b/command/v7/orgs_command.go
index 43289228714..f02f719ae6e 100644
--- a/command/v7/orgs_command.go
+++ b/command/v7/orgs_command.go
@@ -58,7 +58,7 @@ func (cmd OrgsCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
orgs, warnings, err := cmd.Actor.GetOrganizations(cmd.Labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/packages_command.go b/command/v7/packages_command.go
index 530d60f8d9e..4da610fe6f6 100644
--- a/command/v7/packages_command.go
+++ b/command/v7/packages_command.go
@@ -64,7 +64,7 @@ func (cmd PackagesCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
packages, warnings, err := cmd.Actor.GetApplicationPackages(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/push_command.go b/command/v7/push_command.go
index 79cfabe2456..4ea494f7559 100644
--- a/command/v7/push_command.go
+++ b/command/v7/push_command.go
@@ -190,7 +190,7 @@ func (cmd PushCommand) Execute(args []string) error {
transformedRawManifest,
)
- cmd.UI.DisplayWarnings(v7ActionWarnings)
+ cmd.UI.DisplayWarningsV7(v7ActionWarnings)
if err != nil {
return err
}
@@ -204,7 +204,7 @@ func (cmd PushCommand) Execute(args []string) error {
transformedManifest,
flagOverrides,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -477,7 +477,7 @@ func (cmd PushCommand) displayAppSummary(plan v7pushaction.PushPlan) error {
cmd.Config.TargetedSpace().GUID,
true,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -489,7 +489,7 @@ func (cmd PushCommand) displayAppSummary(plan v7pushaction.PushPlan) error {
func (cmd PushCommand) eventStreamHandler(eventStream <-chan *v7pushaction.PushEvent) error {
for event := range eventStream {
- cmd.UI.DisplayWarnings(event.Warnings)
+ cmd.UI.DisplayWarningsV7(event.Warnings)
if event.Err != nil {
return event.Err
}
@@ -537,7 +537,7 @@ func (cmd PushCommand) processEvent(event v7pushaction.Event, appName string) er
cmd.UI.DisplayNewline()
cmd.UI.DisplayText("Staging app and tracing logs...")
logStream, errStream, warnings, err := cmd.VersionActor.GetStreamingLogsForApplicationByNameAndSpace(appName, cmd.Config.TargetedSpace().GUID, cmd.NOAAClient)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/rename_command.go b/command/v7/rename_command.go
index 684da2f3efa..c33cc43ff70 100644
--- a/command/v7/rename_command.go
+++ b/command/v7/rename_command.go
@@ -62,7 +62,7 @@ func (cmd RenameCommand) Execute(args []string) error {
)
_, warnings, err := cmd.Actor.RenameApplicationByNameAndSpaceGUID(oldName, newName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/rename_org_command.go b/command/v7/rename_org_command.go
index db97d26d496..e995962eac5 100644
--- a/command/v7/rename_org_command.go
+++ b/command/v7/rename_org_command.go
@@ -64,7 +64,7 @@ func (cmd RenameOrgCommand) Execute(args []string) error {
cmd.RequiredArgs.OldOrgName,
cmd.RequiredArgs.NewOrgName,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/rename_space_command.go b/command/v7/rename_space_command.go
index 3ef3f415ed8..68201e84a07 100644
--- a/command/v7/rename_space_command.go
+++ b/command/v7/rename_space_command.go
@@ -65,7 +65,7 @@ func (cmd RenameSpaceCommand) Execute(args []string) error {
cmd.RequiredArgs.NewSpaceName,
cmd.Config.TargetedOrganization().GUID,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/reset_space_isolation_segment_command.go b/command/v7/reset_space_isolation_segment_command.go
index ff367a20f24..c1544357dca 100644
--- a/command/v7/reset_space_isolation_segment_command.go
+++ b/command/v7/reset_space_isolation_segment_command.go
@@ -73,13 +73,13 @@ func (cmd ResetSpaceIsolationSegmentCommand) Execute(args []string) error {
})
space, v2Warnings, err := cmd.ActorV2.GetSpaceByOrganizationAndName(cmd.Config.TargetedOrganization().GUID, cmd.RequiredArgs.SpaceName)
- cmd.UI.DisplayWarnings(v2Warnings)
+ cmd.UI.DisplayWarningsV7(v2Warnings)
if err != nil {
return err
}
newIsolationSegmentName, warnings, err := cmd.Actor.ResetSpaceIsolationSegment(cmd.Config.TargetedOrganization().GUID, space.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/restart_app_instance_command.go b/command/v7/restart_app_instance_command.go
index bdbeaaea6f8..4854ff49c00 100644
--- a/command/v7/restart_app_instance_command.go
+++ b/command/v7/restart_app_instance_command.go
@@ -62,7 +62,7 @@ func (cmd RestartAppInstanceCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.DeleteInstanceByApplicationNameSpaceProcessTypeAndIndex(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID, cmd.ProcessType, cmd.RequiredArgs.Index)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/restart_command.go b/command/v7/restart_command.go
index 825e29102b2..56b0d3ac4ed 100644
--- a/command/v7/restart_command.go
+++ b/command/v7/restart_command.go
@@ -64,7 +64,7 @@ func (cmd RestartCommand) Execute(args []string) error {
}
app, warnings, err := cmd.Actor.GetApplicationByNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -90,7 +90,7 @@ func (cmd RestartCommand) Execute(args []string) error {
cmd.Config.TargetedSpace().GUID,
false,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -106,21 +106,21 @@ func (cmd RestartCommand) DowntimeRestart(app v7action.Application) error {
cmd.UI.DisplayText("Stopping app...\n")
warnings, err = cmd.Actor.StopApplication(app.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
}
warnings, err = cmd.Actor.StartApplication(app.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
cmd.UI.DisplayText("Waiting for app to start...\n")
warnings, err = cmd.Actor.PollStart(app.GUID, false)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -132,14 +132,14 @@ func (cmd RestartCommand) ZeroDowntimeRestart(app v7action.Application) error {
)
deploymentGUID, warnings, err := cmd.Actor.CreateDeployment(app.GUID, "")
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
cmd.UI.DisplayText("Waiting for app to deploy...\n")
warnings, err = cmd.Actor.PollStartForRolling(app.GUID, deploymentGUID, cmd.NoWait)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/routes_command.go b/command/v7/routes_command.go
index e35afab0b14..6f0bff0f536 100644
--- a/command/v7/routes_command.go
+++ b/command/v7/routes_command.go
@@ -79,13 +79,13 @@ func (cmd RoutesCommand) Execute(args []string) error {
routes, warnings, err = cmd.Actor.GetRoutesBySpace(targetedSpace.GUID)
}
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
routeSummaries, warnings, err := cmd.Actor.GetRouteSummaries(routes)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/running_environment_variable_group_command.go b/command/v7/running_environment_variable_group_command.go
index cacf74d57f5..689bab382d3 100644
--- a/command/v7/running_environment_variable_group_command.go
+++ b/command/v7/running_environment_variable_group_command.go
@@ -58,7 +58,7 @@ func (cmd RunningEnvironmentVariableGroupCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
envVars, warnings, err := cmd.Actor.GetEnvironmentVariableGroup(constant.RunningEnvironmentVariableGroup)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/scale_command.go b/command/v7/scale_command.go
index 202608045de..db7dd0da3ac 100644
--- a/command/v7/scale_command.go
+++ b/command/v7/scale_command.go
@@ -66,7 +66,7 @@ func (cmd ScaleCommand) Execute(args []string) error {
}
app, warnings, err := cmd.Actor.GetApplicationByNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -84,7 +84,7 @@ func (cmd ScaleCommand) Execute(args []string) error {
}
warnings, err = cmd.Actor.PollStart(app.GUID, false)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
showErr := cmd.showCurrentScale(user.Name, err)
if showErr != nil {
@@ -142,7 +142,7 @@ func (cmd ScaleCommand) scaleProcess(appGUID string, username string) (bool, err
MemoryInMB: cmd.MemoryLimit.NullUint64,
DiskInMB: cmd.DiskLimit.NullUint64,
})
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return false, err
}
@@ -167,7 +167,7 @@ func (cmd ScaleCommand) restartApplication(appGUID string, username string) erro
cmd.UI.DisplayNewline()
warnings, err := cmd.Actor.StopApplication(appGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -181,7 +181,7 @@ func (cmd ScaleCommand) restartApplication(appGUID string, username string) erro
cmd.UI.DisplayNewline()
warnings, err = cmd.Actor.StartApplication(appGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -202,7 +202,7 @@ func (cmd ScaleCommand) showCurrentScale(userName string, runningErr error) erro
})
summary, warnings, err := cmd.Actor.GetDetailedAppSummary(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID, false)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/service_brokers_command.go b/command/v7/service_brokers_command.go
index 88b3cb08ac8..2326ad2529d 100644
--- a/command/v7/service_brokers_command.go
+++ b/command/v7/service_brokers_command.go
@@ -53,7 +53,7 @@ func (cmd *ServiceBrokersCommand) Execute(args []string) error {
cmd.UI.DisplayTextWithFlavor("Getting service brokers as {{.Username}}...", map[string]interface{}{"Username": currentUser.Name})
serviceBrokers, warnings, err := cmd.Actor.GetServiceBrokers()
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/set_droplet_command.go b/command/v7/set_droplet_command.go
index 82df44d4fd8..6329dd56b06 100644
--- a/command/v7/set_droplet_command.go
+++ b/command/v7/set_droplet_command.go
@@ -62,7 +62,7 @@ func (cmd SetDropletCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.SetApplicationDropletByApplicationNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID, cmd.DropletGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/set_env_command.go b/command/v7/set_env_command.go
index aac38ae7a1a..f46a41e85fe 100644
--- a/command/v7/set_env_command.go
+++ b/command/v7/set_env_command.go
@@ -68,7 +68,7 @@ func (cmd SetEnvCommand) Execute(args []string) error {
Key: cmd.RequiredArgs.EnvironmentVariableName,
Value: string(cmd.RequiredArgs.EnvironmentVariableValue),
})
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/set_health_check_command.go b/command/v7/set_health_check_command.go
index 259158785c1..18bd7051259 100644
--- a/command/v7/set_health_check_command.go
+++ b/command/v7/set_health_check_command.go
@@ -73,7 +73,7 @@ func (cmd SetHealthCheckCommand) Execute(args []string) error {
cmd.InvocationTimeout.Value,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/set_label_command.go b/command/v7/set_label_command.go
index bcb6b9baa96..cf901982b58 100644
--- a/command/v7/set_label_command.go
+++ b/command/v7/set_label_command.go
@@ -115,7 +115,7 @@ func (cmd SetLabelCommand) executeApp(username string, labels map[string]types.N
cmd.Config.TargetedSpace().GUID,
labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -141,7 +141,7 @@ func (cmd SetLabelCommand) executeBuildpack(username string, labels map[string]t
)
warnings, err := cmd.Actor.UpdateBuildpackLabelsByBuildpackNameAndStack(cmd.RequiredArgs.ResourceName, cmd.BuildpackStack, labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -164,7 +164,7 @@ func (cmd SetLabelCommand) executeOrg(username string, labels map[string]types.N
warnings, err := cmd.Actor.UpdateOrganizationLabelsByOrganizationName(cmd.RequiredArgs.ResourceName,
labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -191,7 +191,7 @@ func (cmd SetLabelCommand) executeSpace(username string, labels map[string]types
cmd.Config.TargetedOrganization().GUID,
labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -212,7 +212,7 @@ func (cmd SetLabelCommand) executeStack(username string, labels map[string]types
)
warnings, err := cmd.Actor.UpdateStackLabelsByStackName(cmd.RequiredArgs.ResourceName, labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
diff --git a/command/v7/set_staging_environment_variable_group_command.go b/command/v7/set_staging_environment_variable_group_command.go
index a40270ee3ea..5d489af4160 100644
--- a/command/v7/set_staging_environment_variable_group_command.go
+++ b/command/v7/set_staging_environment_variable_group_command.go
@@ -75,7 +75,7 @@ func (cmd SetStagingEnvironmentVariableGroupCommand) Execute(args []string) erro
constant.StagingEnvironmentVariableGroup,
envVars,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/share_private_domain_command.go b/command/v7/share_private_domain_command.go
index c68d4129b97..06e5ae42be2 100644
--- a/command/v7/share_private_domain_command.go
+++ b/command/v7/share_private_domain_command.go
@@ -62,7 +62,7 @@ func (cmd SharePrivateDomainCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.SharePrivateDomain(domain, orgName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/shared/v3_poll_stage.go b/command/v7/shared/v3_poll_stage.go
index 1bb17c23540..864097d1701 100644
--- a/command/v7/shared/v3_poll_stage.go
+++ b/command/v7/shared/v3_poll_stage.go
@@ -30,7 +30,7 @@ func PollStage(dropletStream <-chan v7action.Droplet, warningsStream <-chan v7ac
closedWarningsStream = true
break
}
- ui.DisplayWarnings(warnings)
+ ui.DisplayWarningsV7(warnings)
case logErr, ok := <-logErrStream:
if !ok {
break
diff --git a/command/v7/space_command.go b/command/v7/space_command.go
index 5f129644e67..d2839d8a09d 100644
--- a/command/v7/space_command.go
+++ b/command/v7/space_command.go
@@ -72,7 +72,7 @@ func (cmd SpaceCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
spaceSummary, warnings, err := cmd.Actor.GetSpaceSummaryByNameAndOrganization(spaceName, targetedOrg.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -90,7 +90,7 @@ func (cmd SpaceCommand) Execute(args []string) error {
func (cmd SpaceCommand) displaySpaceGUID(spaceName string, orgGUID string) error {
space, warnings, err := cmd.Actor.GetSpaceByNameAndOrganization(spaceName, orgGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/spaces_command.go b/command/v7/spaces_command.go
index 1b5d5aaf0a7..8beb717824c 100644
--- a/command/v7/spaces_command.go
+++ b/command/v7/spaces_command.go
@@ -59,7 +59,7 @@ func (cmd SpacesCommand) Execute([]string) error {
cmd.UI.DisplayNewline()
spaces, warnings, err := cmd.Actor.GetOrganizationSpacesWithLabelSelector(cmd.Config.TargetedOrganization().GUID, cmd.Labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/ssh_command.go b/command/v7/ssh_command.go
index b130c7023ae..4933c2e2e8b 100644
--- a/command/v7/ssh_command.go
+++ b/command/v7/ssh_command.go
@@ -89,7 +89,7 @@ func (cmd SSHCommand) Execute(args []string) error {
cmd.ProcessType,
cmd.ProcessIndex,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/stack_command.go b/command/v7/stack_command.go
index b55bec951b6..470db4293fe 100644
--- a/command/v7/stack_command.go
+++ b/command/v7/stack_command.go
@@ -56,7 +56,7 @@ func (cmd *StackCommand) Execute(args []string) error {
func (cmd *StackCommand) getStack(stackName string) (v7action.Stack, error) {
stack, warnings, err := cmd.Actor.GetStackByName(cmd.RequiredArgs.StackName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return stack, err
}
diff --git a/command/v7/stacks_command.go b/command/v7/stacks_command.go
index 5ff06a682cf..3ff8b0a09ae 100644
--- a/command/v7/stacks_command.go
+++ b/command/v7/stacks_command.go
@@ -60,7 +60,7 @@ func (cmd StacksCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
stacks, warnings, err := cmd.Actor.GetStacks(cmd.Labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/stage_command.go b/command/v7/stage_command.go
index dde30443785..50191181db8 100644
--- a/command/v7/stage_command.go
+++ b/command/v7/stage_command.go
@@ -70,7 +70,7 @@ func (cmd StageCommand) Execute(args []string) error {
})
logStream, logErrStream, logWarnings, logErr := cmd.Actor.GetStreamingLogsForApplicationByNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID, cmd.NOAAClient)
- cmd.UI.DisplayWarnings(logWarnings)
+ cmd.UI.DisplayWarningsV7(logWarnings)
if logErr != nil {
return logErr
}
diff --git a/command/v7/staging_environment_variable_group_command.go b/command/v7/staging_environment_variable_group_command.go
index e6124a91a21..4be2adc392c 100644
--- a/command/v7/staging_environment_variable_group_command.go
+++ b/command/v7/staging_environment_variable_group_command.go
@@ -58,7 +58,7 @@ func (cmd StagingEnvironmentVariableGroupCommand) Execute(args []string) error {
cmd.UI.DisplayNewline()
envVars, warnings, err := cmd.Actor.GetEnvironmentVariableGroup(constant.StagingEnvironmentVariableGroup)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/start_command.go b/command/v7/start_command.go
index 31d5197d37e..6680ebe8c2c 100644
--- a/command/v7/start_command.go
+++ b/command/v7/start_command.go
@@ -58,7 +58,7 @@ func (cmd StartCommand) Execute(args []string) error {
}
app, warnings, err := cmd.Actor.GetApplicationByNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -80,14 +80,14 @@ func (cmd StartCommand) Execute(args []string) error {
})
warnings, err = cmd.Actor.StartApplication(app.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
cmd.UI.DisplayText("\nWaiting for app to start...")
warnings, err = cmd.Actor.PollStart(app.GUID, false)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -98,7 +98,7 @@ func (cmd StartCommand) Execute(args []string) error {
cmd.Config.TargetedSpace().GUID,
false,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/stop_command.go b/command/v7/stop_command.go
index 80193472fa1..403cd446f93 100644
--- a/command/v7/stop_command.go
+++ b/command/v7/stop_command.go
@@ -53,7 +53,7 @@ func (cmd StopCommand) Execute(args []string) error {
}
app, warnings, err := cmd.Actor.GetApplicationByNameAndSpace(cmd.RequiredArgs.AppName, cmd.Config.TargetedSpace().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -75,7 +75,7 @@ func (cmd StopCommand) Execute(args []string) error {
})
warnings, err = cmd.Actor.StopApplication(app.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/target_command.go b/command/v7/target_command.go
index efdade5b2c6..f93a7de7b91 100644
--- a/command/v7/target_command.go
+++ b/command/v7/target_command.go
@@ -136,7 +136,7 @@ func (cmd *TargetCommand) setOrgAndSpace() error {
// setOrg sets organization
func (cmd *TargetCommand) setOrg() error {
org, warnings, err := cmd.Actor.GetOrganizationByName(cmd.Organization)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -151,7 +151,7 @@ func (cmd *TargetCommand) setOrg() error {
// and no space arg was provided.
func (cmd *TargetCommand) autoTargetSpace(orgGUID string) error {
spaces, warnings, err := cmd.Actor.GetOrganizationSpaces(orgGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -171,7 +171,7 @@ func (cmd *TargetCommand) setSpace() error {
}
space, warnings, err := cmd.Actor.GetSpaceByNameAndOrganization(cmd.Space, cmd.Config.TargetedOrganization().GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/unmap_route_command.go b/command/v7/unmap_route_command.go
index 13c191834a5..5102689103e 100644
--- a/command/v7/unmap_route_command.go
+++ b/command/v7/unmap_route_command.go
@@ -59,14 +59,14 @@ func (cmd UnmapRouteCommand) Execute(args []string) error {
}
domain, warnings, err := cmd.Actor.GetDomainByName(cmd.RequiredArgs.Domain)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
spaceGUID := cmd.Config.TargetedSpace().GUID
app, warnings, err := cmd.Actor.GetApplicationByNameAndSpace(cmd.RequiredArgs.App, spaceGUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -74,7 +74,7 @@ func (cmd UnmapRouteCommand) Execute(args []string) error {
path := cmd.Path.Path
route, warnings, err := cmd.Actor.GetRouteByAttributes(domain.Name, domain.GUID, cmd.Hostname, path)
fqdn := desiredFQDN(domain.Name, cmd.Hostname, path)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -88,7 +88,7 @@ func (cmd UnmapRouteCommand) Execute(args []string) error {
})
destination, warnings, err := cmd.Actor.GetRouteDestinationByAppGUID(route.GUID, app.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
if _, ok := err.(actionerror.RouteDestinationNotFoundError); ok {
cmd.UI.DisplayText("Route to be unmapped is not currently mapped to the application.")
@@ -100,7 +100,7 @@ func (cmd UnmapRouteCommand) Execute(args []string) error {
}
warnings, err = cmd.Actor.UnmapRoute(route.GUID, destination.GUID)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/unset_env_command.go b/command/v7/unset_env_command.go
index 78dd7a4066f..77db821cf75 100644
--- a/command/v7/unset_env_command.go
+++ b/command/v7/unset_env_command.go
@@ -67,7 +67,7 @@ func (cmd UnsetEnvCommand) Execute(args []string) error {
cmd.Config.TargetedSpace().GUID,
cmd.RequiredArgs.EnvironmentVariableName,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
switch errVal := err.(type) {
case actionerror.EnvironmentVariableNotSetError:
diff --git a/command/v7/unset_label_command.go b/command/v7/unset_label_command.go
index 59efbea2a31..7ec159c4f79 100644
--- a/command/v7/unset_label_command.go
+++ b/command/v7/unset_label_command.go
@@ -92,7 +92,7 @@ func (cmd UnsetLabelCommand) executeApp(username string, labels map[string]types
warnings, err := cmd.Actor.UpdateApplicationLabelsByApplicationName(cmd.RequiredArgs.ResourceName, cmd.Config.TargetedSpace().GUID, labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -117,7 +117,7 @@ func (cmd UnsetLabelCommand) executeBuildpack(username string, labels map[string
warnings, err := cmd.Actor.UpdateBuildpackLabelsByBuildpackNameAndStack(cmd.RequiredArgs.ResourceName, cmd.BuildpackStack, labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -135,7 +135,7 @@ func (cmd UnsetLabelCommand) executeOrg(username string, labels map[string]types
warnings, err := cmd.Actor.UpdateOrganizationLabelsByOrganizationName(cmd.RequiredArgs.ResourceName, labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -154,7 +154,7 @@ func (cmd UnsetLabelCommand) executeSpace(username string, labels map[string]typ
warnings, err := cmd.Actor.UpdateSpaceLabelsBySpaceName(cmd.RequiredArgs.ResourceName, cmd.Config.TargetedOrganization().GUID, labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
@@ -172,7 +172,7 @@ func (cmd UnsetLabelCommand) executeStack(username string, labels map[string]typ
warnings, err := cmd.Actor.UpdateStackLabelsByStackName(cmd.RequiredArgs.ResourceName, labels)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
return err
}
diff --git a/command/v7/unshare_private_domain_command.go b/command/v7/unshare_private_domain_command.go
index 77c200afc88..028ddae3fcb 100644
--- a/command/v7/unshare_private_domain_command.go
+++ b/command/v7/unshare_private_domain_command.go
@@ -88,7 +88,7 @@ func (cmd UnsharePrivateDomainCommand) Execute(args []string) error {
})
warnings, err := cmd.Actor.UnsharePrivateDomain(domain, orgName)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
diff --git a/command/v7/update_buildpack_command.go b/command/v7/update_buildpack_command.go
index a6276112d9c..ed7fd68f999 100644
--- a/command/v7/update_buildpack_command.go
+++ b/command/v7/update_buildpack_command.go
@@ -142,7 +142,7 @@ func (cmd UpdateBuildpackCommand) updateBuildpack() (v7action.Buildpack, error)
cmd.CurrentStack,
desiredBuildpack,
)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return updatedBuildpack, err
}
@@ -163,10 +163,10 @@ func (cmd UpdateBuildpackCommand) uploadBits(user configv3.User, updatedBuildpac
cmd.ProgressBar,
)
if _, ok := err.(ccerror.InvalidAuthTokenError); ok {
- cmd.UI.DisplayWarnings([]string{"Failed to upload buildpack due to auth token expiration, retrying..."})
+ cmd.UI.DisplayWarningsV7([]string{"Failed to upload buildpack due to auth token expiration, retrying..."})
jobURL, warnings, err = cmd.Actor.UploadBuildpack(updatedBuildpack.GUID, buildpackBitsPath, cmd.ProgressBar)
}
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}
@@ -177,7 +177,7 @@ func (cmd UpdateBuildpackCommand) uploadBits(user configv3.User, updatedBuildpac
})
warnings, err = cmd.Actor.PollUploadBuildpackJob(jobURL)
- cmd.UI.DisplayWarnings(warnings)
+ cmd.UI.DisplayWarningsV7(warnings)
if err != nil {
return err
}