Skip to content

Commit 0bea2d6

Browse files
author
JingnanXu
committed
use vendor
1 parent 11ce2b7 commit 0bea2d6

77 files changed

Lines changed: 41408 additions & 46 deletions

File tree

Some content is hidden

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

‎src/cdn/azext_cdn/_actions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def __call__(self, parser, namespace, values, option_string=None):
1414
super().__call__(parser, namespace, deep_created_origin, option_string)
1515

1616
def get_origin(self, values, option_string):
17-
from azure.mgmt.cdn.models import DeepCreatedOrigin
17+
from azext_cdn.vendored_sdks.models import DeepCreatedOrigin
1818

1919
if not 1 <= len(values) <= 3 and not 5 <= len(values) <= 6:
2020
msg = '%s takes 1, 2, 3, 5, or 6 values, %d given'

‎src/cdn/azext_cdn/_client_factory.py‎

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

77
def cf_cdn(cli_ctx, *kwargs): # pylint: disable=unused-argument
88
from azure.cli.core.commands.client_factory import get_mgmt_service_client
9-
from azure.mgmt.cdn import CdnManagementClient
9+
from azext_cdn.vendored_sdks import CdnManagementClient
1010
return get_mgmt_service_client(cli_ctx, CdnManagementClient)
1111

1212

‎src/cdn/azext_cdn/_params.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# --------------------------------------------------------------------------------------------
55
from knack.arguments import CLIArgumentType
66

7-
from azure.mgmt.cdn.models import (QueryStringCachingBehavior, DeliveryRuleAction,
8-
ForwardingProtocol, DeliveryRuleCondition,
9-
AfdQueryStringCachingBehavior, Transform)
7+
from azext_cdn.vendored_sdks.models import (QueryStringCachingBehavior, DeliveryRuleAction,
8+
ForwardingProtocol, DeliveryRuleCondition,
9+
AfdQueryStringCachingBehavior, Transform)
1010
from azure.cli.core.commands.validators import get_default_location_from_resource_group
1111
from azure.cli.core.commands.parameters import get_three_state_flag, get_enum_type
1212
from ._validators import (validate_origin)

‎src/cdn/azext_cdn/commands.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ def load_command_table(self, _):
3838
endpoint_not_found_msg = _not_found_msg.format('Endpoint')
3939

4040
cdn_endpoints_sdk = CliCommandType(
41-
operations_tmpl='azure.mgmt.cdn.operations#EndpointsOperations.{}',
41+
operations_tmpl='azext_cdn.vendored_sdks.operations#EndpointsOperations.{}',
4242
client_factory=cf_endpoints,
4343
exception_handler=_not_found(endpoint_not_found_msg)
4444
)
4545

4646
cdn_domain_sdk = CliCommandType(
47-
operations_tmpl='azure.mgmt.cdn.operations#CustomDomainsOperations.{}',
47+
operations_tmpl='azext_cdn.vendored_sdks.operations#CustomDomainsOperations.{}',
4848
client_factory=cf_custom_domain,
4949
exception_handler=_not_found(cd_not_found_msg)
5050
)
@@ -112,23 +112,23 @@ def load_command_table(self, _):
112112
with self.command_group('cdn endpoint rule', cdn_endpoints_sdk, is_preview=True) as g:
113113
g.show_command('show', 'get')
114114
g.custom_command('add', 'add_rule', client_factory=cf_cdn,
115-
doc_string_source='azure.mgmt.cdn.models#Endpoint')
115+
doc_string_source='azext_cdn.vendored_sdks.models#Endpoint')
116116
g.custom_command('remove', 'remove_rule', client_factory=cf_cdn,
117-
doc_string_source='azure.mgmt.cdn.models#Endpoint')
117+
doc_string_source='azext_cdn.vendored_sdks.models#Endpoint')
118118

119119
with self.command_group('cdn endpoint rule condition', cdn_endpoints_sdk, is_preview=True) as g:
120120
g.show_command('show', 'get')
121121
g.custom_command('add', 'add_condition', client_factory=cf_cdn,
122-
doc_string_source='azure.mgmt.cdn.models#Endpoint')
122+
doc_string_source='azext_cdn.vendored_sdks.models#Endpoint')
123123
g.custom_command('remove', 'remove_condition', client_factory=cf_cdn,
124-
doc_string_source='azure.mgmt.cdn.models#Endpoint')
124+
doc_string_source='azext_cdn.vendored_sdks.models#Endpoint')
125125

