Skip to content

Commit a958d82

Browse files
committed
updating test recordings and fixing issues due to sdk version update
1 parent 6f7b20e commit a958d82

30 files changed

Lines changed: 205 additions & 199 deletions

src/azure-cli/azure/cli/command_modules/cognitiveservices/_utils.py

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def snake_to_camel(name):
3535
return re.sub(r"(?:^|_)([a-z])", lambda x: x.group(1).upper(), name)
3636

3737

38-
def get_auth_model_connection_properties(connection_category: str, auth_type: str | None, auth_params: Dict[str, Any]):
38+
def get_auth_model_connection_properties(connection_category: str, auth_type: str | None, auth_params: Dict[str, Any]): # pylint: disable=too-many-locals
3939
from azure.mgmt.cognitiveservices.models import (
4040
PATAuthTypeConnectionProperties,
4141
SASAuthTypeConnectionProperties,
@@ -60,40 +60,46 @@ def get_auth_model_connection_properties(connection_category: str, auth_type: st
6060
)
6161
# These categories were using None auth type with AzCLI ML connections
6262
CAN_USE_NONE_AUTH = [ConnectionCategory.GIT, ConnectionCategory.PYTHON_FEED]
63+
# SDK 15.x renamed some credential params; remap old names from YAML/JSON files
64+
_CREDENTIAL_PARAM_RENAMES = {
65+
'account_key': 'key',
66+
'sas_token': 'sas',
67+
}
68+
mapped_params = {_CREDENTIAL_PARAM_RENAMES.get(k, k): v for k, v in auth_params.items()}
6369
auth_model = None
6470
match snake_to_camel(auth_type):
6571
case "PersonalAccessToken" | "Pat":
6672
auth_model = PATAuthTypeConnectionProperties(
67-
credentials=ConnectionPersonalAccessToken(**auth_params))
73+
credentials=ConnectionPersonalAccessToken(**mapped_params))
6874
case "SasToken" | "Sas":
6975
auth_model = SASAuthTypeConnectionProperties(
70-
credentials=ConnectionSharedAccessSignature(**auth_params))
76+
credentials=ConnectionSharedAccessSignature(**mapped_params))
7177
case "UsernamePassword":
7278
auth_model = UsernamePasswordAuthTypeConnectionProperties(
73-
credentials=ConnectionUsernamePassword(**auth_params))
79+
credentials=ConnectionUsernamePassword(**mapped_params))
7480
case "ManagedIdentity":
7581
auth_model = ManagedIdentityAuthTypeConnectionProperties(
76-
credentials=ConnectionManagedIdentity(**auth_params))
82+
credentials=ConnectionManagedIdentity(**mapped_params))
7783
case "ServicePrincipal":
7884
auth_model = ServicePrincipalAuthTypeConnectionProperties(
79-
credentials=ConnectionServicePrincipal(**auth_params))
85+
credentials=ConnectionServicePrincipal(**mapped_params))
8086
case "AccessKey":
8187
auth_model = AccessKeyAuthTypeConnectionProperties(
82-
credentials=ConnectionAccessKey(**auth_params))
88+
credentials=ConnectionAccessKey(**mapped_params))
8389
case "ApiKey":
8490
auth_model = ApiKeyAuthConnectionProperties(
85-
credentials=ConnectionApiKey(**auth_params))
91+
credentials=ConnectionApiKey(**mapped_params))
8692
case "OAuth2":
8793
auth_model = OAuth2AuthTypeConnectionProperties(
88-
credentials=ConnectionOAuth2(**auth_params))
94+
credentials=ConnectionOAuth2(**mapped_params))
8995
case "None":
9096
if connection_category in CAN_USE_NONE_AUTH:
9197
auth_model = NoneAuthTypeConnectionProperties()
9298
else:
9399
auth_model = AADAuthTypeConnectionProperties()
94100
case "AccountKey":
95101
auth_model = AccountKeyAuthTypeConnectionProperties(
96-
credentials=ConnectionAccountKey(**auth_params))
102+
credentials=ConnectionAccountKey(**mapped_params))
97103
case "Aad":
98104
auth_model = AADAuthTypeConnectionProperties()
99105

src/azure-cli/azure/cli/command_modules/cognitiveservices/custom.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ def create(
174174

175175
properties = CognitiveServicesAccountProperties()
176176
if api_properties is not None:
177-
api_properties = CognitiveServicesAccountApiProperties.deserialize(
178-
api_properties
177+
api_properties = CognitiveServicesAccountApiProperties._deserialize( # pylint: disable=protected-access
178+
api_properties, []
179179
)
180180
properties.api_properties = api_properties
181181
if custom_domain:
@@ -221,8 +221,8 @@ def update(
221221

222222
properties = CognitiveServicesAccountProperties()
223223
if api_properties is not None:
224-
api_properties = CognitiveServicesAccountApiProperties.deserialize(
225-
api_properties
224+
api_properties = CognitiveServicesAccountApiProperties._deserialize( # pylint: disable=protected-access
225+
api_properties, []
226226
)
227227
properties.api_properties = api_properties
228228
if custom_domain:

src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/data/managed_network_outbound_rules.json renamed to src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/data/managed_network/managed_network_outbound_rules.json

File renamed without changes.

src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/data/managed_network_outbound_rules.yaml renamed to src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/data/managed_network/managed_network_outbound_rules.yaml

File renamed without changes.

src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/recordings/test_account_connections_from_file.yaml

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

src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/recordings/test_cognitiveservices_account_capabilities.yaml

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

src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/recordings/test_cognitiveservices_account_list_kinds.yaml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/recordings/test_cognitiveservices_account_list_skus.yaml

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

src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/recordings/test_cognitiveservices_account_list_skus_legacy.yaml

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

src/azure-cli/azure/cli/command_modules/cognitiveservices/tests/latest/recordings/test_cognitiveservices_account_list_usage.yaml

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

0 commit comments

Comments
 (0)