Skip to content

Commit 4ebc299

Browse files
jamesvoongmsjamesvoongms
authored
[dns-resolver] Add DNS resolver 2023-07-01-preview changes into azure cli extensions (#8289)
* Add DNS resolver 2023-07-01-preview changes into azure cli extensions * Re-run test commands and switch to only one command group * Change parameter names to be shorter * Fix setup.py name
1 parent 25efefa commit 4ebc299

File tree

88 files changed

+15827
-3542
lines changed

Some content is hidden

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

88 files changed

+15827
-3542
lines changed

‎src/dns-resolver/HISTORY.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
33
Release History
44
===============
5+
1.0.0
6+
++++++
7+
* Bump from 2022-07-01 to 2023-07-01-preview
8+
59
0.2.0
610
++++++
711
* Bump from 2020-04-01-preview to 2022-07-01

‎src/dns-resolver/azext_dnsresolver/aaz/latest/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@
44
#
55
# Code generated by aaz-dev-tools
66
# --------------------------------------------------------------------------------------------
7+
8+
# pylint: skip-file
9+
# flake8: noqa
10+

‎src/dns-resolver/azext_dnsresolver/aaz/latest/dns_resolver/_create.py‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Create(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2022-07-01",
25+
"version": "2023-07-01-preview",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/dnsresolvers/{}", "2022-07-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/dnsresolvers/{}", "2023-07-01-preview"],
2828
]
2929
}
3030

