From bdf206a7e92e4e4dc2672691c881f9bcc356708e Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Fri, 9 Feb 2024 15:41:04 -0800 Subject: [PATCH 1/2] Fix a bunch of places we forget to aws_raise_error() --- source/secure_tunneling.c | 4 ++-- source/serializer.c | 2 +- tests/secure_tunnel_tests.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/secure_tunneling.c b/source/secure_tunneling.c index a70132bd..05c92c81 100644 --- a/source/secure_tunneling.c +++ b/source/secure_tunneling.c @@ -335,7 +335,7 @@ static int s_aws_secure_tunnel_set_stream( "id=%p: Incomming stream set request for unsupported service_id: " PRInSTR, (void *)secure_tunnel, AWS_BYTE_CURSOR_PRI(*service_id)); - return AWS_ERROR_IOTDEVICE_SECURE_TUNNELING_BAD_SERVICE_ID; + return aws_raise_error(AWS_ERROR_IOTDEVICE_SECURE_TUNNELING_BAD_SERVICE_ID); } struct aws_service_id_element *replacement_elem = @@ -2674,7 +2674,7 @@ int aws_secure_tunnel_stream_start( if (secure_tunnel->config->local_proxy_mode == AWS_SECURE_TUNNELING_DESTINATION_MODE) { AWS_LOGF_ERROR(AWS_LS_IOTDEVICE_SECURE_TUNNELING, "Stream Start can only be sent from Source Mode"); - return AWS_ERROR_IOTDEVICE_SECURE_TUNNELING_INCORRECT_MODE; + return aws_raise_error(AWS_ERROR_IOTDEVICE_SECURE_TUNNELING_INCORRECT_MODE); } struct aws_secure_tunnel_operation_message *message_op = aws_secure_tunnel_operation_message_new( diff --git a/source/serializer.c b/source/serializer.c index 15bcfba7..85988767 100644 --- a/source/serializer.c +++ b/source/serializer.c @@ -488,5 +488,5 @@ int aws_secure_tunnel_deserialize_message_from_cursor( return AWS_OP_SUCCESS; error: - return AWS_ERROR_IOTDEVICE_SECURE_TUNNELING_DECODE_FAILURE; + return aws_raise_error(AWS_ERROR_IOTDEVICE_SECURE_TUNNELING_DECODE_FAILURE); } diff --git a/tests/secure_tunnel_tests.c b/tests/secure_tunnel_tests.c index 2a0b2832..2638912a 100644 --- a/tests/secure_tunnel_tests.c +++ b/tests/secure_tunnel_tests.c @@ -916,7 +916,7 @@ int secure_tunneling_access_token_check(const struct aws_http_headers *request_h return aws_raise_error(AWS_ERROR_INVALID_ARGUMENT); } ASSERT_CURSOR_VALUE_STRING_EQUALS(access_token_cur, s_access_token); - return AWS_ERROR_SUCCESS; + return AWS_OP_SUCCESS; } static int s_secure_tunneling_functionality_connect_test_fn(struct aws_allocator *allocator, void *ctx) { @@ -952,7 +952,7 @@ int secure_tunneling_client_token_check(const struct aws_http_headers *request_h return aws_raise_error(AWS_ERROR_INVALID_ARGUMENT); } ASSERT_CURSOR_VALUE_STRING_EQUALS(client_token_cur, s_client_token); - return AWS_ERROR_SUCCESS; + return AWS_OP_SUCCESS; } static int s_secure_tunneling_functionality_client_token_test_fn(struct aws_allocator *allocator, void *ctx) { From db6453c4382c9c487b2bd81fe8e19a1bae9693b6 Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Fri, 9 Feb 2024 16:39:41 -0800 Subject: [PATCH 2/2] BUILDER_VERSION: v0.9.55 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 303e6d84..be0f19cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - 'main' env: - BUILDER_VERSION: v0.9.43 + BUILDER_VERSION: v0.9.55 BUILDER_SOURCE: releases BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-c-iot