feat: global wait (#669)

* test: dump output when testing

* test: assert stderr

* redact stderr too

* fix: redact full flag values including PEM, silence setup_file noise

* feat: global wait

* feat: wait should wait until all parent resources are AVAILABLE

* fix: capture from regional URLs too

* feat: --wait for delete too, better capture href

* bump default timeout 10min

* test: globalwait tests

* feat: rm old code, --wait-for-request and --wait-for-state just sets --wait

* fix: wrap each SDK client transport individually, add double-wrap guard

* fix: skip wait when command fails, surface re-render errors, defer SetRerendering

* fix: use strict UUID regex in looksLikeResourceID to avoid false positives

* fix: handle 401/403 in poll, check HTTP status in fetchJSON, use net/url for query params, include URL in errors, track firstSuccessfulPoll

* fix: add -t shorthand

* fix: no-state resources treated as ready, promote-volume manual check, remove -t global shorthand, update bats tests

* regen docs

* doc: add global --wait to changelog

* test: add --wait to tests

* fix: remove old per-command waitfor calls, globalwait handles all waiting

Only exception: server create --promote-volume keeps inline WaitForState
since it needs fresh server data before the command returns.

* fix: update help text to reference --wait instead of old flags

* fix: handle 429 rate limit, cache viper in transport, fix relative URLs, structured JSON progress

* doc: regen docs

* test: remove dead WaitForRequest/WaitForState error tests

These tested old per-command waiter error propagation which was removed.
Waiting is now handled by globalwait at the transport/post-command layer.

* fix: capture relative hrefs from response body for resource refetch

CloudAPI returns relative hrefs (e.g. /cloudapi/v6/datacenters/<uuid>).
BeforeRender was skipping these, causing FetchResource to use the wrong
URL (collection endpoint from transport) and get 404. buildFullURL
already handles resolving relative hrefs to absolute.

* fix: treat 404 as transient during create/update, terminal only for delete

Resources can temporarily return 404 during provisioning. Only treat
404 as "done" when the operation was a DELETE. Track HTTP method in
globalwait state from the capturing transport.

* deps: fix vulns 1.25

* fix: no-state resources treated as ready, skip JSON progress, validate format before suppressing output

* fix: poll request status before resource state, skip action endpoints, fix mongodb.bats

* fix: build resource URL from collection URL + id for APIs without href

* fix: use distinct progress messages for request vs state polling

* fix: single progress bar for all wait phases

* test: remove timeout flags

* refactor: extract poller struct to reduce parameter counts in polling functions

* fix: deprecated --wait flags not activating wait, action endpoint detection, missing contract header, silent 400 success

* fix: review

* rm: dead code

* doc: update changelog

* do not retry on 5xx

* test: cover test gaps

* fix: review comments

* wait for GET commands too

* refactor: fewer exported funcs

* test: fix mariadb and label teests

* test: reduce sleeps

* test: remove newline test

* fix: 400 for waiting on APIs without href

* preserve command state on FAILED, ERROR states

* feat: get should wait for DELETING resources too

* fix: waiting in interactive shell

* fix: server list --all

* doc: make docs

* test: fix postgres test

* fix: fallback to before --wait output if fail rerender. Fail command if both empty

* review: fix review issues

* refactor: promote-volume use new waiter

* refactor: struct Waiter

* remove waiting... from list as is no-op. add this mention to helptext

* action endpoints with no URL should just return

* warn on no location to wait on

Author: avirtopeanu-ionos

CHANGELOG.md

@@ -3,10 +3,22 @@
 ## [v6.10.1] – May 2026
 
 ### Added
-- Added `object-storage` support, with `whoami --provenance` credentials resolution 
+- **Global `--wait` (`-w`) flag**: Waits for any resource to reach a terminal ready state (AVAILABLE, ACTIVE, READY, DONE, INACTIVE, SUSPENDED) after create, update, delete, or detach operations. Replaces the old per-command `--wait-for-request` and `--wait-for-state` flags and works across all IONOS Cloud services. After the target resource is ready, it also waits for all parent resources in the hierarchy to become AVAILABLE. 
+- **`object-storage` commands**: Added support for bucket and object operations against the IONOS S3-compatible Object Storage API. Uses existing IONOS credentials with automatic endpoint resolution via `whoami --provenance`.
 - Added `--ftp-port` on `image upload` which is usable in combination with `--ftp-url`.
+
+### Deprecated
+- `--wait-for-request`, `--wait-for-state`, `--wait-for-deletion`: Still work but are hidden from help. Use `--wait` instead.
+- `-W` shorthand (was `--wait-for-state`): Removed due to conflict with `--weight` (`-W`) in NLB and target group commands.
+- `-t` shorthand for `--token-id` (container-registry token commands), `--token` (`cfg login`, `token` subcommands), and `--type` (dns record create): Removed to avoid conflict with the global `--timeout` (`-t`) flag. Use the long form instead.
+
+### Known Limitations
+- `--wait` combined with `--all` (bulk delete) only waits for the last deleted resource, not all of them. For guaranteed completion of all deletions, delete resources individually with `--wait`.
+
 ### Changed
 - Aligned customer-facing brand references to "IONOS CLOUD" in CLI help text, godoc, and release-config descriptions (no behaviour change).
+- Default `--timeout` increased from 60s to 600s (10 minutes) to accommodate long-running provisioning operations (e.g. K8s clusters, DBaaS). Per-command timeout defaults have been removed in favour of the global default.
+- Removed dead per-resource waiter code (K8s, NatGateway, NLB, ALB, Postgres). Only `ServerStateInterrogator` retained for `--promote-volume`.
 - Improved `ionosctl --help` output: rewrote command short descriptions for consistency and grouped commands into sections.
 - Improve `ionosctl shell` interactive shell prompt:
   - Removed beta warnings and notes. Interactive prompts (e.g. delete confirmations) now work natively instead of requiring `--force`.

README.md

@@ -243,16 +243,21 @@ ionosctl datacenter get --datacenter-id <id> --depth 3
 
 ### Waiting for Resources
 
-Many create/update/delete operations return immediately while the resource is being provisioned. ionosctl commands that modify resources typically support a `--wait-for-request` (`-w`) flag to block until the operation completes:
+Many create/update/delete operations return immediately while the resource is being provisioned. Use the global `--wait` (`-w`) flag to block until the resource reaches AVAILABLE state:
 
 ```bash
 # Wait for server to be fully provisioned
-ionosctl server create --datacenter-id <id> --name "my-server" --cores 2 --ram 4096 --wait-for-request
+ionosctl server create --datacenter-id <id> --name "my-server" --cores 2 --ram 4096 --wait
 
 # Wait for deletion to complete
-ionosctl server delete --datacenter-id <id> --server-id <id> --force --wait-for-request
+ionosctl server delete --datacenter-id <id> --server-id <id> --force --wait
+
+# Custom timeout (default: 600s)
+ionosctl dbaas postgres cluster create --name "my-db" --wait --timeout 1200
 ```
 
+> **Note:** `--wait` combined with `--all` (bulk delete) only waits for the last deleted resource. For guaranteed completion of all deletions, delete resources individually with `--wait`.
+
 ### Scripting & Automation
 
 ionosctl is designed to work well in scripts and CI/CD pipelines:
@@ -261,11 +266,11 @@ ionosctl is designed to work well in scripts and CI/CD pipelines:
 # Use JSON output + jq for programmatic access
 DC_ID=$(ionosctl datacenter list --output json | jq -r '.[0].id')
 
-# Combine --force and --wait-for-request for unattended operations
-ionosctl server delete --datacenter-id "$DC_ID" --server-id "$SRV_ID" --force --wait-for-request
+# Combine --force and --wait for unattended operations
+ionosctl server delete --datacenter-id "$DC_ID" --server-id "$SRV_ID" --force --wait
 
 # Use --quiet to suppress output in scripts (only errors go to stderr)
-ionosctl volume create --datacenter-id "$DC_ID" --name "data" --size 50 --quiet --wait-for-request
+ionosctl volume create --datacenter-id "$DC_ID" --name "data" --size 50 --quiet --wait
 
 # Delete all servers in a datacenter
 ionosctl server delete --datacenter-id "$DC_ID" --all --force
@@ -300,7 +305,8 @@ These flags are available on all (or most) commands:
 | `--quiet` | `-q` | Suppress all output except errors |
 | `--force` | `-f` | Skip confirmation prompts (for destructive commands) |
 | `--all` | `-a` | Target all resources (for delete/remove commands) |
-| `--wait-for-request` | `-w` | Block until the API operation completes |
+| `--wait` | `-w` | Wait for resource to reach AVAILABLE state |
+| `--timeout` | `-t` | Timeout in seconds for `--wait` (default: 600) |
 | `--verbose` | `-v` | Increase verbosity (`-v`, `-vv`, `-vvv`) |
 | `--no-headers` | | Hide table column headers |
 | `--cols` | | Select specific output columns |

commands/compute/applicationloadbalancer/applicationloadbalancer_test.go

@@ -217,39 +217,6 @@ func TestRunApplicationLoadBalancerGetResponse(t *testing.T) {
 	})
 }
 
