update naming and comments

awslabs · Oct 14, 2024 · f948e37 · f948e37
1 parent 27535c2
commit f948e37
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/include/aws/s3/private/s3_meta_request_impl.h b/include/aws/s3/private/s3_meta_request_impl.h
@@ -356,7 +356,7 @@ void aws_s3_meta_request_sign_request_default_impl(
     struct aws_s3_request *request,
     aws_signing_complete_fn *on_signing_complete,
     void *user_data,
-    bool force_regular_signing);
+    bool disable_s3_express_signing);
 
 AWS_S3_API
 void aws_s3_meta_request_sign_request_default(

diff --git a/source/s3_copy_object.c b/source/s3_copy_object.c
@@ -812,10 +812,11 @@ void s_s3_copy_object_sign_request(
     /**
      * https://docs.aws.amazon.com/AmazonS3/latest/API/API_UploadPartCopy.html
      * https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html
-     * For CopyObject and UploadPartCopy, the request has to be signed with regular SigV4 for directory buckets.
+     * For CopyObject and UploadPartCopy, the request has to be signed with IAM credentials for directory buckets.
+     * Disable S3 express signing for those types.
      */
-    bool force_regular_signing = request->request_tag == AWS_S3_COPY_OBJECT_REQUEST_TAG_BYPASS ||
-                                 request->request_tag == AWS_S3_COPY_OBJECT_REQUEST_TAG_MULTIPART_COPY;
+    bool disable_s3_express_signing = request->request_tag == AWS_S3_COPY_OBJECT_REQUEST_TAG_BYPASS ||
+                                      request->request_tag == AWS_S3_COPY_OBJECT_REQUEST_TAG_MULTIPART_COPY;
     aws_s3_meta_request_sign_request_default_impl(
-        meta_request, request, on_signing_complete, user_data, force_regular_signing);
+        meta_request, request, on_signing_complete, user_data, disable_s3_express_signing);
 }
diff --git a/source/s3_meta_request.c b/source/s3_meta_request.c
@@ -905,7 +905,7 @@ void aws_s3_meta_request_sign_request_default_impl(
     struct aws_s3_request *request,
     aws_signing_complete_fn *on_signing_complete,
     void *user_data,
-    bool force_regular_signing) {
+    bool disable_s3_express_signing) {
     AWS_PRECONDITION(meta_request);
     AWS_PRECONDITION(request);
     AWS_PRECONDITION(on_signing_complete);
@@ -947,7 +947,7 @@ void aws_s3_meta_request_sign_request_default_impl(
         return;
     }
 
-    if (signing_config.algorithm == AWS_SIGNING_ALGORITHM_V4_S3EXPRESS && !force_regular_signing) {
+    if (signing_config.algorithm == AWS_SIGNING_ALGORITHM_V4_S3EXPRESS && !disable_s3_express_signing) {
         /* Fetch credentials from S3 Express provider. */
         struct aws_get_s3express_credentials_user_data *context =
             aws_mem_calloc(meta_request->allocator, 1, sizeof(struct aws_get_s3express_credentials_user_data));
@@ -998,7 +998,7 @@ void aws_s3_meta_request_sign_request_default_impl(
         }
     } else {
         /* Regular signing. */
-        if (force_regular_signing) {
+        if (disable_s3_express_signing) {
             signing_config.algorithm = AWS_SIGNING_ALGORITHM_V4;
         }
         s_s3_meta_request_init_signing_date_time(meta_request, &signing_config.date);