126126
with self.command_group('cdn endpoint rule action', cdn_endpoints_sdk, is_preview=True) as g:
127127
g.show_command('show', 'get')
128128
g.custom_command('add', 'add_action', client_factory=cf_cdn,
129-
doc_string_source='azure.mgmt.cdn.models#Endpoint')
129+
doc_string_source='azext_cdn.vendored_sdks.models#Endpoint')
130130
g.custom_command('remove', 'remove_action', client_factory=cf_cdn,
131-
doc_string_source='azure.mgmt.cdn.models#Endpoint')
131+
doc_string_source='azext_cdn.vendored_sdks.models#Endpoint')
132132

133133
# from .custom.custom_cdn import CDNEndpointRuleConditionAdd
134134
# self.command_table['cdn endpoint rule condition add'] = CDNEndpointRuleConditionAdd(loader=self)

‎src/cdn/azext_cdn/custom/custom.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from typing import Optional
99

10-
from azure.mgmt.cdn.models import (Endpoint, SkuName, EndpointUpdateParameters, ProfileUpdateParameters,
10+
from azext_cdn.vendored_sdks.models import (Endpoint, SkuName, EndpointUpdateParameters, ProfileUpdateParameters,
1111
MinimumTlsVersion, EndpointPropertiesUpdateParametersDeliveryPolicy, DeliveryRule,
1212
DeliveryRuleRemoteAddressCondition, RemoteAddressMatchConditionParameters,
1313
DeliveryRuleRequestMethodCondition, RequestMethodMatchConditionParameters,
@@ -41,8 +41,8 @@
4141
DeliveryRuleSslProtocolCondition, SslProtocolMatchConditionParameters,
4242
SslProtocol, ResourceType)
4343

44-
from azure.mgmt.cdn.models._cdn_management_client_enums import CacheType
45-
from azure.mgmt.cdn.operations import (OriginsOperations, OriginGroupsOperations)
44+
from azext_cdn.vendored_sdks.models._cdn_management_client_enums import CacheType
45+
from azext_cdn.vendored_sdks.operations import (OriginsOperations, OriginGroupsOperations)
4646
from azure.mgmt.core.tools import is_valid_resource_id
4747

4848
from azure.cli.core.commands.client_factory import get_subscription_id
@@ -65,7 +65,7 @@ def _check_condition_allowed_opertors(conditon_name, operator):
6565
conditon_allowed_operators = ["Equal"]
6666
else:
6767
try:
68-
attr = getattr(sys.modules["azure.mgmt.cdn.models"], conditon_name + "Operator")
68+
attr = getattr(sys.modules["azext_cdn.vendored_sdks.models"], conditon_name + "Operator")
6969
conditon_allowed_operators = [operator.value for _, operator in attr.__members__.items()]
7070
except AttributeError:
7171
pass
@@ -84,7 +84,7 @@ def _check_condition_allowed_match_values_opertors(conditon_name, match_values):
8484
else:
8585
try:
8686
attr = getattr(
87-
sys.modules["azure.mgmt.cdn.models"],
87+
sys.modules["azext_cdn.vendored_sdks.models"],
8888
conditon_name + "MatchConditionParametersMatchValuesItem")
8989
conditon_allowed_match_values = [match_value.value for _, match_value in attr.__members__.items()]
9090
except AttributeError:
@@ -732,7 +732,7 @@ def enable_custom_https(cmd, client, resource_group_name, profile_name, endpoint
732732
user_cert_vault_name=None, user_cert_secret_name=None, user_cert_secret_version=None,
733733
user_cert_protocol_type=None, min_tls_version=None):
734734

735-
from azure.mgmt.cdn.models import (CdnCertificateSourceParameters,
735+
from azext_cdn.vendored_sdks.models import (CdnCertificateSourceParameters,
736736
UserManagedHttpsParameters,
737737
CdnManagedHttpsParameters,
738738
KeyVaultCertificateSourceParameters,
@@ -842,7 +842,7 @@ def update_origin(client: OriginsOperations,
842842
private_link_resource_id: Optional[str] = None,
843843
private_link_location: Optional[str] = None,
844844
private_link_approval_message: Optional[str] = None):
845-
from azure.mgmt.cdn.models import OriginUpdateParameters
845+
from azext_cdn.vendored_sdks.models import OriginUpdateParameters
846846

847847
return client.begin_update(resource_group_name,
848848
profile_name,
@@ -876,7 +876,7 @@ def create_origin(client: OriginsOperations,
876876
private_link_resource_id: Optional[str] = None,
877877
private_link_location: Optional[str] = None,
878878
private_link_approval_message: Optional[str] = None):
879-
from azure.mgmt.cdn.models import Origin
879+
from azext_cdn.vendored_sdks.models import Origin
880880

881881
return client.begin_create(resource_group_name,
882882
profile_name,
@@ -908,7 +908,7 @@ def update_profile(instance, tags=None):
908908
def create_profile(client, resource_group_name, name,
909909
sku=SkuName.standard_akamai.value,
910910
location=None, tags=None):
911-
from azure.mgmt.cdn.models import (Profile, Sku)
911+
from azext_cdn.vendored_sdks.models import (Profile, Sku)
912912
profile = Profile(location=location, sku=Sku(name=sku), tags=tags)
913913
return client.profiles.begin_create(resource_group_name, name, profile)
914914

@@ -917,7 +917,7 @@ def _parse_ranges(ranges: str):
917917
if ranges is None:
918918
return []
919919

920-
from azure.mgmt.cdn.models import HttpErrorRangeParameters
920+
from azext_cdn.vendored_sdks.models import HttpErrorRangeParameters
921921

922922
def parse_range(error_range: str):
923923
split = error_range.split('-')
@@ -952,7 +952,7 @@ def create_origin_group(cmd,
952952
response_error_detection_failover_threshold: Optional[int] = None
953953
response_error_detection_status_code_ranges: Optional[str] = None
954954

955-
from azure.mgmt.cdn.models import (OriginGroup,
955+
from azext_cdn.vendored_sdks.models import (OriginGroup,
956956
HealthProbeParameters,
957957
ResponseBasedOriginErrorDetectionParameters)
958958

@@ -1013,7 +1013,7 @@ def update_origin_group(cmd,
10131013
failover_threshold: Optional[int] = None
10141014
status_code_ranges: Optional[str] = None
10151015

1016-
from azure.mgmt.cdn.models import (OriginGroupUpdateParameters,
1016+
from azext_cdn.vendored_sdks.models import (OriginGroupUpdateParameters,
10171017
HealthProbeParameters,
10181018
ResponseBasedOriginErrorDetectionParameters)
10191019

‎src/cdn/azext_cdn/custom/custom_afdx.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# --------------------------------------------------------------------------------------------
55
# pylint: disable=too-many-locals, too-many-statements too-many-boolean-expressions too-many-branches protected-access
66

7-
from azure.mgmt.cdn.models import SkuName
7+
from azext_cdn.vendored_sdks.models import SkuName
88
from azure.cli.core.aaz import AAZStrArg, AAZBoolArg, AAZListArg, AAZTimeArg, AAZIntArg, AAZIntArgFormat
99
from azure.cli.core.aaz._base import has_value
1010
from azure.cli.core.azclierror import InvalidArgumentValueError

‎src/cdn/azext_cdn/custom/custom_cdn.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
from azure.cli.core.aaz import AAZStrArg, AAZBoolArg, AAZIntArg, AAZListArg, AAZTimeArg
1010
from azure.cli.core.aaz._base import has_value
11-
from azure.mgmt.cdn.models import (MinimumTlsVersion, ProtocolType, SkuName, UpdateRule, DeleteRule, CertificateType,
12-
ResourceType)
11+
from azext_cdn.vendored_sdks.models import (MinimumTlsVersion, ProtocolType, SkuName, UpdateRule, DeleteRule, CertificateType,
12+
ResourceType)
1313
from knack.log import get_logger
1414
from knack.util import CLIError
1515

@@ -46,7 +46,7 @@ def _parse_ranges(ranges: str):
4646
if ranges is None:
4747
return []
4848

49-
from azure.mgmt.cdn.models import HttpErrorRangeParameters
49+
from azext_cdn.vendored_sdks.models import HttpErrorRangeParameters
5050

5151
def parse_range(error_range: str):
5252
split = error_range.split('-')

‎src/cdn/azext_cdn/custom/custom_rule_util.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# pylint: disable=too-many-locals, too-many-statements too-many-return-statements simplifiable-if-expression
66

77
from azure.cli.core.aaz._base import has_value
8-
from azure.mgmt.cdn.models import (RequestMethodOperator, RuleIsCompressionEnabled)
8+
from azext_cdn.vendored_sdks.models import (RequestMethodOperator, RuleIsCompressionEnabled)
99
from azure.mgmt.core.tools import is_valid_resource_id
1010

1111

‎src/cdn/azext_cdn/custom/custom_waf.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# Licensed under the MIT License. See License.txt in the project root for license information.
44
# --------------------------------------------------------------------------------------------
55

6-
from azure.mgmt.cdn.models import (SkuName, PolicyMode, PolicyEnabledState, CdnWebApplicationFirewallPolicy,
7-
ManagedRuleSet, ManagedRuleGroupOverride, CustomRule, RateLimitRule)
6+
from azext_cdn.vendored_sdks.models import (SkuName, PolicyMode, PolicyEnabledState, CdnWebApplicationFirewallPolicy,
7+
ManagedRuleSet, ManagedRuleGroupOverride, CustomRule, RateLimitRule)
88

9-
from azure.mgmt.cdn.operations import EndpointsOperations
9+
from azext_cdn.vendored_sdks.operations import EndpointsOperations
1010

1111
from azure.cli.core.util import (sdk_no_wait, find_child_item)
1212
from azure.cli.core.commands import upsert_to_collection
@@ -36,7 +36,7 @@ def set_endpoint_waf_policy_link(client: EndpointsOperations,
3636
waf_policy_name: str = "",
3737
waf_policy_id: str = ""):
3838

39-
from azure.mgmt.cdn.models import (EndpointPropertiesUpdateParametersWebApplicationFirewallPolicyLink)
39+
from azext_cdn.vendored_sdks.models import (EndpointPropertiesUpdateParametersWebApplicationFirewallPolicyLink)
4040

4141
endpoint = client.get(resource_group_name, profile_name, endpoint_name)
4242

@@ -94,7 +94,7 @@ def set_waf_policy(client,
9494
block_response_status_code=None,
9595
tags=None):
9696
from azure.core.exceptions import ResourceNotFoundError
97-
from azure.mgmt.cdn.models import (PolicySettings, Sku)
97+
from azext_cdn.vendored_sdks.models import (PolicySettings, Sku)
9898
policy = CdnWebApplicationFirewallPolicy(
9999
tags=tags,
100100
sku=Sku(name=sku),
@@ -266,7 +266,7 @@ def set_waf_custom_rule(client,
266266
action,
267267
match_conditions,
268268
disabled=None):
269-
from azure.mgmt.cdn.models import (CustomRuleEnabledState)
269+
from azext_cdn.vendored_sdks.models import (CustomRuleEnabledState)
270270

271271
rule = CustomRule(name=name,
272272
enabled_state=CustomRuleEnabledState.disabled if disabled else CustomRuleEnabledState.enabled,
@@ -312,7 +312,7 @@ def set_waf_rate_limit_rule(client,
312312
duration,
313313
match_conditions,
314314
disabled=None):
315-
from azure.mgmt.cdn.models import (CustomRuleEnabledState)
315+
from azext_cdn.vendored_sdks.models import (CustomRuleEnabledState)
316316

317317
rule = RateLimitRule(name=name,
318318
enabled_state=CustomRuleEnabledState.disabled if disabled else CustomRuleEnabledState.enabled,

‎src/cdn/azext_cdn/tests/latest/test_afd_custom_domain_scenarios.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from azure.cli.testsdk import ResourceGroupPreparer, JMESPathCheck
66
from azure.cli.testsdk import ScenarioTest, record_only
77
from .afdx_scenario_mixin import CdnAfdScenarioMixin
8-
from azure.mgmt.cdn.models import (AfdCertificateType, AfdMinimumTlsVersion)
8+
from azext_cdn.vendored_sdks.models import (AfdCertificateType, AfdMinimumTlsVersion)
99

1010

1111
class CdnAfdCustomDomainScenarioTest(CdnAfdScenarioMixin, ScenarioTest):

0 commit comments

Comments
 (0)