Moving is_trusted_xds_server_experimental to client deployment args

pair programming

Author: sergiitk

framework/test_app/runners/k8s/k8s_xds_client_runner.py

@@ -32,6 +32,7 @@ class ClientDeploymentArgs:
     csm_workload_name: str = ""
     csm_canonical_service_name: str = ""
     enable_dualstack: bool = False
+    is_trusted_xds_server_experimental: bool = False
 
     def as_dict(self):
         return dataclasses.asdict(self)
@@ -131,7 +132,6 @@ def run(  # pylint: disable=arguments-differ
         log_to_stdout: bool = False,
         request_payload_size: int = 0,
         response_payload_size: int = 0,
-        is_trusted_xds_server_experimental: bool = False,
     ) -> client_app.XdsTestClient:
         logger.info(
             (
@@ -192,7 +192,6 @@ def run(  # pylint: disable=arguments-differ
             config_mesh=config_mesh,
             generate_mesh_id=generate_mesh_id,
             print_response=print_response,
-            is_trusted_xds_server_experimental=is_trusted_xds_server_experimental,
             **self.deployment_args.as_dict(),
         )
 

tests/cloud_run_csm_inbound_test.py

@@ -12,19 +12,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
+from typing import TypeAlias
 
 from absl.testing import absltest
+from typing_extensions import override
 
 from framework import xds_k8s_testcase
+from framework.test_app.runners.k8s import k8s_xds_client_runner
 from framework.test_cases import cloud_run_testcase
 
 logger = logging.getLogger(__name__)
 
-_XdsTestServer = xds_k8s_testcase.XdsTestServer
-_XdsTestClient = xds_k8s_testcase.XdsTestClient
+_XdsTestServer: TypeAlias = xds_k8s_testcase.XdsTestServer
+_XdsTestClient: TypeAlias = xds_k8s_testcase.XdsTestClient
+KubernetesClientRunner: TypeAlias = k8s_xds_client_runner.KubernetesClientRunner
+ClientDeploymentArgs: TypeAlias = k8s_xds_client_runner.ClientDeploymentArgs
 
 
 class CloudRunCsmInboundTest(cloud_run_testcase.CloudRunXdsKubernetesTestCase):
+    @override
+    def initKubernetesClientRunner(self, **kwargs) -> KubernetesClientRunner:
+        return super().initKubernetesClientRunner(
+            deployment_args=ClientDeploymentArgs(
+                is_trusted_xds_server_experimental=True,
+            )
+        )
+
     def test_gke_to_cloud_run(self):
         with self.subTest("0_create_mesh"):
             self.td.create_mesh()
@@ -54,7 +67,6 @@ def test_gke_to_cloud_run(self):
             test_client: _XdsTestClient = self.startSecureTestClient(
                 test_server,
                 config_mesh=self.td.mesh.name,
-                is_trusted_xds_server_experimental=True,
             )
 
         with self.subTest("7_test_client_xds_config_exists"):