-func TestRunApplicationLoadBalancerGetWait(t *testing.T) {
-	var b bytes.Buffer
-	w := bufio.NewWriter(&b)
-	core.CmdConfigTest(t, w, func(cfg *core.CommandConfig, rm *core.ResourcesMocksTest) {
-		viper.Reset()
-		viper.Set(constants.ArgQuiet, false)
-		viper.Set(constants.ArgOutput, constants.DefaultOutputFormat)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDataCenterId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgApplicationLoadBalancerId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, constants.ArgWaitForState), true)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().Get(testApplicationLoadBalancerVar, testApplicationLoadBalancerVar).Return(&applicationloadbalancerTestGet, nil, nil)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().Get(testApplicationLoadBalancerVar, testApplicationLoadBalancerVar).Return(&applicationloadbalancerTestGet, nil, nil)
-		err := RunApplicationLoadBalancerGet(cfg)
-		assert.NoError(t, err)
-	})
-}
-
-func TestRunApplicationLoadBalancerGetWaitErr(t *testing.T) {
-	var b bytes.Buffer
-	w := bufio.NewWriter(&b)
-	core.CmdConfigTest(t, w, func(cfg *core.CommandConfig, rm *core.ResourcesMocksTest) {
-		viper.Reset()
-		viper.Set(constants.ArgQuiet, false)
-		viper.Set(constants.ArgOutput, constants.DefaultOutputFormat)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDataCenterId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgApplicationLoadBalancerId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, constants.ArgWaitForState), true)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().Get(testApplicationLoadBalancerVar, testApplicationLoadBalancerVar).Return(&applicationloadbalancerTestGet, nil, testApplicationLoadBalancerErr)
-		err := RunApplicationLoadBalancerGet(cfg)
-		assert.Error(t, err)
-	})
-}
-
 func TestRunApplicationLoadBalancerGetErr(t *testing.T) {
 	var b bytes.Buffer
 	w := bufio.NewWriter(&b)
@@ -322,27 +289,6 @@ func TestRunApplicationLoadBalancerCreateErr(t *testing.T) {
 	})
 }
 