@@ -57,12 +57,16 @@ def _build_arguments_schema(cls, *args, **kwargs):
5757
options=["-n", "--name", "--dns-resolver-name"],
5858
help="The name of the DNS resolver.",
5959
required=True,
60-
id_part="name",
6160
)
6261
_args_schema.resource_group = AAZResourceGroupNameArg(
6362
required=True,
6463
)
64+
65+
# define Arg Group "Parameters"
66+
67+
_args_schema = cls._args_schema
6568
_args_schema.location = AAZResourceLocationArg(
69+
arg_group="Parameters",
6670
help="Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.",
6771
required=True,
6872
fmt=AAZResourceLocationArgFormat(
@@ -71,6 +75,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
7175
)
7276
_args_schema.tags = AAZDictArg(
7377
options=["--tags"],
78+
arg_group="Parameters",
7479
help="Space-separated tags: key[=value] [key[=value] ...].",
7580
)
7681

@@ -89,7 +94,17 @@ def _build_arguments_schema(cls, *args, **kwargs):
8994
return cls._args_schema
9095

9196
def _execute_operations(self):
97+
self.pre_operations()
9298
yield self.DnsResolversCreateOrUpdate(ctx=self.ctx)()
99+
self.post_operations()
100+
101+
@register_callback
102+
def pre_operations(self):
103+
pass
104+
105+
@register_callback
106+
def post_operations(self):
107+
pass
93108

94109
def _output(self, *args, **kwargs):
95110
result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
@@ -159,7 +174,7 @@ def url_parameters(self):
159174
def query_parameters(self):
160175
parameters = {
161176
**self.serialize_query_param(
162-
"api-version", "2022-07-01",
177+
"api-version", "2023-07-01-preview",
163178
required=True,
164179
),
165180
}
@@ -276,27 +291,21 @@ def _build_schema_on_200_201(cls):
276291
system_data = cls._schema_on_200_201.system_data
277292
system_data.created_at = AAZStrType(
278293
serialized_name="createdAt",
279-
flags={"read_only": True},
280294
)
281295
system_data.created_by = AAZStrType(
282296
serialized_name="createdBy",
283-
flags={"read_only": True},
284297
)
285298
system_data.created_by_type = AAZStrType(
286299
serialized_name="createdByType",
287-
flags={"read_only": True},
288300
)
289301
system_data.last_modified_at = AAZStrType(
290302
serialized_name="lastModifiedAt",
291-
flags={"read_only": True},
292303
)
293304
system_data.last_modified_by = AAZStrType(
294305
serialized_name="lastModifiedBy",
295-
flags={"read_only": True},
296306
)
297307
system_data.last_modified_by_type = AAZStrType(
298308
serialized_name="lastModifiedByType",
299-
flags={"read_only": True},
300309
)
301310

302311
tags = cls._schema_on_200_201.tags
@@ -305,4 +314,8 @@ def _build_schema_on_200_201(cls):
305314
return cls._schema_on_200_201
306315

307316

317+
class _CreateHelper:
318+
"""Helper class for Create"""
319+
320+
308321
__all__ = ["Create"]

‎src/dns-resolver/azext_dnsresolver/aaz/latest/dns_resolver/_delete.py‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class Delete(AAZCommand):
2323
"""
2424

2525
_aaz_info = {
26-
"version": "2022-07-01",
26+
"version": "2023-07-01-preview",
2727
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/dnsresolvers/{}", "2022-07-01"],
28+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/dnsresolvers/{}", "2023-07-01-preview"],
2929
]
3030
}
3131

@@ -62,7 +62,17 @@ def _build_arguments_schema(cls, *args, **kwargs):
6262
return cls._args_schema
6363

6464
def _execute_operations(self):
65+
self.pre_operations()
6566
yield self.DnsResolversDelete(ctx=self.ctx)()
67+
self.post_operations()
68+
69+
@register_callback
70+
def pre_operations(self):
71+
pass
72+
73+
@register_callback
74+
def post_operations(self):
75+
pass
6676

6777
class DnsResolversDelete(AAZHttpOperation):
6878
CLIENT_TYPE = "MgmtClient"
@@ -137,7 +147,7 @@ def url_parameters(self):
137147
def query_parameters(self):
138148
parameters = {
139149
**self.serialize_query_param(
140-
"api-version", "2022-07-01",
150+
"api-version", "2023-07-01-preview",
141151
required=True,
142152
),
143153
}
@@ -159,4 +169,8 @@ def on_204(self, session):
159169
pass
160170

161171

172+
class _DeleteHelper:
173+
"""Helper class for Delete"""
174+
175+
162176
__all__ = ["Delete"]

‎src/dns-resolver/azext_dnsresolver/aaz/latest/dns_resolver/_list.py‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ class List(AAZCommand):
2828
"""
2929

3030
_aaz_info = {
31-
"version": "2022-07-01",
31+
"version": "2023-07-01-preview",
3232
"resources": [
33-
["mgmt-plane", "/subscriptions/{}/providers/microsoft.network/dnsresolvers", "2022-07-01"],
34-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/dnsresolvers", "2022-07-01"],
33+
["mgmt-plane", "/subscriptions/{}/providers/microsoft.network/dnsresolvers", "2023-07-01-preview"],
34+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/dnsresolvers", "2023-07-01-preview"],
3535
]
3636
}
3737

38+
AZ_SUPPORT_PAGINATION = True
39+
3840
def _handler(self, command_args):
3941
super()._handler(command_args)
4042
return self.build_paging(self._execute_operations, self._output)
@@ -58,19 +60,29 @@ def _build_arguments_schema(cls, *args, **kwargs):
5860
return cls._args_schema
5961

6062
def _execute_operations(self):
61-
condition_0 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
62-
condition_1 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
63+
self.pre_operations()
64+
condition_0 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
65+
condition_1 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
6366
if condition_0:
64-
self.DnsResolversListByResourceGroup(ctx=self.ctx)()
65-
if condition_1:
6667
self.DnsResolversList(ctx=self.ctx)()
68+
if condition_1:
69+
self.DnsResolversListByResourceGroup(ctx=self.ctx)()
70+
self.post_operations()
71+
72+
@register_callback
73+
def pre_operations(self):
74+
pass
75+
76+
@register_callback
77+
def post_operations(self):
78+
pass
6779

6880
def _output(self, *args, **kwargs):
6981
result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True)
7082
next_link = self.deserialize_output(self.ctx.vars.instance.next_link)
7183
return result, next_link
7284

73-
class DnsResolversListByResourceGroup(AAZHttpOperation):
85+
class DnsResolversList(AAZHttpOperation):
7486
CLIENT_TYPE = "MgmtClient"
7587

7688
def __call__(self, *args, **kwargs):
@@ -84,7 +96,7 @@ def __call__(self, *args, **kwargs):
8496
@property
8597
def url(self):
8698
return self.client.format_url(
87-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/dnsResolvers",
99+
"/subscriptions/{subscriptionId}/providers/Microsoft.Network/dnsResolvers",
88100
**self.url_parameters
89101
)
90102

