Skip to content

Commit af64535

Browse files
authored
[Monitor] az monitor log-analytics workspace update: Add parameter sku_name (#28411)
* add new version cmd
1 parent 853c2b8 commit af64535

File tree

50 files changed

+26172
-25869
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+26172
-25869
lines changed

src/azure-cli/azure/cli/command_modules/acr/tests/latest/recordings/test_acr_create_with_audits.yaml

+68-124
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/appservice/tests/latest/recordings/test_functionapp_existing_workspace.yaml

+692-401
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/appservice/tests/latest/recordings/test_functionapp_with_app_insights_conn_string.yaml

+180-181
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/monitor/aaz/latest/monitor/log_analytics/cluster/_create.py

+40-27
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Create(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2021-06-01",
25+
"version": "2022-10-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.operationalinsights/clusters/{}", "2021-06-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.operationalinsights/clusters/{}", "2022-10-01"],
2828
]
2929
}
3030

@@ -49,7 +49,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
4949
options=["-n", "--name", "--cluster-name"],
5050
help="The name of the Log Analytics cluster.",
5151
required=True,
52-
id_part="name",
5352
fmt=AAZStrArgFormat(
5453
pattern="^[A-Za-z0-9][A-Za-z0-9-]+[A-Za-z0-9]$",
5554
max_length=63,
@@ -59,20 +58,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
5958
_args_schema.resource_group = AAZResourceGroupNameArg(
6059
required=True,
6160
)
62-
_args_schema.location = AAZResourceLocationArg(
63-
help="The geo-location where the resource lives",
64-
required=True,
65-
fmt=AAZResourceLocationArgFormat(
66-
resource_group_arg="resource_group",
67-
),
68-
)
69-
_args_schema.tags = AAZDictArg(
70-
options=["--tags"],
71-
help="Resource tags.",
72-
)
73-
74-
tags = cls._args_schema.tags
75-
tags.Element = AAZStrArg()
7661

7762
# define Arg Group "Identity"
7863

@@ -82,7 +67,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
8267
arg_group="Identity",
8368
help="Type of managed service identity.",
8469
default="SystemAssigned",
85-
enum={"None": "None", "SystemAssigned": "SystemAssigned", "UserAssigned": "UserAssigned"},
70+
enum={"None": "None", "SystemAssigned": "SystemAssigned", "SystemAssigned,UserAssigned": "SystemAssigned,UserAssigned", "UserAssigned": "UserAssigned"},
8671
)
8772
_args_schema.user_assigned = AAZDictArg(
8873
options=["--user-assigned"],
@@ -92,6 +77,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
9277

9378
user_assigned = cls._args_schema.user_assigned
9479
user_assigned.Element = AAZObjectArg(
80+
nullable=True,
9581
blank={},
9682
)
9783

@@ -119,6 +105,26 @@ def _build_arguments_schema(cls, *args, **kwargs):
119105
help="The version of the key associated with the Log Analytics cluster.",
120106
)
121107

108+
# define Arg Group "Parameters"
109+
110+
_args_schema = cls._args_schema
111+
_args_schema.location = AAZResourceLocationArg(
112+
arg_group="Parameters",
113+
help="The geo-location where the resource lives",
114+
required=True,
115+
fmt=AAZResourceLocationArgFormat(
116+
resource_group_arg="resource_group",
117+
),
118+
)
119+
_args_schema.tags = AAZDictArg(
120+
options=["--tags"],
121+
arg_group="Parameters",
122+
help="Resource tags.",
123+
)
124+
125+
tags = cls._args_schema.tags
126+
tags.Element = AAZStrArg()
127+
122128
# define Arg Group "Properties"
123129

124130
_args_schema = cls._args_schema
@@ -136,7 +142,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
136142
options=["--sku-capacity"],
137143
arg_group="Sku",
138144
help="The capacity of the SKU. It can be decreased only after 31 days.",
139-
enum={"1000": 1000, "2000": 2000, "500": 500, "5000": 5000},
145+
enum={"100": 100, "1000": 1000, "10000": 10000, "200": 200, "2000": 2000, "25000": 25000, "300": 300, "400": 400, "500": 500, "5000": 5000, "50000": 50000},
140146
)
141147
_args_schema.sku_name = AAZStrArg(
142148
options=["--sku-name"],
@@ -152,11 +158,11 @@ def _execute_operations(self):
152158
yield self.ClustersCreateOrUpdate(ctx=self.ctx)()
153159
self.post_operations()
154160

155-
# @register_callback
161+
@register_callback
156162
def pre_operations(self):
157163
pass
158164

159-
# @register_callback
165+
@register_callback
160166
def post_operations(self):
161167
pass
162168

@@ -228,7 +234,7 @@ def url_parameters(self):
228234
def query_parameters(self):
229235
parameters = {
230236
**self.serialize_query_param(
231-
"api-version", "2021-06-01",
237+
"api-version", "2022-10-01",
232238
required=True,
233239
),
234240
}
@@ -266,7 +272,7 @@ def content(self):
266272

267273
user_assigned_identities = _builder.get(".identity.userAssignedIdentities")
268274
if user_assigned_identities is not None:
269-
user_assigned_identities.set_elements(AAZObjectType, ".")
275+
user_assigned_identities.set_elements(AAZObjectType, ".", typ_kwargs={"nullable": True})
270276

271277
properties = _builder.get(".properties")
272278
if properties is not None:
@@ -345,7 +351,9 @@ def _build_schema_on_200_201(cls):
345351
)
346352

