fix mqtt3 basic auth test/mqtt5 still fail for testing

Author: xiazhvera

awscrt/mqtt.py

@@ -330,6 +330,8 @@ class Connection(NativeResource):
 
         proxy_options (Optional[awscrt.http.HttpProxyOptions]):
             Optional proxy options for all connections.
+
+        enable_metrics (bool): If true, append AWS IoT metrics to the username. (Default to true)
         """
 
     def __init__(self,
@@ -355,7 +357,8 @@ def __init__(self,
                  proxy_options=None,
                  on_connection_success=None,
                  on_connection_failure=None,
-                 on_connection_closed=None
+                 on_connection_closed=None,
+                 enable_metrics=True
                  ):
 
         assert isinstance(client, Client) or isinstance(client, Mqtt5Client)
@@ -404,8 +407,12 @@ def __init__(self,
         self.ping_timeout_ms = ping_timeout_ms
         self.protocol_operation_timeout_ms = protocol_operation_timeout_ms
         self.will = will
-        username = username if username else ""
-        self.username = username + _get_awsiot_metrics_str(username if username else "")
+
+        if enable_metrics:
+            username = username if username else ""
+            username += _get_awsiot_metrics_str(username)
+
+        self.username = username
         self.password = password
         self.socket_options = socket_options if socket_options else SocketOptions()
         self.proxy_options = proxy_options if proxy_options else websocket_proxy_options

awscrt/mqtt5.py

@@ -1758,10 +1758,11 @@ class Client(NativeResource):
 
     Args:
         client_options (ClientOptions): The ClientOptions dataclass to used to configure the new Client.
+        enable_metrics (bool): Whether to append AWS IoT metrics to the username field during CONNECT. Default: True
 
     """
 
-    def __init__(self, client_options: ClientOptions):
+    def __init__(self, client_options: ClientOptions, enable_metrics: bool = True):
 
         super().__init__()
 
@@ -1787,8 +1788,10 @@ def __init__(self, client_options: ClientOptions):
             is_will_none = False
             will = connect_options.will
 
-        username = connect_options.username if connect_options.username else ""
-        username += _get_awsiot_metrics_str(username)
+        username = connect_options.username
+        if enable_metrics:
+            username = username if username else ""
+            username += _get_awsiot_metrics_str(username)
         connect_options.username = username
         websocket_is_none = client_options.websocket_handshake_transform is None
         self.tls_ctx = client_options.tls_ctx

test/test_mqtt.py

@@ -629,7 +629,8 @@ def _test_mqtt311_direct_connect_basic_auth(self):
             host_name=input_host_name,
             port=input_port,
             username=input_username,
-            password=input_password)
+            password=input_password,
+            enable_metrics=False)
         connection.connect().result(TIMEOUT)
         connection.disconnect().result(TIMEOUT)