Skip to content

Commit 74a1768

Browse files
FumingZhangFumingZhang
committed
fix
1 parent e49a3f0 commit 74a1768

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

+70
-2133
lines changed

‎src/aks-preview/HISTORY.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ To release a new version, please select a new version number (usually plus 1 to
1212
Pending
1313
+++++++
1414

15+
14.0.0b5
16+
++++++++
17+
* Vendor new SDK and bump API version to 2025-02-02-preview.
18+
1519
14.0.0b4
1620
++++++++
1721
* Vendor new SDK and bump API version to 2025-02-02-preview.

‎src/aks-preview/azext_aks_preview/vendored_sdks/azure_mgmt_preview_aks/_container_service_client.py‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from typing import Any, Optional, TYPE_CHECKING, cast
12+
from typing import Any, Optional, TYPE_CHECKING
1313
from typing_extensions import Self
1414

1515
from azure.core.pipeline import policies
16-
from azure.core.settings import settings
1716
from azure.mgmt.core import ARMPipelineClient
1817
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
19-
from azure.mgmt.core.tools import get_arm_endpoints
2018
from azure.profiles import KnownProfiles, ProfileDefinition
2119
from azure.profiles.multiapiclient import MultiApiClientMixin
2220

2321
from ._configuration import ContainerServiceClientConfiguration
24-
from ._utils.serialization import Deserializer, Serializer
22+
from ._serialization import Deserializer, Serializer
2523

2624
if TYPE_CHECKING:
2725
# pylint: disable=unused-import,ungrouped-imports
@@ -74,18 +72,13 @@ def __init__(
7472
credential: "TokenCredential",
7573
subscription_id: str,
7674
api_version: Optional[str]=None,
77-
base_url: Optional[str] = None,
75+
base_url: str = "https://management.azure.com",
7876
profile: KnownProfiles=KnownProfiles.default,
7977
**kwargs: Any
8078
):
8179
if api_version:
8280
kwargs.setdefault('api_version', api_version)
83-
_cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore
84-
_endpoints = get_arm_endpoints(_cloud)
85-
if not base_url:
86-
base_url = _endpoints["resource_manager"]
87-
credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])
88-
self._config = ContainerServiceClientConfiguration(credential, subscription_id, credential_scopes=credential_scopes, **kwargs)
81+
self._config = ContainerServiceClientConfiguration(credential, subscription_id, **kwargs)
8982
_policies = kwargs.pop("policies", None)
9083
if _policies is None:
9184
_policies = [
@@ -104,7 +97,7 @@ def __init__(
10497
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
10598
self._config.http_logging_policy,
10699
]
107-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs)
100+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
108101
super(ContainerServiceClient, self).__init__(
109102
api_version=api_version,
110103
profile=profile

src/aks-preview/azext_aks_preview/vendored_sdks/azure_mgmt_preview_aks/_utils/serialization.py renamed to src/aks-preview/azext_aks_preview/vendored_sdks/azure_mgmt_preview_aks/_serialization.py

File renamed without changes.

‎src/aks-preview/azext_aks_preview/vendored_sdks/azure_mgmt_preview_aks/_utils/__init__.py‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/aks-preview/azext_aks_preview/vendored_sdks/azure_mgmt_preview_aks/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# license information.
66
# --------------------------------------------------------------------------
77

8-
VERSION = "35.0.0b1"
8+
VERSION = "35.0.0b2"

‎src/aks-preview/azext_aks_preview/vendored_sdks/azure_mgmt_preview_aks/v2025_02_02_preview/_container_service_client.py‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@
77
# --------------------------------------------------------------------------
88

99
from copy import deepcopy
10-
from typing import Any, Optional, TYPE_CHECKING, cast
10+
from typing import Any, TYPE_CHECKING
1111
from typing_extensions import Self
1212

1313
from azure.core.pipeline import policies
1414
from azure.core.rest import HttpRequest, HttpResponse
15-
from azure.core.settings import settings
1615
from azure.mgmt.core import ARMPipelineClient
1716
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
18-
from azure.mgmt.core.tools import get_arm_endpoints
1917

2018
from . import models as _models
19+
from .._serialization import Deserializer, Serializer
2120
from ._configuration import ContainerServiceClientConfiguration
22-
from ._utils.serialization import Deserializer, Serializer
2321
from .operations import (
2422
AgentPoolsOperations,
2523
ContainerServiceOperations,
@@ -97,7 +95,7 @@ class ContainerServiceClient: # pylint: disable=too-many-instance-attributes
9795
:type credential: ~azure.core.credentials.TokenCredential
9896
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
9997
:type subscription_id: str
100-
:param base_url: Service URL. Default value is None.
98+
:param base_url: Service URL. Default value is "https://management.azure.com".
10199
:type base_url: str
102100
:keyword api_version: Api Version. Default value is "2025-02-02-preview". Note that overriding
103101
this default value may result in unsupported behavior.
@@ -107,17 +105,15 @@ class ContainerServiceClient: # pylint: disable=too-many-instance-attributes
107105
"""
108106

109107
def __init__(
110-
self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any
108+
self,
109+
credential: "TokenCredential",
110+
subscription_id: str,
111+
base_url: str = "https://management.azure.com",
112+
**kwargs: Any
111113
) -> None:
112-
_cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore
113-
_endpoints = get_arm_endpoints(_cloud)
114-
if not base_url:
115-
base_url = _endpoints["resource_manager"]
116-
credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])
117114
self._config = ContainerServiceClientConfiguration(
118-
credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **kwargs
115+
credential=credential, subscription_id=subscription_id, **kwargs
119116
)
120-
121117
_policies = kwargs.pop("policies", None)
122118
if _policies is None:
123119
_policies = [
@@ -136,7 +132,7 @@ def __init__(
136132
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
137133
self._config.http_logging_policy,
138134
]
139-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs)
135+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
140136

141137
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
142138
self._serialize = Serializer(client_models)

‎src/aks-preview/azext_aks_preview/vendored_sdks/azure_mgmt_preview_aks/v2025_02_02_preview/_metadata.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "ContainerServiceClient",
66
"filename": "_container_service_client",
77
"description": "The Container Service Client.",
8-
"host_value": null,
8+
"host_value": "\"https://management.azure.com\"",
99
"parameterized_host_template": null,
1010
"azure_arm": true,
1111
"has_public_lro_operations": true,
1212
"client_side_validation": false,
13-
"sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.core.settings\": [\"settings\"], \"azure.mgmt.core.tools\": [\"get_arm_endpoints\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"stdlib\": {\"typing\": [\"Optional\", \"cast\"], \"typing_extensions\": [\"Self\"]}, \"local\": {\"._configuration\": [\"ContainerServiceClientConfiguration\"], \"._utils.serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
14-
"async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.core.settings\": [\"settings\"], \"azure.mgmt.core.tools\": [\"get_arm_endpoints\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"stdlib\": {\"typing\": [\"Optional\", \"cast\"], \"typing_extensions\": [\"Self\"]}, \"local\": {\"._configuration\": [\"ContainerServiceClientConfiguration\"], \".._utils.serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
13+
"sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ContainerServiceClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
14+
"async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ContainerServiceClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {
@@ -57,7 +57,7 @@
5757
"method_location": "positional"
5858
},
5959
"base_url": {
60-
"signature": "base_url: Optional[str] = None,",
60+
"signature": "base_url: str = \"https://management.azure.com\",",
6161
"description": "Service URL",
6262
"docstring_type": "str",
6363
"required": false,
@@ -80,7 +80,7 @@
8080
"method_location": "positional"
8181
},
8282
"base_url": {
83-
"signature": "base_url: Optional[str] = None,",
83+
"signature": "base_url: str = \"https://management.azure.com\",",
8484
"description": "Service URL",
8585
"docstring_type": "str",
8686
"required": false,

‎src/aks-preview/azext_aks_preview/vendored_sdks/azure_mgmt_preview_aks/v2025_02_02_preview/_utils/__init__.py‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)