-func TestRunApplicationLoadBalancerCreateWaitErr(t *testing.T) {
-	var b bytes.Buffer
-	w := bufio.NewWriter(&b)
-	core.CmdConfigTest(t, w, func(cfg *core.CommandConfig, rm *core.ResourcesMocksTest) {
-		viper.Reset()
-		viper.Set(constants.ArgQuiet, false)
-		viper.Set(constants.ArgOutput, constants.DefaultOutputFormat)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDataCenterId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgName), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgIps), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgPrivateIps), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgTargetLan), testApplicationLoadBalancerIntVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgListenerLan), testApplicationLoadBalancerIntVar)
-		viper.Set(core.GetFlagName(cfg.NS, constants.ArgWaitForRequest), true)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().Create(testApplicationLoadBalancerVar, applicationloadbalancerTest).Return(&applicationloadbalancerTest, &testutil.TestResponse, nil)
-		rm.CloudApiV6Mocks.Request.EXPECT().GetStatus(testutil.TestRequestIdVar).Return(&testutil.TestRequestStatus, nil, testutil.TestRequestErr)
-		err := RunApplicationLoadBalancerCreate(cfg)
-		assert.Error(t, err)
-	})
-}
-
 func TestRunApplicationLoadBalancerUpdate(t *testing.T) {
 	var b bytes.Buffer
 	w := bufio.NewWriter(&b)
@@ -383,28 +329,6 @@ func TestRunApplicationLoadBalancerUpdateErr(t *testing.T) {
 	})
 }
 