@@ -99,10 +111,6 @@ def error_format(self):
99111
@property
100112
def url_parameters(self):
101113
parameters = {
102-
**self.serialize_url_param(
103-
"resourceGroupName", self.ctx.args.resource_group,
104-
required=True,
105-
),
106114
**self.serialize_url_param(
107115
"subscriptionId", self.ctx.subscription_id,
108116
required=True,
@@ -117,7 +125,7 @@ def query_parameters(self):
117125
"$top", self.ctx.args.top,
118126
),
119127
**self.serialize_query_param(
120-
"api-version", "2022-07-01",
128+
"api-version", "2023-07-01-preview",
121129
required=True,
122130
),
123131
}
@@ -210,35 +218,29 @@ def _build_schema_on_200(cls):
210218
system_data = cls._schema_on_200.value.Element.system_data
211219
system_data.created_at = AAZStrType(
212220
serialized_name="createdAt",
213-
flags={"read_only": True},
214221
)
215222
system_data.created_by = AAZStrType(
216223
serialized_name="createdBy",
217-
flags={"read_only": True},
218224
)
219225
system_data.created_by_type = AAZStrType(
220226
serialized_name="createdByType",
221-
flags={"read_only": True},
222227
)
223228
system_data.last_modified_at = AAZStrType(
224229
serialized_name="lastModifiedAt",
225-
flags={"read_only": True},
226230
)
227231
system_data.last_modified_by = AAZStrType(
228232
serialized_name="lastModifiedBy",
229-
flags={"read_only": True},
230233
)
231234
system_data.last_modified_by_type = AAZStrType(
232235
serialized_name="lastModifiedByType",
233-
flags={"read_only": True},
234236
)
235237

236238
tags = cls._schema_on_200.value.Element.tags
237239
tags.Element = AAZStrType()
238240

239241
return cls._schema_on_200
240242

241-
class DnsResolversList(AAZHttpOperation):
243+
class DnsResolversListByResourceGroup(AAZHttpOperation):
242244
CLIENT_TYPE = "MgmtClient"
243245

244246
def __call__(self, *args, **kwargs):
@@ -252,7 +254,7 @@ def __call__(self, *args, **kwargs):
252254
@property
253255
def url(self):
254256
return self.client.format_url(
255-
"/subscriptions/{subscriptionId}/providers/Microsoft.Network/dnsResolvers",
257+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/dnsResolvers",
256258
**self.url_parameters
257259
)
258260

@@ -267,6 +269,10 @@ def error_format(self):
267269
@property
268270
def url_parameters(self):
269271
parameters = {
272+
**self.serialize_url_param(
273+
"resourceGroupName", self.ctx.args.resource_group,
274+
required=True,
275+
),
270276
**self.serialize_url_param(
271277
"subscriptionId", self.ctx.subscription_id,
272278
required=True,
@@ -281,7 +287,7 @@ def query_parameters(self):
281287
"$top", self.ctx.args.top,
282288
),
283289
**self.serialize_query_param(
284-
"api-version", "2022-07-01",
290+
"api-version", "2023-07-01-preview",
285291
required=True,
286292
),
287293
}
@@ -374,27 +380,21 @@ def _build_schema_on_200(cls):
374380
system_data = cls._schema_on_200.value.Element.system_data
375381
system_data.created_at = AAZStrType(
376382
serialized_name="createdAt",
377-
flags={"read_only": True},
378383
)
379384
system_data.created_by = AAZStrType(
380385
serialized_name="createdBy",
381-
flags={"read_only": True},
382386
)
383387
system_data.created_by_type = AAZStrType(
384388
serialized_name="createdByType",
385-
flags={"read_only": True},
386389
)
387390
system_data.last_modified_at = AAZStrType(
388391
serialized_name="lastModifiedAt",
389-
flags={"read_only": True},
390392
)
391393
system_data.last_modified_by = AAZStrType(
392394
serialized_name="lastModifiedBy",
393-
flags={"read_only": True},
394395
)
395396
system_data.last_modified_by_type = AAZStrType(
396397
serialized_name="lastModifiedByType",
397-
flags={"read_only": True},
398398
)
399399

400400
tags = cls._schema_on_200.value.Element.tags
@@ -403,4 +403,8 @@ def _build_schema_on_200(cls):
403403
return cls._schema_on_200
404404

405405

406+
class _ListHelper:
407+
"""Helper class for List"""
408+
409+
406410
__all__ = ["List"]

0 commit comments

Comments
 (0)