From ee7ad4b543a4f26164edb15ff277cf9ca26e6b13 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Mon, 30 Dec 2024 09:20:52 -0800 Subject: [PATCH 01/14] testing unit test ci --- test/test_mqtt.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index 2b13dd37..dd7e66c4 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -54,12 +54,12 @@ def get(): secrets = boto3.client('secretsmanager') response = secrets.get_secret_value(SecretId='unit-test/endpoint') endpoint = response['SecretString'] - response = secrets.get_secret_value(SecretId='unit-test/certificate') + response = secrets.get_secret_value(SecretId='ci/mqtt5/us/mqtt5_thing/cert') cert = response['SecretString'].encode('utf8') - response = secrets.get_secret_value(SecretId='unit-test/privatekey') + response = secrets.get_secret_value(SecretId='ci/mqtt5/us/mqtt5_thing/key') key = response['SecretString'].encode('utf8') region = secrets.meta.region_name - response = secrets.get_secret_value(SecretId='unit-test/cognitopool') + response = secrets.get_secret_value(SecretId='ci/Cognito/identity_id') cognito_pool = response['SecretString'] cognito = boto3.client('cognito-identity') From 70b6585392681744b01a1e8dc639680bb003135c Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Mon, 30 Dec 2024 10:55:34 -0800 Subject: [PATCH 02/14] update unit test resources and algorithm --- test/test_mqtt.py | 8 +++----- test/test_mqtt5.py | 14 ++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index dd7e66c4..baa34144 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -22,7 +22,7 @@ CUSTOM_AUTHORIZER_SIGNATURE_UNENCODED = os.environ.get("CUSTOM_AUTHORIZER_SIGNATURE_UNENCODED") CUSTOM_AUTHORIZER_TOKEN_KEY_NAME = os.environ.get("CUSTOM_AUTHORIZER_TOKEN_KEY_NAME") CUSTOM_AUTHORIZER_TOKEN_VALUE = os.environ.get("CUSTOM_AUTHORIZER_TOKEN_VALUE") - +AWS_DEFAULT_REGION = os.environ.get("AWS_DEFAULT_REGION") def has_custom_auth_environment(): return (CUSTOM_AUTHORIZER_ENDPOINT is not None) and (CUSTOM_AUTHORIZER_NAME_SIGNED is not None) and \ @@ -51,7 +51,7 @@ def get(): warnings.simplefilter('ignore', ResourceWarning) try: - secrets = boto3.client('secretsmanager') + secrets = boto3.client('secretsmanager', region_name=AWS_DEFAULT_REGION) response = secrets.get_secret_value(SecretId='unit-test/endpoint') endpoint = response['SecretString'] response = secrets.get_secret_value(SecretId='ci/mqtt5/us/mqtt5_thing/cert') @@ -60,11 +60,9 @@ def get(): key = response['SecretString'].encode('utf8') region = secrets.meta.region_name response = secrets.get_secret_value(SecretId='ci/Cognito/identity_id') - cognito_pool = response['SecretString'] + cognito_id = response['SecretString'] cognito = boto3.client('cognito-identity') - response = cognito.get_id(IdentityPoolId=cognito_pool) - cognito_id = response['IdentityId'] response = cognito.get_credentials_for_identity(IdentityId=cognito_id) cognito_creds = response['Credentials'] diff --git a/test/test_mqtt5.py b/test/test_mqtt5.py index a6adfbc8..b866105f 100644 --- a/test/test_mqtt5.py +++ b/test/test_mqtt5.py @@ -24,7 +24,7 @@ CUSTOM_AUTHORIZER_SIGNATURE_UNENCODED = os.environ.get("CUSTOM_AUTHORIZER_SIGNATURE_UNENCODED") CUSTOM_AUTHORIZER_TOKEN_KEY_NAME = os.environ.get("CUSTOM_AUTHORIZER_TOKEN_KEY_NAME") CUSTOM_AUTHORIZER_TOKEN_VALUE = os.environ.get("CUSTOM_AUTHORIZER_TOKEN_VALUE") - +AWS_DEFAULT_REGION = os.environ.get("AWS_DEFAULT_REGION") def has_custom_auth_environment(): return (CUSTOM_AUTHORIZER_ENDPOINT is not None) and (CUSTOM_AUTHORIZER_NAME_SIGNED is not None) and \ @@ -53,20 +53,18 @@ def get(): warnings.simplefilter('ignore', ResourceWarning) try: - secrets = boto3.client('secretsmanager') + secrets = boto3.client('secretsmanager', region_name=AWS_DEFAULT_REGION) response = secrets.get_secret_value(SecretId='unit-test/endpoint') endpoint = response['SecretString'] - response = secrets.get_secret_value(SecretId='unit-test/certificate') + response = secrets.get_secret_value(SecretId='ci/mqtt5/us/mqtt5_thing/cert') cert = response['SecretString'].encode('utf8') - response = secrets.get_secret_value(SecretId='unit-test/privatekey') + response = secrets.get_secret_value(SecretId='ci/mqtt5/us/mqtt5_thing/key') key = response['SecretString'].encode('utf8') region = secrets.meta.region_name - response = secrets.get_secret_value(SecretId='unit-test/cognitopool') - cognito_pool = response['SecretString'] + response = secrets.get_secret_value(SecretId='ci/Cognito/identity_id') + cognito_id = response['SecretString'] cognito = boto3.client('cognito-identity') - response = cognito.get_id(IdentityPoolId=cognito_pool) - cognito_id = response['IdentityId'] response = cognito.get_credentials_for_identity(IdentityId=cognito_id) cognito_creds = response['Credentials'] From bb8bd882905da2b12a5adaf7e85f031f5acc1e37 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Mon, 30 Dec 2024 11:11:20 -0800 Subject: [PATCH 03/14] print errors --- test/test_mqtt.py | 1 + test/test_mqtt5.py | 1 + test/test_samples.py | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index baa34144..08bd8d93 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -68,6 +68,7 @@ def get(): Config.cache = Config(endpoint, cert, key, region, cognito_creds) except (botocore.exceptions.BotoCoreError, botocore.exceptions.ClientError) as ex: + print(ex) raise unittest.SkipTest("No credentials") return Config.cache diff --git a/test/test_mqtt5.py b/test/test_mqtt5.py index b866105f..7ee0c309 100644 --- a/test/test_mqtt5.py +++ b/test/test_mqtt5.py @@ -70,6 +70,7 @@ def get(): Config.cache = Config(endpoint, cert, key, region, cognito_creds) except (botocore.exceptions.BotoCoreError, botocore.exceptions.ClientError) as ex: + print(ex) raise unittest.SkipTest("No credentials") return Config.cache diff --git a/test/test_samples.py b/test/test_samples.py index 2c7756ac..c4ebd5c7 100644 --- a/test/test_samples.py +++ b/test/test_samples.py @@ -45,16 +45,17 @@ def get(): warnings.simplefilter('ignore', ResourceWarning) try: - secrets = boto3.client('secretsmanager') + secrets = boto3.client('secretsmanager',region_name="us-east-1") response = secrets.get_secret_value(SecretId='unit-test/endpoint') endpoint = response['SecretString'] - response = secrets.get_secret_value(SecretId='unit-test/certificate') + response = secrets.get_secret_value(SecretId='ci/mqtt5/us/mqtt5_thing/cert') cert = response['SecretString'].encode('utf8') - response = secrets.get_secret_value(SecretId='unit-test/privatekey') + response = secrets.get_secret_value(SecretId='ci/mqtt5/us/mqtt5_thing/key') key = response['SecretString'].encode('utf8') region = secrets.meta.region_name Config.cache = Config(endpoint, cert, key, region) except (botocore.exceptions.BotoCoreError, botocore.exceptions.ClientError) as ex: + print(ex) raise unittest.SkipTest("No credentials") return Config.cache From b9c398a99c0b5cc4f0225d756cd8d26f158f9d9f Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 11:25:16 -0800 Subject: [PATCH 04/14] try add cognito unit test --- test/test_mqtt.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index 08bd8d93..72c8cbfd 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -33,12 +33,13 @@ def has_custom_auth_environment(): class Config: cache = None - def __init__(self, endpoint, cert, key, region, cognito_creds): + def __init__(self, endpoint, cert, key, region, cognito_creds, cognito_id): self.cert = cert self.key = key self.endpoint = endpoint self.region = region self.cognito_creds = cognito_creds + self.cognito_id = cognito_id @staticmethod def get(): @@ -66,7 +67,7 @@ def get(): response = cognito.get_credentials_for_identity(IdentityId=cognito_id) cognito_creds = response['Credentials'] - Config.cache = Config(endpoint, cert, key, region, cognito_creds) + Config.cache = Config(endpoint, cert, key, region, cognito_creds, cognito_id) except (botocore.exceptions.BotoCoreError, botocore.exceptions.ClientError) as ex: print(ex) raise unittest.SkipTest("No credentials") @@ -157,6 +158,24 @@ def test_websockets_sts(self): client_id=create_client_id(), client_bootstrap=bootstrap) self._test_connection(connection) + + def test_websockets_cognito(self): + """Websocket connection with X-Amz-Security-Token query param""" + config = Config.get() + elg = EventLoopGroup() + resolver = DefaultHostResolver(elg) + bootstrap = ClientBootstrap(elg, resolver) + cognito_endpoint = f"cognito-identity.{config.region}.amazonaws.com" + credentials_provider = auth.AwsCredentialsProvider.new_cognito( + endpoint=cognito_endpoint, + identity=config.cognito_id) + connection = mqtt_connection_builder.websockets_with_default_aws_signing( + region=config.region, + credentials_provider=cred_provider, + endpoint=config.endpoint, + client_id=create_client_id(), + client_bootstrap=bootstrap) + self._test_connection(connection) @unittest.skipIf(PROXY_HOST is None, 'requires "proxyhost" and "proxyport" env vars') def test_websockets_proxy(self): From 444b4690ba6054ba6226363e6fd4064cc76f6cdb Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 13:21:52 -0800 Subject: [PATCH 05/14] setup client id starting with test- --- test/test_mqtt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index 72c8cbfd..1f6ae67d 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -76,7 +76,7 @@ def get(): def create_client_id(): - return 'aws-iot-device-sdk-python-v2-unit-test-{0}'.format(uuid.uuid4()) + return 'test-aws-iot-device-sdk-python-v2-unit-test-{0}'.format(uuid.uuid4()) class MqttBuilderTest(unittest.TestCase): From c9d5ed198881811bbf8ac39332f019b15aa99aa9 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 13:39:24 -0800 Subject: [PATCH 06/14] setup auth --- test/test_mqtt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index 1f6ae67d..c89b63e8 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -166,7 +166,7 @@ def test_websockets_cognito(self): resolver = DefaultHostResolver(elg) bootstrap = ClientBootstrap(elg, resolver) cognito_endpoint = f"cognito-identity.{config.region}.amazonaws.com" - credentials_provider = auth.AwsCredentialsProvider.new_cognito( + credentials_provider = AwsCredentialsProvider.new_cognito( endpoint=cognito_endpoint, identity=config.cognito_id) connection = mqtt_connection_builder.websockets_with_default_aws_signing( From fac7640943e304c8180a351873e728cf64190328 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 13:51:39 -0800 Subject: [PATCH 07/14] print id result --- test/test_mqtt.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index c89b63e8..f002e74f 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -1,5 +1,5 @@ from awscrt.auth import AwsCredentialsProvider -from awscrt.io import ClientBootstrap, DefaultHostResolver, EventLoopGroup +from awscrt.io import ClientBootstrap, DefaultHostResolver, EventLoopGroup, ClientTlsContext, TlsContextOptions from awsiot import mqtt_connection_builder import boto3 import botocore.exceptions @@ -62,6 +62,7 @@ def get(): region = secrets.meta.region_name response = secrets.get_secret_value(SecretId='ci/Cognito/identity_id') cognito_id = response['SecretString'] + print(cognito_id) cognito = boto3.client('cognito-identity') response = cognito.get_credentials_for_identity(IdentityId=cognito_id) @@ -168,7 +169,8 @@ def test_websockets_cognito(self): cognito_endpoint = f"cognito-identity.{config.region}.amazonaws.com" credentials_provider = AwsCredentialsProvider.new_cognito( endpoint=cognito_endpoint, - identity=config.cognito_id) + identity=config.cognito_id, + tls_ctx=ClientTlsContext(TlsContextOptions())) connection = mqtt_connection_builder.websockets_with_default_aws_signing( region=config.region, credentials_provider=cred_provider, From 9e33abaa4729ea0d32bf487c1a9539e434299c37 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 14:05:41 -0800 Subject: [PATCH 08/14] fix cog test --- test/test_mqtt.py | 8 ++++---- test/test_mqtt5.py | 2 +- test/test_samples.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index f002e74f..6fdb4d2e 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -138,7 +138,7 @@ def test_websockets_default(self): region=config.region, credentials_provider=cred_provider, endpoint=config.endpoint, - client_id=create_client_id(), + client_id='test-test-websockets-default-{0}'.format(uuid.uuid4()), client_bootstrap=bootstrap) self._test_connection(connection) @@ -156,7 +156,7 @@ def test_websockets_sts(self): region=config.region, credentials_provider=cred_provider, endpoint=config.endpoint, - client_id=create_client_id(), + client_id='test-test-websockets-sts-{0}'.format(uuid.uuid4()), client_bootstrap=bootstrap) self._test_connection(connection) @@ -167,7 +167,7 @@ def test_websockets_cognito(self): resolver = DefaultHostResolver(elg) bootstrap = ClientBootstrap(elg, resolver) cognito_endpoint = f"cognito-identity.{config.region}.amazonaws.com" - credentials_provider = AwsCredentialsProvider.new_cognito( + cred_provider = AwsCredentialsProvider.new_cognito( endpoint=cognito_endpoint, identity=config.cognito_id, tls_ctx=ClientTlsContext(TlsContextOptions())) @@ -175,7 +175,7 @@ def test_websockets_cognito(self): region=config.region, credentials_provider=cred_provider, endpoint=config.endpoint, - client_id=create_client_id(), + client_id='test-websockets-cognito-{0}'.format(uuid.uuid4()), client_bootstrap=bootstrap) self._test_connection(connection) diff --git a/test/test_mqtt5.py b/test/test_mqtt5.py index 7ee0c309..b16a90ac 100644 --- a/test/test_mqtt5.py +++ b/test/test_mqtt5.py @@ -77,7 +77,7 @@ def get(): def create_client_id(): - return 'aws-iot-device-sdk-python-v2-unit-test-{0}'.format(uuid.uuid4()) + return 'test-aws-iot-device-sdk-python-v2-unit-test-{0}'.format(uuid.uuid4()) class Mqtt5TestCallbacks(): def __init__(self): diff --git a/test/test_samples.py b/test/test_samples.py index c4ebd5c7..74b6fe46 100644 --- a/test/test_samples.py +++ b/test/test_samples.py @@ -62,7 +62,7 @@ def get(): def create_client_id(): - return 'aws-crt-python-unit-test-{0}'.format(uuid.uuid4()) + return 'test-aws-iot-device-sdk-python-v2-unit-test-{0}'.format(uuid.uuid4()) class SamplesTest(unittest.TestCase): From daea066ec4cca9f884e8a75807598d335a834ede Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 14:34:19 -0800 Subject: [PATCH 09/14] update gg test args --- test/test_samples.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/test/test_samples.py b/test/test_samples.py index 74b6fe46..425406a6 100644 --- a/test/test_samples.py +++ b/test/test_samples.py @@ -16,7 +16,7 @@ class Config: cache = None - def __init__(self, endpoint, cert, key, region): + def __init__(self, endpoint, cert, key, gg_cert, gg_key, region): self.endpoint = endpoint self.region = region self.cert_bytes = cert @@ -31,6 +31,14 @@ def __init__(self, endpoint, cert, key, region): with open(self.key_filepath, 'wb') as key_file: key_file.write(key) + self.gg_cert_filepath = os.path.join(self._tmp_dirpath, 'gg_certificate.pem') + with open(self.gg_cert_filepath, 'wb') as cert_file: + cert_file.write(gg_cert) + + self.gg_key_filepath = os.path.join(self._tmp_dirpath, 'gg_privatekey.pem') + with open(self.gg_key_filepath, 'wb') as key_file: + key_file.write(gg_key) + def __del__(self): shutil.rmtree(self._tmp_dirpath) @@ -52,8 +60,12 @@ def get(): cert = response['SecretString'].encode('utf8') response = secrets.get_secret_value(SecretId='ci/mqtt5/us/mqtt5_thing/key') key = response['SecretString'].encode('utf8') + response = secrets.get_secret_value(SecretId='ci/GreengrassDiscovery/cert') + gg_cert = response['SecretString'].encode('utf8') + response = secrets.get_secret_value(SecretId='ci/GreengrassDiscovery/key') + gg_key = response['SecretString'].encode('utf8') region = secrets.meta.region_name - Config.cache = Config(endpoint, cert, key, region) + Config.cache = Config(endpoint, cert, key, region, gg_cert, gg_key) except (botocore.exceptions.BotoCoreError, botocore.exceptions.ClientError) as ex: print(ex) raise unittest.SkipTest("No credentials") @@ -62,7 +74,7 @@ def get(): def create_client_id(): - return 'test-aws-iot-device-sdk-python-v2-unit-test-{0}'.format(uuid.uuid4()) + return 'aws-iot-device-sdk-python-v2-unit-test-{0}'.format(uuid.uuid4()) class SamplesTest(unittest.TestCase): @@ -116,7 +128,7 @@ def test_basic_discovery_response_only(self): "--region", config.region, "--cert", config.cert_filepath, "--key", config.key_filepath, - "--thing_name", "aws-sdk-crt-unit-test", + "--thing_name", "CI_Greengrass_Discovery_Thing", "--verbosity", "Trace", ] From 7c0faec9eafab51c2a264d11c4b5d920b14db1ce Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 14:54:35 -0800 Subject: [PATCH 10/14] test websocket default --- test/test_mqtt.py | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index 6fdb4d2e..cec6eb48 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -138,7 +138,7 @@ def test_websockets_default(self): region=config.region, credentials_provider=cred_provider, endpoint=config.endpoint, - client_id='test-test-websockets-default-{0}'.format(uuid.uuid4()), + client_id='test-websockets-default-{0}'.format(uuid.uuid4()), client_bootstrap=bootstrap) self._test_connection(connection) @@ -156,26 +156,7 @@ def test_websockets_sts(self): region=config.region, credentials_provider=cred_provider, endpoint=config.endpoint, - client_id='test-test-websockets-sts-{0}'.format(uuid.uuid4()), - client_bootstrap=bootstrap) - self._test_connection(connection) - - def test_websockets_cognito(self): - """Websocket connection with X-Amz-Security-Token query param""" - config = Config.get() - elg = EventLoopGroup() - resolver = DefaultHostResolver(elg) - bootstrap = ClientBootstrap(elg, resolver) - cognito_endpoint = f"cognito-identity.{config.region}.amazonaws.com" - cred_provider = AwsCredentialsProvider.new_cognito( - endpoint=cognito_endpoint, - identity=config.cognito_id, - tls_ctx=ClientTlsContext(TlsContextOptions())) - connection = mqtt_connection_builder.websockets_with_default_aws_signing( - region=config.region, - credentials_provider=cred_provider, - endpoint=config.endpoint, - client_id='test-websockets-cognito-{0}'.format(uuid.uuid4()), + client_id=create_client_id(), client_bootstrap=bootstrap) self._test_connection(connection) From 46f247269921e64726e91323517f5f79a6ab952e Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 15:21:36 -0800 Subject: [PATCH 11/14] test for mqtt5 default auth --- test/test_mqtt5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_mqtt5.py b/test/test_mqtt5.py index b16a90ac..af5a9339 100644 --- a/test/test_mqtt5.py +++ b/test/test_mqtt5.py @@ -163,7 +163,7 @@ def test_websockets_default(self): region=config.region, credentials_provider=cred_provider, endpoint=config.endpoint, - client_id=create_client_id(), + client_id='test-mqtt5-websockets-default-{0}'.format(uuid.uuid4()), client_bootstrap=bootstrap, on_lifecycle_connection_success=callbacks.on_lifecycle_connection_success, on_lifecycle_stopped=callbacks.on_lifecycle_stopped) From ded7456c07f8eaa80286f2c6f2292a0af4a75813 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 15:28:13 -0800 Subject: [PATCH 12/14] add log --- test/test_mqtt5.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_mqtt5.py b/test/test_mqtt5.py index af5a9339..a1a1b026 100644 --- a/test/test_mqtt5.py +++ b/test/test_mqtt5.py @@ -159,6 +159,7 @@ def test_websockets_default(self): cred_provider = AwsCredentialsProvider.new_default_chain(bootstrap) callbacks = Mqtt5TestCallbacks() + io.init_logging(io.LogLevel.Debug, 'stdout') client = mqtt5_client_builder.websockets_with_default_aws_signing( region=config.region, credentials_provider=cred_provider, From 5b7732bb29d9bf756971e72e272dbcd2287a1f12 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 15:32:53 -0800 Subject: [PATCH 13/14] add test log --- test/test_mqtt5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_mqtt5.py b/test/test_mqtt5.py index a1a1b026..1170cd9c 100644 --- a/test/test_mqtt5.py +++ b/test/test_mqtt5.py @@ -1,4 +1,4 @@ -from awscrt import mqtt5, http +from awscrt import mqtt5, http, io from awscrt.auth import AwsCredentialsProvider from awscrt.io import ClientBootstrap, DefaultHostResolver, EventLoopGroup from awsiot import mqtt5_client_builder From 798139ba0da70851b01c7c5813ccf72a3e47efa6 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Thu, 2 Jan 2025 15:50:29 -0800 Subject: [PATCH 14/14] clean up --- test/test_mqtt.py | 10 ++++------ test/test_mqtt5.py | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/test/test_mqtt.py b/test/test_mqtt.py index cec6eb48..a6857610 100644 --- a/test/test_mqtt.py +++ b/test/test_mqtt.py @@ -1,5 +1,5 @@ from awscrt.auth import AwsCredentialsProvider -from awscrt.io import ClientBootstrap, DefaultHostResolver, EventLoopGroup, ClientTlsContext, TlsContextOptions +from awscrt.io import ClientBootstrap, DefaultHostResolver, EventLoopGroup from awsiot import mqtt_connection_builder import boto3 import botocore.exceptions @@ -33,13 +33,12 @@ def has_custom_auth_environment(): class Config: cache = None - def __init__(self, endpoint, cert, key, region, cognito_creds, cognito_id): + def __init__(self, endpoint, cert, key, region, cognito_creds): self.cert = cert self.key = key self.endpoint = endpoint self.region = region self.cognito_creds = cognito_creds - self.cognito_id = cognito_id @staticmethod def get(): @@ -62,13 +61,12 @@ def get(): region = secrets.meta.region_name response = secrets.get_secret_value(SecretId='ci/Cognito/identity_id') cognito_id = response['SecretString'] - print(cognito_id) cognito = boto3.client('cognito-identity') response = cognito.get_credentials_for_identity(IdentityId=cognito_id) cognito_creds = response['Credentials'] - Config.cache = Config(endpoint, cert, key, region, cognito_creds, cognito_id) + Config.cache = Config(endpoint, cert, key, region, cognito_creds) except (botocore.exceptions.BotoCoreError, botocore.exceptions.ClientError) as ex: print(ex) raise unittest.SkipTest("No credentials") @@ -138,7 +136,7 @@ def test_websockets_default(self): region=config.region, credentials_provider=cred_provider, endpoint=config.endpoint, - client_id='test-websockets-default-{0}'.format(uuid.uuid4()), + client_id=create_client_id(), client_bootstrap=bootstrap) self._test_connection(connection) diff --git a/test/test_mqtt5.py b/test/test_mqtt5.py index 1170cd9c..b16a90ac 100644 --- a/test/test_mqtt5.py +++ b/test/test_mqtt5.py @@ -1,4 +1,4 @@ -from awscrt import mqtt5, http, io +from awscrt import mqtt5, http from awscrt.auth import AwsCredentialsProvider from awscrt.io import ClientBootstrap, DefaultHostResolver, EventLoopGroup from awsiot import mqtt5_client_builder @@ -159,12 +159,11 @@ def test_websockets_default(self): cred_provider = AwsCredentialsProvider.new_default_chain(bootstrap) callbacks = Mqtt5TestCallbacks() - io.init_logging(io.LogLevel.Debug, 'stdout') client = mqtt5_client_builder.websockets_with_default_aws_signing( region=config.region, credentials_provider=cred_provider, endpoint=config.endpoint, - client_id='test-mqtt5-websockets-default-{0}'.format(uuid.uuid4()), + client_id=create_client_id(), client_bootstrap=bootstrap, on_lifecycle_connection_success=callbacks.on_lifecycle_connection_success, on_lifecycle_stopped=callbacks.on_lifecycle_stopped)