-func TestRunApplicationLoadBalancerUpdateWaitErr(t *testing.T) {
-	var b bytes.Buffer
-	w := bufio.NewWriter(&b)
-	core.CmdConfigTest(t, w, func(cfg *core.CommandConfig, rm *core.ResourcesMocksTest) {
-		viper.Reset()
-		viper.Set(constants.ArgQuiet, false)
-		viper.Set(constants.ArgOutput, constants.DefaultOutputFormat)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDataCenterId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgApplicationLoadBalancerId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgName), testApplicationLoadBalancerNewVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgIps), testApplicationLoadBalancerNewVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgPrivateIps), testApplicationLoadBalancerNewVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgTargetLan), testApplicationLoadBalancerNewIntVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgListenerLan), testApplicationLoadBalancerNewIntVar)
-		viper.Set(core.GetFlagName(cfg.NS, constants.ArgWaitForRequest), true)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().Update(testApplicationLoadBalancerVar, testApplicationLoadBalancerVar, applicationloadbalancerProperties).Return(&applicationloadbalancerNew, &testutil.TestResponse, nil)
-		rm.CloudApiV6Mocks.Request.EXPECT().GetStatus(testutil.TestRequestIdVar).Return(&testutil.TestRequestStatus, nil, testutil.TestRequestErr)
-		err := RunApplicationLoadBalancerUpdate(cfg)
-		assert.Error(t, err)
-	})
-}
-
 func TestRunApplicationLoadBalancerDelete(t *testing.T) {
 	var b bytes.Buffer
 	w := bufio.NewWriter(&b)
@@ -504,24 +428,6 @@ func TestRunApplicationLoadBalancerDeleteErr(t *testing.T) {
 	})
 }
 
