Skip to content

Commit 32c3f76

Browse files
Ptnan7JingnanXu
Ptnan7
and
JingnanXu
authored
{CDN} Version upgraded to 2025 09 01 p, edgeaction suppoort (#33123)
Co-authored-by: JingnanXu <jingnanxu@microsoft.com>
1 parent 34c570d commit 32c3f76

Some content is hidden

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

44 files changed

+2523
-8264
lines changed

‎src/azure-cli/azure/cli/command_modules/cdn/aaz/latest/afd/rule/_create.py‎

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

‎src/azure-cli/azure/cli/command_modules/cdn/aaz/latest/afd/rule/_delete.py‎

Lines changed: 3 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": "2025-06-01",
26+
"version": "2025-09-01-preview",
2727
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/rulesets/{}/rules/{}", "2025-06-01"],
28+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/rulesets/{}/rules/{}", "2025-09-01-preview"],
2929
]
3030
}
3131

@@ -168,7 +168,7 @@ def url_parameters(self):
168168
def query_parameters(self):
169169
parameters = {
170170
**self.serialize_query_param(
171-
"api-version", "2025-06-01",
171+
"api-version", "2025-09-01-preview",
172172
required=True,
173173
),
174174
}

‎src/azure-cli/azure/cli/command_modules/cdn/aaz/latest/afd/rule/_list.py‎

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

2424
_aaz_info = {
25-
"version": "2025-06-01",
25+
"version": "2025-09-01-preview",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/rulesets/{}/rules", "2025-06-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/rulesets/{}/rules", "2025-09-01-preview"],
2828
]
2929
}
3030

@@ -135,7 +135,7 @@ def url_parameters(self):
135135
def query_parameters(self):
136136
parameters = {
137137
**self.serialize_query_param(
138-
"api-version", "2025-06-01",
138+
"api-version", "2025-09-01-preview",
139139
required=True,
140140
),
141141
}
@@ -172,7 +172,7 @@ def _build_schema_on_200(cls):
172172
serialized_name="nextLink",
173173
)
174174
_schema_on_200.value = AAZListType(
175-
flags={"read_only": True},
175+
flags={"required": True},
176176
)
177177

178178
value = cls._schema_on_200.value
@@ -197,9 +197,7 @@ def _build_schema_on_200(cls):
197197
)
198198

199199
properties = cls._schema_on_200.value.Element.properties
200-
properties.actions = AAZListType(
201-
flags={"required": True},
202-
)
200+
properties.actions = AAZListType()
203201
properties.conditions = AAZListType()
204202
properties.deployment_status = AAZStrType(
205203
serialized_name="deploymentStatus",
@@ -208,9 +206,7 @@ def _build_schema_on_200(cls):
208206
properties.match_processing_behavior = AAZStrType(
209207
serialized_name="matchProcessingBehavior",
210208
)
211-
properties.order = AAZIntType(
212-
flags={"required": True},
213-
)
209+
properties.order = AAZIntType()
214210
properties.provisioning_state = AAZStrType(
215211
serialized_name="provisioningState",
216212
flags={"read_only": True},
@@ -228,6 +224,30 @@ def _build_schema_on_200(cls):
228224
flags={"required": True},
229225
)
230226

227+
disc_afd_url_signing = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "AfdUrlSigning")
228+
disc_afd_url_signing.parameters = AAZObjectType(
229+
flags={"required": True},
230+
)
231+
232+
parameters = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "AfdUrlSigning").parameters
233+
parameters.algorithm = AAZStrType()
234+
parameters.key_group_reference = AAZObjectType(
235+
serialized_name="keyGroupReference",
236+
flags={"required": True},
237+
)
238+
_ListHelper._build_schema_resource_reference_read(parameters.key_group_reference)
239+
parameters.parameter_name_override = AAZListType(
240+
serialized_name="parameterNameOverride",
241+
)
242+
parameters.type_name = AAZStrType(
243+
serialized_name="typeName",
244+
flags={"required": True},
245+
)
246+
247+
parameter_name_override = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "AfdUrlSigning").parameters.parameter_name_override
248+
parameter_name_override.Element = AAZObjectType()
249+
_ListHelper._build_schema_url_signing_param_identifier_read(parameter_name_override.Element)
250+
231251
disc_cache_expiration = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "CacheExpiration")
232252
disc_cache_expiration.parameters = AAZObjectType(
233253
flags={"required": True},
@@ -270,6 +290,26 @@ def _build_schema_on_200(cls):
270290
flags={"required": True},
271291
)
272292

