always secure

Author: hallvictoria

azurefunctions-extensions-bindings-servicebus/azurefunctions/extensions/bindings/servicebus/grpcClient.py

@@ -33,7 +33,6 @@ def create_client(
         service_stub: Type[Any],
         address: str,
         grpc_max_message_length: int = 4 * 1024 * 1024,
-        secure: bool = False,
         root_certificates: Optional[bytes] = None,
     ) -> Any:
         """
@@ -43,7 +42,6 @@ def create_client(
             service_stub: The generated service stub class (e.g. `MyServiceStub`).
             address: The server address (e.g., "localhost:50051").
             grpc_max_message_length: Max message size for send/receive.
-            secure: If True, use a secure channel; otherwise, insecure.
             root_certificates: Optional root certificates for TLS.
 
         Returns:
@@ -56,12 +54,9 @@ def create_client(
         ]
 
         try:
-            if secure:
-                credentials = grpc.ssl_channel_credentials(
-                    root_certificates=root_certificates)
-                channel = grpc.secure_channel(address, credentials, options=options)
-            else:
-                channel = grpc.insecure_channel(address, options=options)
+            credentials = grpc.ssl_channel_credentials(
+                root_certificates=root_certificates)
+            channel = grpc.secure_channel(address, credentials, options=options)
         except Exception as e:
             raise GrpcChannelError(f"Failed to create gRPC channel. URL: {address},"
                                    f" Options: {options}, Error: {e}")

azurefunctions-extensions-bindings-servicebus/azurefunctions/extensions/bindings/servicebus/serviceBusMessageActions.py

@@ -1,5 +1,6 @@
 # Copyright (c) .NET Foundation. All rights reserved.
 # Licensed under the MIT License.
+
 import threading
 
 from typing import Optional
@@ -51,7 +52,6 @@ def __init__(self) -> None:
             service_stub=SettlementStub,
             address=self._uri,
             grpc_max_message_length=self._grpc_max_message_length,
-            secure=True,
         )
 
     @classmethod

azurefunctions-extensions-bindings-servicebus/tests/test_grpc_client.py

@@ -19,27 +19,6 @@ def __init__(self, channel):
 
 
 class TestGrpcClient(unittest.TestCase):
-    def test_create_client_insecure_channel(self):
-        with patch("azurefunctions.extensions.bindings.servicebus.grpcClient.grpc.insecure_channel") as mock_insecure: # noqa
-            fake_channel = MagicMock()
-            mock_insecure.return_value = fake_channel
-
-            client = GrpcClientFactory.create_client(
-                service_stub=DummyStub,
-                address="localhost:1234",
-                grpc_max_message_length=1024,
-                secure=False,
-            )
-
-            mock_insecure.assert_called_once()
-            args, kwargs = mock_insecure.call_args
-            assert args[0] == "localhost:1234"
-            assert ("grpc.max_send_message_length", 1024) in kwargs["options"]
-            assert ("grpc.max_receive_message_length", 1024) in kwargs["options"]
-
-            assert isinstance(client, DummyStub)
-            assert client._channel == fake_channel
-
     def test_create_client_secure_channel_with_root_certs(self):
         with (patch("azurefunctions.extensions.bindings.servicebus.grpcClient.grpc.secure_channel") as mock_secure,  # noqa
               patch("azurefunctions.extensions.bindings.servicebus.grpcClient.grpc.ssl_channel_credentials") as mock_creds):  # noqa
@@ -52,7 +31,6 @@ def test_create_client_secure_channel_with_root_certs(self):
                 service_stub=DummyStub,
                 address="securehost:9999",
                 grpc_max_message_length=2048,
-                secure=True,
                 root_certificates=b"fakecerts",
             )
 
@@ -67,21 +45,6 @@ def test_create_client_secure_channel_with_root_certs(self):
             assert isinstance(client, DummyStub)
             assert client._channel == fake_channel
 
-    @patch("azurefunctions.extensions.bindings.servicebus.grpcClient."
-           "grpc.insecure_channel")
-    def test_create_client_raises_on_insecure_channel_failure(self,
-                                                              mock_insecure_channel):
-        # Arrange: force grpc.insecure_channel to throw
-        mock_insecure_channel.side_effect = RuntimeError("connection failed")
-
-        # Act + Assert
-        with self.assertRaises(GrpcChannelError) as ctx:
-            GrpcClientFactory.create_client(DummyStub, "localhost:1234", secure=False)
-
-        # Ensure exception contains useful context
-        self.assertIn("Failed to create gRPC channel", str(ctx.exception))
-        self.assertIn("localhost:1234", str(ctx.exception))
-
     @patch("azurefunctions.extensions.bindings.servicebus.grpcClient."
            "grpc.secure_channel")
     @patch("azurefunctions.extensions.bindings.servicebus.grpcClient."
@@ -96,7 +59,6 @@ def test_create_client_raises_on_secure_channel_failure(self,
         with self.assertRaises(GrpcChannelError) as ctx:
             GrpcClientFactory.create_client(DummyStub,
                                             "localhost:5678",
-                                            secure=True,
                                             root_certificates=b"dummy")
 
         self.assertIn("Failed to create gRPC channel", str(ctx.exception))