-func TestRunApplicationLoadBalancerDeleteWaitErr(t *testing.T) {
-	var b bytes.Buffer
-	w := bufio.NewWriter(&b)
-	core.CmdConfigTest(t, w, func(cfg *core.CommandConfig, rm *core.ResourcesMocksTest) {
-		viper.Reset()
-		viper.Set(constants.ArgQuiet, false)
-		viper.Set(constants.ArgOutput, constants.DefaultOutputFormat)
-		viper.Set(constants.ArgForce, true)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDataCenterId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgApplicationLoadBalancerId), testApplicationLoadBalancerVar)
-		viper.Set(core.GetFlagName(cfg.NS, constants.ArgWaitForRequest), true)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().Delete(testApplicationLoadBalancerVar, testApplicationLoadBalancerVar).Return(&testutil.TestResponse, nil)
-		rm.CloudApiV6Mocks.Request.EXPECT().GetStatus(testutil.TestRequestIdVar).Return(&testutil.TestRequestStatus, nil, testutil.TestRequestErr)
-		err := RunApplicationLoadBalancerDelete(cfg)
-		assert.Error(t, err)
-	})
-}
-
 func TestRunApplicationLoadBalancerDeleteAskForConfirm(t *testing.T) {
 	var b bytes.Buffer
 	w := bufio.NewWriter(&b)

commands/compute/applicationloadbalancer/create.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/ionos-cloud/ionosctl/v6/commands/compute/completer"
-	"github.com/ionos-cloud/ionosctl/v6/internal/constants"
 	"github.com/ionos-cloud/ionosctl/v6/internal/core"
 	cloudapiv6 "github.com/ionos-cloud/ionosctl/v6/services/cloudapi-v6"
 	"github.com/spf13/cobra"
@@ -19,7 +18,7 @@ func ApplicationLoadBalancerCreateCmd() *core.Command {
 		ShortDesc: "Create an Application Load Balancer",
 		LongDesc: `Use this command to create an Application Load Balancer in a specified Virtual Data Center.
 
-You can wait for the Request to be executed using ` + "`" + `--wait-for-request` + "`" + ` option.
+Use ` + "`" + `--wait` + "`" + ` (` + "`" + `-w` + "`" + `) to wait for the resource to reach AVAILABLE state.
 
 Required values to run command:
 
@@ -38,8 +37,6 @@ Required values to run command:
 	cmd.AddIntFlag(cloudapiv6.ArgTargetLan, "", 1, "ID of the balanced private target LAN (outbound).")
 	cmd.AddStringSliceFlag(cloudapiv6.ArgIps, "", nil, "Collection of the Application Load Balancer IP addresses. (Inbound and outbound) IPs of the listenerLan are customer-reserved public IPs for the public Load Balancers, and private IPs for the private Load Balancers.")
 	cmd.AddStringSliceFlag(cloudapiv6.ArgPrivateIps, "", nil, "Collection of private IP addresses with the subnet mask of the Application Load Balancer. IPs must contain valid a subnet mask. If no IP is provided, the system will generate an IP with /24 subnet.")
-	cmd.AddBoolFlag(constants.ArgWaitForRequest, constants.ArgWaitForRequestShort, constants.DefaultWait, "Wait for the Request for Application Load Balancer creation to be executed")
-	cmd.AddIntFlag(constants.ArgTimeout, constants.ArgTimeoutShort, cloudapiv6.AlbTimeoutSeconds, "Timeout option for Request for Application Load Balancer creation [seconds]")
 
 	return cmd
 }

commands/compute/applicationloadbalancer/delete.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/ionos-cloud/ionosctl/v6/commands/compute/completer"
-	"github.com/ionos-cloud/ionosctl/v6/internal/constants"
 	"github.com/ionos-cloud/ionosctl/v6/internal/core"
 	cloudapiv6 "github.com/ionos-cloud/ionosctl/v6/services/cloudapi-v6"
 	"github.com/spf13/cobra"
@@ -20,7 +19,7 @@ func ApplicationLoadBalancerDeleteCmd() *core.Command {
 		ShortDesc: "Delete an Application Load Balancer",
 		LongDesc: `Use this command to delete a specified Application Load Balancer from a Virtual Data Center.
 
-You can wait for the Request to be executed using ` + "`" + `--wait-for-request` + "`" + ` or ` + "`" + `-w` + "`" + ` option. You can force the command to execute without user input using ` + "`" + `--force` + "`" + ` option.
+Use ` + "`" + `--wait` + "`" + ` (` + "`" + `-w` + "`" + `) to wait for the resource to reach AVAILABLE state. You can force the command to execute without user input using ` + "`" + `--force` + "`" + ` option.
 
 Required values to run command:
 
@@ -40,8 +39,6 @@ Required values to run command:
 		return completer.ApplicationLoadBalancersIds(viper.GetString(core.GetFlagName(deleteCmd.NS, cloudapiv6.ArgDataCenterId))), cobra.ShellCompDirectiveNoFileComp
 	})
 	deleteCmd.AddBoolFlag(cloudapiv6.ArgAll, cloudapiv6.ArgAllShort, false, "Delete all Application Load Balancers")
-	deleteCmd.AddBoolFlag(constants.ArgWaitForRequest, constants.ArgWaitForRequestShort, constants.DefaultWait, "Wait for the Request for Application Load Balancer deletion to be executed")
-	deleteCmd.AddIntFlag(constants.ArgTimeout, constants.ArgTimeoutShort, cloudapiv6.LbTimeoutSeconds, "Timeout option for Request for Application Load Balancer deletion [seconds]")
 
 	return deleteCmd
 }

commands/compute/applicationloadbalancer/flowlog/applicationloadbalancer_flowlog_test.go

@@ -276,27 +276,6 @@ func TestRunApplicationLoadBalancerFlowLogCreateErr(t *testing.T) {
 	})
 }
 