293+
disc_edge_action = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "EdgeAction")
294+
disc_edge_action.parameters = AAZObjectType(
295+
flags={"required": True},
296+
)
297+
298+
parameters = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "EdgeAction").parameters
299+
parameters.edge_action_reference = AAZObjectType(
300+
serialized_name="edgeActionReference",
301+
flags={"required": True},
302+
)
303+
_ListHelper._build_schema_resource_reference_read(parameters.edge_action_reference)
304+
parameters.invocation_point = AAZStrType(
305+
serialized_name="invocationPoint",
306+
flags={"required": True},
307+
)
308+
parameters.type_name = AAZStrType(
309+
serialized_name="typeName",
310+
flags={"required": True},
311+
)
312+
273313
disc_modify_request_header = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "ModifyRequestHeader")
274314
disc_modify_request_header.parameters = AAZObjectType(
275315
flags={"required": True},
@@ -292,14 +332,12 @@ def _build_schema_on_200(cls):
292332
serialized_name="originGroup",
293333
flags={"required": True},
294334
)
335+
_ListHelper._build_schema_resource_reference_read(parameters.origin_group)
295336
parameters.type_name = AAZStrType(
296337
serialized_name="typeName",
297338
flags={"required": True},
298339
)
299340

300-
origin_group = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "OriginGroupOverride").parameters.origin_group
301-
origin_group.id = AAZStrType()
302-
303341
disc_route_configuration_override = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "RouteConfigurationOverride")
304342
disc_route_configuration_override.parameters = AAZObjectType(
305343
flags={"required": True},
@@ -341,9 +379,7 @@ def _build_schema_on_200(cls):
341379
origin_group_override.origin_group = AAZObjectType(
342380
serialized_name="originGroup",
343381
)
344-
345-
origin_group = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "RouteConfigurationOverride").parameters.origin_group_override.origin_group
346-
origin_group.id = AAZStrType()
382+
_ListHelper._build_schema_resource_reference_read(origin_group_override.origin_group)
347383

348384
disc_url_redirect = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "UrlRedirect")
349385
disc_url_redirect.parameters = AAZObjectType(
@@ -413,16 +449,7 @@ def _build_schema_on_200(cls):
413449

414450
parameter_name_override = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "UrlSigning").parameters.parameter_name_override
415451
parameter_name_override.Element = AAZObjectType()
416-
417-
_element = cls._schema_on_200.value.Element.properties.actions.Element.discriminate_by("name", "UrlSigning").parameters.parameter_name_override.Element
418-
_element.param_indicator = AAZStrType(
419-
serialized_name="paramIndicator",
420-
flags={"required": True},
421-
)
422-
_element.param_name = AAZStrType(
423-
serialized_name="paramName",
424-
flags={"required": True},
425-
)
452+
_ListHelper._build_schema_url_signing_param_identifier_read(parameter_name_override.Element)
426453

427454
conditions = cls._schema_on_200.value.Element.properties.conditions
428455
conditions.Element = AAZObjectType()
@@ -1007,5 +1034,44 @@ def _build_schema_header_action_parameters_read(cls, _schema):
10071034
_schema.type_name = cls._schema_header_action_parameters_read.type_name
10081035
_schema.value = cls._schema_header_action_parameters_read.value
10091036

1037+
_schema_resource_reference_read = None
1038+
1039+
@classmethod
1040+
def _build_schema_resource_reference_read(cls, _schema):
1041+
if cls._schema_resource_reference_read is not None:
1042+
_schema.id = cls._schema_resource_reference_read.id
1043+
return
1044+
1045+
cls._schema_resource_reference_read = _schema_resource_reference_read = AAZObjectType()
1046+
1047+
resource_reference_read = _schema_resource_reference_read
1048+
resource_reference_read.id = AAZStrType()
1049+
1050+
_schema.id = cls._schema_resource_reference_read.id
1051+
1052+
_schema_url_signing_param_identifier_read = None
1053+
1054+
@classmethod
1055+
def _build_schema_url_signing_param_identifier_read(cls, _schema):
1056+
if cls._schema_url_signing_param_identifier_read is not None:
1057+
_schema.param_indicator = cls._schema_url_signing_param_identifier_read.param_indicator
1058+
_schema.param_name = cls._schema_url_signing_param_identifier_read.param_name
1059+
return
1060+
1061+
cls._schema_url_signing_param_identifier_read = _schema_url_signing_param_identifier_read = AAZObjectType()
1062+
1063+
url_signing_param_identifier_read = _schema_url_signing_param_identifier_read
1064+
url_signing_param_identifier_read.param_indicator = AAZStrType(
1065+
serialized_name="paramIndicator",
1066+
flags={"required": True},
1067+
)
1068+
url_signing_param_identifier_read.param_name = AAZStrType(
1069+
serialized_name="paramName",
1070+
flags={"required": True},
1071+
)
1072+
1073+
_schema.param_indicator = cls._schema_url_signing_param_identifier_read.param_indicator
1074+
_schema.param_name = cls._schema_url_signing_param_identifier_read.param_name
1075+
10101076

10111077
__all__ = ["List"]

0 commit comments

Comments
 (0)