Revert ws connection expiryTime change to unblock 1.8.0 (#30701)

* Revert "expose workspace connection secret expiryTime in sdk (#30170)" This reverts commit 3600711. * revert changelog
Azure · Jun 9, 2023 · d4887c5 · d4887c5
1 parent 60f20f7
commit d4887c5
Show file tree

Hide file tree

Showing 25 changed files with 557 additions and 552 deletions.
diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/connections/workspace_connection.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/connections/workspace_connection.py
@@ -43,7 +43,6 @@ class WorkspaceConnectionSchema(PathAwareSchema):
         required=True,
     )
     target = fields.Str()
-    expiryTime = fields.Str()
     credentials = UnionField(
         [
             NestedField(PatTokenConfigurationSchema),

diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_workspace/connections/workspace_connection.py b/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_workspace/connections/workspace_connection.py
@@ -9,15 +9,15 @@
 from pathlib import Path
 from typing import IO, Any, AnyStr, Dict, Optional, Union
 
-from azure.ai.ml._restclient.v2023_04_01_preview.models import (
+from azure.ai.ml._restclient.v2022_01_01_preview.models import (
     ManagedIdentityAuthTypeWorkspaceConnectionProperties,
     NoneAuthTypeWorkspaceConnectionProperties,
     PATAuthTypeWorkspaceConnectionProperties,
     SASAuthTypeWorkspaceConnectionProperties,
     ServicePrincipalAuthTypeWorkspaceConnectionProperties,
     UsernamePasswordAuthTypeWorkspaceConnectionProperties,
 )
-from azure.ai.ml._restclient.v2023_04_01_preview.models import (
+from azure.ai.ml._restclient.v2022_01_01_preview.models import (
     WorkspaceConnectionPropertiesV2BasicResource as RestWorkspaceConnection,
 )
 from azure.ai.ml._restclient.v2023_04_01_preview.models import (
@@ -50,8 +50,6 @@ class WorkspaceConnection(Resource):
     :type name: str
     :param target: The URL or ARM resource ID of the external resource.
     :type target: str
-    :param expiryTime: The expiry time of the workspace connection secret
-    :type expiryTime: str
     :param credentials: The credentials for authenticating to the external resource.
     :type credentials: Union[
         ~azure.ai.ml.entities.PatTokenConfiguration, ~azure.ai.ml.entities.SasTokenConfiguration,
@@ -79,13 +77,11 @@ def __init__(
             ServicePrincipalConfiguration,
             AccessKeyConfiguration,
         ],
-        expiryTime: Optional[str] = None,
         metadata: Optional[Dict[str, Any]] = None,
         **kwargs,
     ):
         self.type = type
         self._target = target
-        self._expiryTime = expiryTime
         self._credentials = credentials
         self._metadata = json.loads(json.dumps(metadata))
         super().__init__(**kwargs)
@@ -105,15 +101,6 @@ def type(self, value: str):
             return
         self._type = camel_to_snake(value)
 
-    @property
-    def expiryTime(self) -> str:
-        """Secret expiry time for workspace connection.
-
-        :return: Secret expiry time for workspace connection.
-        :rtype: str
-        """
-        return self._expiryTime
-
     @property
     def target(self) -> str:
         """Target url for the workspace connection.
@@ -221,7 +208,6 @@ def _from_rest_object(cls, rest_obj: RestWorkspaceConnection) -> "WorkspaceConne
             id=rest_obj.id,
             name=rest_obj.name,
             target=properties.target,
-            expiryTime=properties.expiry_time,
             creation_context=SystemData._from_rest_object(rest_obj.system_data) if rest_obj.system_data else None,
             type=camel_to_snake(properties.category),
             credentials=credentials,
@@ -256,7 +242,6 @@ def _to_rest_object(self) -> RestWorkspaceConnection:
             target=self.target,
             credentials=self.credentials._to_workspace_connection_rest_object(),
             metadata=self.metadata,
-            expiry_time=self.expiryTime,
             # auth_type=auth_type,
             category=_snake_to_camel(self.type),
         )

diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/operations/_workspace_connections_operations.py b/sdk/ml/azure-ai-ml/azure/ai/ml/operations/_workspace_connections_operations.py
@@ -6,7 +6,7 @@
 
 from typing import Dict, Iterable, Optional
 
-from azure.ai.ml._restclient.v2023_04_01_preview import AzureMachineLearningWorkspaces as ServiceClient042023Preview
+from azure.ai.ml._restclient.v2022_05_01 import AzureMachineLearningWorkspaces as ServiceClient052022
 from azure.ai.ml._scope_dependent_operations import (
     OperationConfig,
     OperationsContainer,
@@ -34,7 +34,7 @@ def __init__(
         self,
         operation_scope: OperationScope,
         operation_config: OperationConfig,
-        service_client: ServiceClient042023Preview,
+        service_client: ServiceClient052022,
         all_operations: OperationsContainer,
         credentials: Optional[TokenCredential] = None,
         **kwargs: Dict,

diff --git a/sdk/ml/azure-ai-ml/tests/feature_store/unittests/test_feature_store_operations.py b/sdk/ml/azure-ai-ml/tests/feature_store/unittests/test_feature_store_operations.py
@@ -20,13 +20,13 @@ def mock_credential() -> Mock:
 @pytest.fixture
 def mock_feature_store_operation(
     mock_workspace_scope: OperationScope,
-    mock_aml_services_2023_04_01_preview: Mock,
+    mock_aml_services_2022_12_01_preview: Mock,
     mock_machinelearning_client: Mock,
     mock_credential: Mock,
 ) -> FeatureStoreOperations:
     yield FeatureStoreOperations(
         operation_scope=mock_workspace_scope,
-        service_client=mock_aml_services_2023_04_01_preview,
+        service_client=mock_aml_services_2022_12_01_preview,
         all_operations=mock_machinelearning_client._operation_container,
         credentials=mock_credential,
     )