-func TestRunApplicationLoadBalancerFlowLogCreateWaitErr(t *testing.T) {
-	var b bytes.Buffer
-	w := bufio.NewWriter(&b)
-	core.CmdConfigTest(t, w, func(cfg *core.CommandConfig, rm *core.ResourcesMocksTest) {
-		viper.Reset()
-		viper.Set(constants.ArgQuiet, false)
-		viper.Set(constants.ArgOutput, constants.DefaultOutputFormat)
-		viper.Set(core.GetFlagName(cfg.NS, constants.ArgWaitForRequest), true)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDataCenterId), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgApplicationLoadBalancerId), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgName), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgAction), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDirection), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgS3Bucket), testutil.TestFlowLogVar)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().CreateFlowLog(testutil.TestFlowLogVar, testutil.TestFlowLogVar, testutil.TestInputFlowLog).Return(&testutil.TestFlowLog, &testutil.TestResponse, nil)
-		rm.CloudApiV6Mocks.Request.EXPECT().GetStatus(testutil.TestRequestIdVar).Return(&testutil.TestRequestStatus, nil, testutil.TestRequestErr)
-		err := RunApplicationLoadBalancerFlowLogCreate(cfg)
-		assert.Error(t, err)
-	})
-}
-
 func TestRunApplicationLoadBalancerFlowLogUpdate(t *testing.T) {
 	var b bytes.Buffer
 	w := bufio.NewWriter(&b)
@@ -337,28 +316,6 @@ func TestRunApplicationLoadBalancerFlowLogUpdateErr(t *testing.T) {
 	})
 }
 
-func TestRunApplicationLoadBalancerFlowLogUpdateWaitErr(t *testing.T) {
-	var b bytes.Buffer
-	w := bufio.NewWriter(&b)
-	core.CmdConfigTest(t, w, func(cfg *core.CommandConfig, rm *core.ResourcesMocksTest) {
-		viper.Reset()
-		viper.Set(constants.ArgQuiet, false)
-		viper.Set(constants.ArgOutput, constants.DefaultOutputFormat)
-		viper.Set(core.GetFlagName(cfg.NS, constants.ArgWaitForRequest), true)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDataCenterId), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgApplicationLoadBalancerId), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgFlowLogId), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgName), testutil.TestFlowLogNewVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgAction), testutil.TestFlowLogNewVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDirection), testutil.TestFlowLogNewVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgS3Bucket), testutil.TestFlowLogNewVar)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().UpdateFlowLog(testutil.TestFlowLogVar, testutil.TestFlowLogVar, testutil.TestFlowLogVar, &testutil.TestFlowLogProperties).Return(&testutil.TestFlowLogUpdated, &testutil.TestResponse, nil)
-		rm.CloudApiV6Mocks.Request.EXPECT().GetStatus(testutil.TestRequestIdVar).Return(&testutil.TestRequestStatus, nil, testutil.TestRequestErr)
-		err := RunApplicationLoadBalancerFlowLogUpdate(cfg)
-		assert.Error(t, err)
-	})
-}
-
 func TestRunApplicationLoadBalancerFlowLogDelete(t *testing.T) {
 	var b bytes.Buffer
 	w := bufio.NewWriter(&b)
@@ -446,25 +403,6 @@ func TestRunApplicationLoadBalancerFlowLogDeleteErr(t *testing.T) {
 	})
 }
 
-func TestRunApplicationLoadBalancerFlowLogDeleteWaitErr(t *testing.T) {
-	var b bytes.Buffer
-	w := bufio.NewWriter(&b)
-	core.CmdConfigTest(t, w, func(cfg *core.CommandConfig, rm *core.ResourcesMocksTest) {
-		viper.Reset()
-		viper.Set(constants.ArgQuiet, false)
-		viper.Set(constants.ArgOutput, constants.DefaultOutputFormat)
-		viper.Set(constants.ArgForce, true)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgDataCenterId), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgApplicationLoadBalancerId), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, cloudapiv6.ArgFlowLogId), testutil.TestFlowLogVar)
-		viper.Set(core.GetFlagName(cfg.NS, constants.ArgWaitForRequest), true)
-		rm.CloudApiV6Mocks.ApplicationLoadBalancer.EXPECT().DeleteFlowLog(testutil.TestFlowLogVar, testutil.TestFlowLogVar, testutil.TestFlowLogVar).Return(&testutil.TestResponse, nil)
-		rm.CloudApiV6Mocks.Request.EXPECT().GetStatus(testutil.TestRequestIdVar).Return(&testutil.TestRequestStatus, nil, testutil.TestRequestErr)
-		err := RunApplicationLoadBalancerFlowLogDelete(cfg)
-		assert.Error(t, err)
-	})
-}
-
 func TestRunApplicationLoadBalancerFlowLogDeleteAskForConfirm(t *testing.T) {
 	var b bytes.Buffer
 	w := bufio.NewWriter(&b)