Skip to content

Commit 88209a3

Browse files
t-bzhanBo Zhang
and
Bo Zhang
authored
{CDN} Add enforce_certificate_name_check support for origin (Azure#21861)
Co-authored-by: Bo Zhang <[email protected]>
1 parent 45842ac commit 88209a3

File tree

7 files changed

+937
-354
lines changed

7 files changed

+937
-354
lines changed

src/azure-cli/azure/cli/command_modules/cdn/_params.py

+2
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,8 @@ def load_arguments(self, _):
344344
'You can use "az network private-link-resource list" to obtain the supported sub-resource types.')
345345
c.argument('private_link_request_message',
346346
help="The message that is shown to the approver of the private link request.")
347+
c.argument('enforce_certificate_name_check', arg_type=get_three_state_flag(invert=False),
348+
help='"Whether to enable certificate name check at origin level')
347349

348350
with self.argument_context('afd origin list') as c:
349351
c.argument('profile_name', id_part=None)

src/azure-cli/azure/cli/command_modules/cdn/custom/custom_afdx.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ def create_afd_origin(client: AFDOriginsOperations,
267267
https_port: int = 443,
268268
origin_host_header: Optional[str] = None,
269269
priority: int = 1,
270-
weight: int = 1000):
270+
weight: int = 1000,
271+
enforce_certificate_name_check: bool = True):
271272

272273
shared_private_link_resource = None
273274
if enable_private_link:
@@ -289,7 +290,8 @@ def create_afd_origin(client: AFDOriginsOperations,
289290
priority=priority,
290291
weight=weight,
291292
shared_private_link_resource=shared_private_link_resource,
292-
enabled_state=enabled_state))
293+
enabled_state=enabled_state,
294+
enforce_certificate_name_check=enforce_certificate_name_check))
293295

294296

295297
def update_afd_origin(client: AFDOriginsOperations,
@@ -308,7 +310,8 @@ def update_afd_origin(client: AFDOriginsOperations,
308310
private_link_resource: str = None,
309311
private_link_location: str = None,
310312
private_link_sub_resource_type: str = None,
311-
private_link_request_message: str = None):
313+
private_link_request_message: str = None,
314+
enforce_certificate_name_check: bool = None):
312315

313316
existing = client.get(resource_group_name, profile_name, origin_group_name, origin_name)
314317
origin = AFDOrigin(
@@ -318,12 +321,14 @@ def update_afd_origin(client: AFDOriginsOperations,
318321
origin_host_header=origin_host_header,
319322
priority=priority,
320323
weight=weight,
321-
enabled_state=enabled_state)
324+
enabled_state=enabled_state,
325+
enforce_certificate_name_check=enforce_certificate_name_check)
322326

323327
_update_mapper(
324328
existing,
325329
origin,
326-
["host_name", "http_port", "https_port", "origin_host_header", "priority", "weight", "enabled_state"])
330+
["host_name", "http_port", "https_port", "origin_host_header",
331+
"priority", "weight", "enabled_state", "enforce_certificate_name_check"])
327332

328333
if enable_private_link is not None and not enable_private_link:
329334
origin.shared_private_link_resource = None
@@ -495,7 +500,7 @@ def update_afd_route(cmd,
495500
origin_group = f'/subscriptions/{subscription_id}/resourceGroups/{resource_group_name}' \
496501
f'/providers/Microsoft.Cdn/profiles/{profile_name}/originGroups/{origin_group}'
497502

498-
route.origin_group = origin_group
503+
route.origin_group = ResourceReference(id=origin_group)
499504

500505
if rule_sets is not None:
501506
formatted_rule_sets = []

src/azure-cli/azure/cli/command_modules/cdn/linter_exclusions.yml

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ afd origin create:
2323
private_link_request_message:
2424
rule_exclusions:
2525
- option_length_too_long
26+
enforce_certificate_name_check:
27+
rule_exclusions:
28+
- option_length_too_long
2629
afd origin update:
2730
parameters:
2831
private_link_location:
@@ -37,6 +40,9 @@ afd origin update:
3740
private_link_request_message:
3841
rule_exclusions:
3942
- option_length_too_long
43+
enforce_certificate_name_check:
44+
rule_exclusions:
45+
- option_length_too_long
4046
afd origin-group create:
4147
parameters:
4248
load_balancing_additional_latency_in_milliseconds:

0 commit comments

Comments
 (0)