347353
user_assigned_identities = cls._schema_on_200_201.identity.user_assigned_identities
348-
user_assigned_identities.Element = AAZObjectType()
354+
user_assigned_identities.Element = AAZObjectType(
355+
nullable=True,
356+
)
349357

350358
_element = cls._schema_on_200_201.identity.user_assigned_identities.Element
351359
_element.client_id = AAZStrType(
@@ -379,6 +387,9 @@ def _build_schema_on_200_201(cls):
379387
properties.is_availability_zones_enabled = AAZBoolType(
380388
serialized_name="isAvailabilityZonesEnabled",
381389
)
390+
properties.is_double_encryption_enabled = AAZBoolType(
391+
serialized_name="isDoubleEncryptionEnabled",
392+
)
382393
properties.key_vault_properties = AAZObjectType(
383394
serialized_name="keyVaultProperties",
384395
)
@@ -392,9 +403,7 @@ def _build_schema_on_200_201(cls):
392403
)
393404

394405
associated_workspaces = cls._schema_on_200_201.properties.associated_workspaces
395-
associated_workspaces.Element = AAZObjectType(
396-
flags={"read_only": True},
397-
)
406+
associated_workspaces.Element = AAZObjectType()
398407

399408
_element = cls._schema_on_200_201.properties.associated_workspaces.Element
400409
_element.associate_date = AAZStrType(
@@ -448,4 +457,8 @@ def _build_schema_on_200_201(cls):
448457
return cls._schema_on_200_201
449458

450459

460+
class _CreateHelper:
461+
"""Helper class for Create"""
462+
463+
451464
__all__ = ["Create"]

src/azure-cli/azure/cli/command_modules/monitor/aaz/latest/monitor/log_analytics/cluster/_delete.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class Delete(AAZCommand):
2323
"""
2424

2525
_aaz_info = {
26-
"version": "2021-06-01",
26+
"version": "2022-10-01",
2727
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.operationalinsights/clusters/{}", "2021-06-01"],
28+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.operationalinsights/clusters/{}", "2022-10-01"],
2929
]
3030
}
3131

@@ -62,11 +62,11 @@ def _execute_operations(self):
6262
yield self.ClustersDelete(ctx=self.ctx)()
6363
self.post_operations()
6464

65-
# @register_callback
65+
@register_callback
6666
def pre_operations(self):
6767
pass
6868

69-
# @register_callback
69+
@register_callback
7070
def post_operations(self):
7171
pass
7272

@@ -143,7 +143,7 @@ def url_parameters(self):
143143
def query_parameters(self):
144144
parameters = {
145145
**self.serialize_query_param(
146-
"api-version", "2021-06-01",
146+
"api-version", "2022-10-01",
147147
required=True,
148148
),
149149
}
@@ -156,4 +156,8 @@ def on_204(self, session):
156156
pass
157157

158158

159+
class _DeleteHelper:
160+
"""Helper class for Delete"""
161+
162+
159163
__all__ = ["Delete"]

src/azure-cli/azure/cli/command_modules/monitor/aaz/latest/monitor/log_analytics/cluster/_list.py

+27-17
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ class List(AAZCommand):
2525
"""
2626

2727
_aaz_info = {
28-
"version": "2021-06-01",
28+
"version": "2022-10-01",
2929
"resources": [
30-
["mgmt-plane", "/subscriptions/{}/providers/microsoft.operationalinsights/clusters", "2021-06-01"],
31-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.operationalinsights/clusters", "2021-06-01"],
30+
["mgmt-plane", "/subscriptions/{}/providers/microsoft.operationalinsights/clusters", "2022-10-01"],
31+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.operationalinsights/clusters", "2022-10-01"],
3232
]
3333
}
3434

35+
AZ_SUPPORT_PAGINATION = True
36+
3537
def _handler(self, command_args):
3638
super()._handler(command_args)
3739
return self.build_paging(self._execute_operations, self._output)
@@ -60,11 +62,11 @@ def _execute_operations(self):
6062
self.ClustersList(ctx=self.ctx)()
6163
self.post_operations()
6264

63-
# @register_callback
65+
@register_callback
6466
def pre_operations(self):
6567
pass
6668

67-
# @register_callback
69+
@register_callback
6870
def post_operations(self):
6971
pass
7072

@@ -117,7 +119,7 @@ def url_parameters(self):
117119
def query_parameters(self):
118120
parameters = {
119121
**self.serialize_query_param(
120-
"api-version", "2021-06-01",
122+
"api-version", "2022-10-01",
121123
required=True,
122124
),
123125
}
@@ -195,7 +197,9 @@ def _build_schema_on_200(cls):
195197
)
196198

