Merge branch 'main' into new-instance-types-2

awslabs · Dec 12, 2024 · fc76c7d · fc76c7d
2 parents f30e6b4 + 21a4ab4
commit fc76c7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/include/aws/s3/s3.h b/include/aws/s3/s3.h
@@ -49,6 +49,7 @@ enum aws_s3_errors {
     AWS_ERROR_S3_RECV_FILE_ALREADY_EXISTS,
     AWS_ERROR_S3_RECV_FILE_NOT_FOUND,
     AWS_ERROR_S3_REQUEST_TIMEOUT,
+    AWS_ERROR_S3_TOKEN_EXPIRED,
 
     AWS_ERROR_S3_END_RANGE = AWS_ERROR_ENUM_END_RANGE(AWS_C_S3_PACKAGE_ID)
 };

diff --git a/source/s3.c b/source/s3.c
@@ -52,6 +52,7 @@ static struct aws_error_info s_errors[] = {
     AWS_DEFINE_ERROR_INFO_S3(AWS_ERROR_S3_RECV_FILE_ALREADY_EXISTS, "File already exists, cannot create as new."),
     AWS_DEFINE_ERROR_INFO_S3(AWS_ERROR_S3_RECV_FILE_NOT_FOUND, "The receive file doesn't exist, cannot create as configuration required."),
     AWS_DEFINE_ERROR_INFO_S3(AWS_ERROR_S3_REQUEST_TIMEOUT, "RequestTimeout error received from S3."),
+    AWS_DEFINE_ERROR_INFO_S3(AWS_ERROR_S3_TOKEN_EXPIRED, "Token expired - needs a refresh."),
 };
 /* clang-format on */
 

diff --git a/source/s3_util.c b/source/s3_util.c
@@ -682,6 +682,11 @@ int aws_s3_crt_error_code_from_recoverable_server_error_code_string(struct aws_b
         return AWS_ERROR_S3_REQUEST_TIMEOUT;
     }
 
+    if (aws_byte_cursor_eq_c_str_ignore_case(&error_code_string, "ExpiredToken") ||
+        aws_byte_cursor_eq_c_str_ignore_case(&error_code_string, "TokenRefreshRequired")) {
+        return AWS_ERROR_S3_TOKEN_EXPIRED;
+    }
+
     return AWS_ERROR_UNKNOWN;
 }