[cli] add enable/disable-zones commands #3926

andrei-toterman · 2025-02-07T14:13:27Z

This PR adds the CLI commands enable-zones and disable-zones which send the gRPC calls for making an AZ available or unavailable.

MULTI-1872

codecov · 2025-02-08T00:32:00Z

Codecov Report

❌ Patch coverage is 96.07843% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.50%. Comparing base (382dfca) to head (141fe74).
⚠️ Report is 26 commits behind head on availability-zones.

Files with missing lines	Patch %	Lines
src/client/cli/cmd/disable_zones.cpp	94.02%	4 Missing ⚠️
src/daemon/daemon.cpp	93.33%	2 Missing ⚠️

Additional details and impacted files

@@                  Coverage Diff                   @@
##           availability-zones    #3926      +/-   ##
======================================================
+ Coverage               89.24%   89.50%   +0.25%     
======================================================
  Files                     265      267       +2     
  Lines                   15050    15177     +127     
======================================================
+ Hits                    13432    13584     +152     
+ Misses                   1618     1593      -25

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

xmkg

LGTM

src/client/cli/cmd/disable_zones.cpp

ricab

Hey @andrei-toterman, looks good overall. Only small comments and nitpicks.

src/client/cli/cmd/disable_zones.h

src/client/cli/cmd/disable_zones.cpp

src/client/cli/cmd/disable_zones.h

src/client/cli/cmd/enable_zones.cpp

src/client/cli/cmd/disable_zones.cpp

ricab

I finally managed to get back to this. It is shaping up nicely and getting close, but there are a few things with respect to --all and arguments that need attention.

Also, as discussed elsewhere, there is quite a bit of missing coverage (I thought this was covered by tests in a different branch, but it turns out that is not the case.)

src/client/cli/cmd/enable_zones.cpp

src/client/cli/cmd/enable_zones.h

src/client/cli/cmd/enable_zones.cpp

src/client/cli/cmd/disable_zones.cpp

ricab

Looking good @levkropp, good job!

I ended up being a proper primary review and I have a few very small fixes inline, but I am going ahead and pre-approving. You'll need a green stamp from @xmkg when you push again, then feel free to merge.

Missing bash completion, but you can add that in a separate PR.

ricab · 2025-07-31T17:05:22Z

src/client/cli/cmd/disable_zones.cpp

+    return ParseCode::Ok;
+}
+
+bool DisableZones::confirm()


This could be const, right?

ricab · 2025-07-31T17:15:06Z

src/daemon/daemon.cpp