197199
user_assigned_identities = cls._schema_on_200.value.Element.identity.user_assigned_identities
198-
user_assigned_identities.Element = AAZObjectType()
200+
user_assigned_identities.Element = AAZObjectType(
201+
nullable=True,
202+
)
199203

200204
_element = cls._schema_on_200.value.Element.identity.user_assigned_identities.Element
201205
_element.client_id = AAZStrType(
@@ -210,7 +214,6 @@ def _build_schema_on_200(cls):
210214
properties = cls._schema_on_200.value.Element.properties
211215
properties.associated_workspaces = AAZListType(
212216
serialized_name="associatedWorkspaces",
213-
flags={"read_only": True},
214217
)
215218
properties.billing_type = AAZStrType(
216219
serialized_name="billingType",
@@ -229,6 +232,9 @@ def _build_schema_on_200(cls):
229232
properties.is_availability_zones_enabled = AAZBoolType(
230233
serialized_name="isAvailabilityZonesEnabled",
231234
)
235+
properties.is_double_encryption_enabled = AAZBoolType(
236+
serialized_name="isDoubleEncryptionEnabled",
237+
)
232238
properties.key_vault_properties = AAZObjectType(
233239
serialized_name="keyVaultProperties",
234240
)
@@ -242,9 +248,7 @@ def _build_schema_on_200(cls):
242248
)
243249

244250
associated_workspaces = cls._schema_on_200.value.Element.properties.associated_workspaces
245-
associated_workspaces.Element = AAZObjectType(
246-
flags={"read_only": True},
247-
)
251+
associated_workspaces.Element = AAZObjectType()
248252

249253
_element = cls._schema_on_200.value.Element.properties.associated_workspaces.Element
250254
_element.associate_date = AAZStrType(
@@ -337,7 +341,7 @@ def url_parameters(self):
337341
def query_parameters(self):
338342
parameters = {
339343
**self.serialize_query_param(
340-
"api-version", "2021-06-01",
344+
"api-version", "2022-10-01",
341345
required=True,
342346
),
343347
}
@@ -415,7 +419,9 @@ def _build_schema_on_200(cls):
415419
)
416420

417421
user_assigned_identities = cls._schema_on_200.value.Element.identity.user_assigned_identities
418-
user_assigned_identities.Element = AAZObjectType()
422+
user_assigned_identities.Element = AAZObjectType(
423+
nullable=True,
424+
)
419425

420426
_element = cls._schema_on_200.value.Element.identity.user_assigned_identities.Element
421427
_element.client_id = AAZStrType(
@@ -430,7 +436,6 @@ def _build_schema_on_200(cls):
430436
properties = cls._schema_on_200.value.Element.properties
431437
properties.associated_workspaces = AAZListType(
432438
serialized_name="associatedWorkspaces",
433-
flags={"read_only": True},
434439
)
435440
properties.billing_type = AAZStrType(
436441
serialized_name="billingType",
@@ -449,6 +454,9 @@ def _build_schema_on_200(cls):
449454
properties.is_availability_zones_enabled = AAZBoolType(
450455
serialized_name="isAvailabilityZonesEnabled",
451456
)
457+
properties.is_double_encryption_enabled = AAZBoolType(
458+
serialized_name="isDoubleEncryptionEnabled",
459+
)
452460
properties.key_vault_properties = AAZObjectType(
453461
serialized_name="keyVaultProperties",
454462
)
@@ -462,9 +470,7 @@ def _build_schema_on_200(cls):
462470
)
463471

464472
associated_workspaces = cls._schema_on_200.value.Element.properties.associated_workspaces
465-
associated_workspaces.Element = AAZObjectType(
466-
flags={"read_only": True},
467-
)
473+
associated_workspaces.Element = AAZObjectType()
468474

469475
_element = cls._schema_on_200.value.Element.properties.associated_workspaces.Element
470476
_element.associate_date = AAZStrType(
@@ -518,4 +524,8 @@ def _build_schema_on_200(cls):
518524
return cls._schema_on_200
519525

520526

527+
class _ListHelper:
528+
"""Helper class for List"""
529+
530+
521531
__all__ = ["List"]

0 commit comments

Comments
 (0)