Skip to content

Commit 1681210

Browse files
ABZhang0Alan Zhang
andauthored
[amg] Remove essential SKU resource creation (#9128)
* Remove essential SKU resource creation * Refine arg error msg * Remove essential SKU resource creation * Refine arg error msg * New test recordings * Redo test recordings --------- Co-authored-by: Alan Zhang <alanzhang@microsoft.com>
1 parent bd9c96f commit 1681210

File tree

9 files changed

+8479
-8158
lines changed

9 files changed

+8479
-8158
lines changed

src/amg/HISTORY.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,8 @@ Release History
151151
* `az grafana folder create`: support parent folder argument for nested folder creation
152152
* `az grafana folder list`: support nested folders
153153
* `az grafana folder show`: support nested folders
154-
* `az grafana backup`: include corresponding nested folders when individual folders are specified
154+
* `az grafana backup`: include corresponding nested folders when individual folders are specified
155+
156+
2.8.1
157+
++++++
158+
* `az grafana create`: block creation for resources of Essential SKU tier

src/amg/azext_amg/custom.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ def pre_operations(self):
6262
if not args.skip_system_assigned_identity:
6363
args.identity = {"type": "SystemAssigned"}
6464

65+
if args.sku_tier and str(args.sku_tier).lower() == "essential":
66+
raise ArgumentUsageError(
67+
"Creation of Grafana resources with the 'Essential' SKU tier is not supported. "
68+
"Supported SKU tiers are: 'Standard'. "
69+
"Please specify a supported SKU tier using the '--sku-tier' parameter."
70+
)
71+
6572
# override the output method to create role assignments after instance creation
6673
def _output(self, *args, **kwargs):
6774
from azure.cli.core.commands.arm import resolve_role_id

src/amg/azext_amg/tests/latest/recordings/test_amg_backup_restore.yaml

Lines changed: 2594 additions & 2541 deletions
Large diffs are not rendered by default.

src/amg/azext_amg/tests/latest/recordings/test_amg_crud.yaml

Lines changed: 246 additions & 448 deletions
Large diffs are not rendered by default.

src/amg/azext_amg/tests/latest/recordings/test_amg_e2e.yaml

Lines changed: 655 additions & 605 deletions
Large diffs are not rendered by default.

src/amg/azext_amg/tests/latest/recordings/test_amg_migrate_override.yaml

Lines changed: 2531 additions & 2522 deletions
Large diffs are not rendered by default.

src/amg/azext_amg/tests/latest/recordings/test_amg_migrate_simple_e2e.yaml

Lines changed: 2036 additions & 1588 deletions
Large diffs are not rendered by default.

src/amg/azext_amg/tests/latest/recordings/test_amg_private_endpoint.yaml

Lines changed: 404 additions & 452 deletions
Large diffs are not rendered by default.

src/amg/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# TODO: Confirm this is the right version number you want and it matches your
1818
# HISTORY.rst entry.
19-
VERSION = '2.8.0'
19+
VERSION = '2.8.1'
2020

2121
# The full list of classifiers is available at
2222
# https://pypi.python.org/pypi?%3Aaction=list_classifiers

0 commit comments

Comments
 (0)