+    if (request->zones().empty())
    {
-        config->az_manager->get_zone(zone_name).set_available(request->available());
+        auto& az_manager = *config->az_manager;


If you want to keep this, better extract it outside the if and use it in both branches homogeneously.

ricab · 2025-07-31T17:23:05Z

src/client/cli/cmd/disable_zones.cpp

+
+QString DisableZones::description() const
+{
+    return QStringLiteral("Makes the given availability zones unavailable. Instances therein are"


Suggested change

return QStringLiteral("Makes the given availability zones unavailable. Instances therein are"

return QStringLiteral("Makes the given availability zones unavailable. Instances therein are "

ricab · 2025-07-31T17:30:46Z

src/client/cli/cmd/enable_zones.cpp

+
+    const auto on_failure = [this, &spinner](const grpc::Status& status) {
+        spinner.stop();
+        return standard_failure_handler_for(name(), cerr, status);


If I use a bad AZ, I get this error message:

$ multipass enable-zones asdf enable-zones failed: no AZ with name "asdf" found

Could we have another PR to avoid "AZ" in messages to the user? Let's stick to "zone" as a single nomenclature. "Availability zone" in the help text and docs is fine though IMO.

This PR adds the CLI commands `enable-zones` and `disable-zones` which send the gRPC calls for making an AZ available or unavailable. MULTI-1872

andrei-toterman force-pushed the az-info-retrieval branch from 6ed85d3 to 61f8197 Compare February 7, 2025 14:19

andrei-toterman force-pushed the az-enable-disable-commands branch from 312f88b to 383d688 Compare February 7, 2025 14:20

andrei-toterman force-pushed the az-info-retrieval branch from 61f8197 to a8dfbc5 Compare February 7, 2025 23:43

andrei-toterman force-pushed the az-enable-disable-commands branch from 383d688 to 3e0da18 Compare February 7, 2025 23:43

andrei-toterman force-pushed the az-info-retrieval branch from a8dfbc5 to 4f5405a Compare February 7, 2025 23:46

andrei-toterman force-pushed the az-enable-disable-commands branch from 3e0da18 to 0a4ee8e Compare February 7, 2025 23:46

xmkg approved these changes Feb 11, 2025

View reviewed changes

src/client/cli/cmd/disable_zones.cpp Outdated Show resolved Hide resolved

andrei-toterman force-pushed the az-info-retrieval branch from 4f5405a to da81d8c Compare February 25, 2025 12:39

andrei-toterman force-pushed the az-enable-disable-commands branch from 0a4ee8e to 601c7af Compare February 25, 2025 12:40

andrei-toterman force-pushed the az-info-retrieval branch from da81d8c to 252c179 Compare February 27, 2025 11:50

andrei-toterman force-pushed the az-enable-disable-commands branch from 601c7af to 043edde Compare February 27, 2025 11:50

andrei-toterman requested a review from ricab February 27, 2025 11:53

ricab reviewed Mar 24, 2025

View reviewed changes

andrei-toterman force-pushed the az-info-retrieval branch 3 times, most recently from 8b07126 to 78e9b91 Compare April 2, 2025 12:27

andrei-toterman force-pushed the az-enable-disable-commands branch from 043edde to d91dc99 Compare April 2, 2025 14:06

ricab self-requested a review April 4, 2025 15:01

andrei-toterman force-pushed the az-enable-disable-commands branch from d91dc99 to 7ec3ba7 Compare April 8, 2025 13:45

andrei-toterman force-pushed the az-info-retrieval branch 2 times, most recently from 089be1d to e859b3f Compare April 8, 2025 14:53

andrei-toterman force-pushed the az-enable-disable-commands branch from 7ec3ba7 to fa9880f Compare April 8, 2025 14:53

andrei-toterman force-pushed the az-info-retrieval branch from e859b3f to 848b4c3 Compare April 9, 2025 10:41

andrei-toterman force-pushed the az-enable-disable-commands branch from fa9880f to badabe0 Compare April 9, 2025 10:41

ricab mentioned this pull request May 2, 2025

Add --zone argument to launch command #4011

Merged

levkropp force-pushed the az-info-retrieval branch from 989f543 to 382dfca Compare May 12, 2025 13:19

levkropp force-pushed the az-enable-disable-commands branch from 479d1b2 to d22e267 Compare May 12, 2025 13:58

Add enable-zones and disable-zones commands

d3c57b4

levkropp force-pushed the az-enable-disable-commands branch from d22e267 to d3c57b4 Compare May 12, 2025 14:42

levkropp force-pushed the az-enable-disable-commands branch from 9cc4b22 to c7e2314 Compare June 2, 2025 18:56

levkropp requested a review from ricab June 27, 2025 15:25

levkropp mentioned this pull request Jul 10, 2025

[cli] add retrieval of zones #3925

Merged

ricab requested changes Jul 10, 2025

View reviewed changes

levkropp added 4 commits July 10, 2025 16:27

Refine descriptions in disable_zones

be0a243

Refine description for enable_zones

13b4e3d

disable_zones accepts an empty answer to mean Yes

73c4cf5

remove redundant no arguments check

df16559

levkropp force-pushed the az-enable-disable-commands branch from 506dbd9 to affecab Compare July 11, 2025 20:59

empty ZonesStateRequest = all zones

e1b367e

levkropp force-pushed the az-enable-disable-commands branch from affecab to e1b367e Compare July 11, 2025 21:42

levkropp added 2 commits July 11, 2025 18:01

add tests for DisableZones::confirm() & on_failure

a0f8c93

add tests for launch.cpp

3ecc556

levkropp force-pushed the az-enable-disable-commands branch from 677c275 to 3ecc556 Compare July 14, 2025 17:30

levkropp added 2 commits July 14, 2025 13:49

cover enable zones on_failure

76e053e

cover !is_live() in disable_zones

c319729

levkropp force-pushed the az-enable-disable-commands branch from c623e24 to bf18f23 Compare July 15, 2025 16:34

add daemon coverage (requires mocked az headers)

c2a338e

levkropp force-pushed the az-enable-disable-commands branch from bf18f23 to c2a338e Compare July 15, 2025 16:38

cover DisableZones::confirm() with multiple zones

5a32132

levkropp force-pushed the az-enable-disable-commands branch from f604edd to 5a32132 Compare July 15, 2025 17:10

levkropp requested a review from ricab July 15, 2025 17:47

ricab approved these changes Jul 31, 2025

View reviewed changes

levkropp added 3 commits July 31, 2025 15:05

use az_manager var for both if branches in daemon

406cd34

make DisableZones::confirm() const

f83e49b

add missing space to DisableZones::description string

141fe74

Base automatically changed from az-info-retrieval to availability-zones August 18, 2025 16:33

levkropp merged commit 8b4f5dd into availability-zones Aug 18, 2025
24 of 26 checks passed

levkropp deleted the az-enable-disable-commands branch August 18, 2025 16:34

Sploder12 pushed a commit that referenced this pull request Aug 18, 2025

[cli] add enable/disable-zones commands (#3926)

9d40eba

This PR adds the CLI commands `enable-zones` and `disable-zones` which send the gRPC calls for making an AZ available or unavailable. MULTI-1872

	return QStringLiteral("Makes the given availability zones unavailable. Instances therein are"
	return QStringLiteral("Makes the given availability zones unavailable. Instances therein are "

[cli] add enable/disable-zones commands #3926

[cli] add enable/disable-zones commands #3926

Uh oh!

Conversation

andrei-toterman commented Feb 7, 2025 • edited by Sploder12 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Feb 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

xmkg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ricab left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ricab left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ricab left a comment

Choose a reason for hiding this comment

Uh oh!

ricab Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

ricab Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

ricab Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

ricab Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

andrei-toterman commented Feb 7, 2025 •

edited by Sploder12

Loading

codecov bot commented Feb 8, 2025 •

edited

Loading