diff --git a/libraries/s3/lib/abortMultipartUpload.ml b/libraries/s3/lib/abortMultipartUpload.ml index d1aac624a..3326d84ec 100644 --- a/libraries/s3/lib/abortMultipartUpload.ml +++ b/libraries/s3/lib/abortMultipartUpload.ml @@ -4,11 +4,12 @@ type input = AbortMultipartUploadRequest.t type output = AbortMultipartUploadOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["AbortMultipartUpload"])] (Util.drop_empty diff --git a/libraries/s3/lib/completeMultipartUpload.ml b/libraries/s3/lib/completeMultipartUpload.ml index c07624c5a..8882aec57 100644 --- a/libraries/s3/lib/completeMultipartUpload.ml +++ b/libraries/s3/lib/completeMultipartUpload.ml @@ -4,11 +4,12 @@ type input = CompleteMultipartUploadRequest.t type output = CompleteMultipartUploadOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["CompleteMultipartUpload"])] diff --git a/libraries/s3/lib/copyObject.ml b/libraries/s3/lib/copyObject.ml index 76889c030..0cea3e69c 100644 --- a/libraries/s3/lib/copyObject.ml +++ b/libraries/s3/lib/copyObject.ml @@ -4,11 +4,12 @@ type input = CopyObjectRequest.t type output = CopyObjectOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["CopyObject"])] (Util.drop_empty (Uri.query_of_encoded diff --git a/libraries/s3/lib/createBucket.ml b/libraries/s3/lib/createBucket.ml index 4fec21c24..776d51a33 100644 --- a/libraries/s3/lib/createBucket.ml +++ b/libraries/s3/lib/createBucket.ml @@ -4,11 +4,12 @@ type input = CreateBucketRequest.t type output = CreateBucketOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["CreateBucket"])] (Util.drop_empty diff --git a/libraries/s3/lib/createMultipartUpload.ml b/libraries/s3/lib/createMultipartUpload.ml index d992a733c..e2d81d814 100644 --- a/libraries/s3/lib/createMultipartUpload.ml +++ b/libraries/s3/lib/createMultipartUpload.ml @@ -4,11 +4,12 @@ type input = CreateMultipartUploadRequest.t type output = CreateMultipartUploadOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["CreateMultipartUpload"])] (Util.drop_empty diff --git a/libraries/s3/lib/deleteBucket.ml b/libraries/s3/lib/deleteBucket.ml index 00b61275d..ad4f4a83e 100644 --- a/libraries/s3/lib/deleteBucket.ml +++ b/libraries/s3/lib/deleteBucket.ml @@ -4,11 +4,12 @@ type input = DeleteBucketRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteBucket"])] (Util.drop_empty diff --git a/libraries/s3/lib/deleteBucketCors.ml b/libraries/s3/lib/deleteBucketCors.ml index 245620d66..ab38387dd 100644 --- a/libraries/s3/lib/deleteBucketCors.ml +++ b/libraries/s3/lib/deleteBucketCors.ml @@ -4,11 +4,12 @@ type input = DeleteBucketCorsRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteBucketCors"])] (Util.drop_empty diff --git a/libraries/s3/lib/deleteBucketLifecycle.ml b/libraries/s3/lib/deleteBucketLifecycle.ml index 3963080a8..5338046f9 100644 --- a/libraries/s3/lib/deleteBucketLifecycle.ml +++ b/libraries/s3/lib/deleteBucketLifecycle.ml @@ -4,11 +4,12 @@ type input = DeleteBucketLifecycleRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteBucketLifecycle"])] (Util.drop_empty diff --git a/libraries/s3/lib/deleteBucketPolicy.ml b/libraries/s3/lib/deleteBucketPolicy.ml index 9ba56140d..9399bbc0f 100644 --- a/libraries/s3/lib/deleteBucketPolicy.ml +++ b/libraries/s3/lib/deleteBucketPolicy.ml @@ -4,11 +4,12 @@ type input = DeleteBucketPolicyRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteBucketPolicy"])] (Util.drop_empty diff --git a/libraries/s3/lib/deleteBucketReplication.ml b/libraries/s3/lib/deleteBucketReplication.ml index fc444ef4d..3efb05cb1 100644 --- a/libraries/s3/lib/deleteBucketReplication.ml +++ b/libraries/s3/lib/deleteBucketReplication.ml @@ -4,11 +4,12 @@ type input = DeleteBucketReplicationRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteBucketReplication"])] diff --git a/libraries/s3/lib/deleteBucketTagging.ml b/libraries/s3/lib/deleteBucketTagging.ml index 291edf5e4..321e66b51 100644 --- a/libraries/s3/lib/deleteBucketTagging.ml +++ b/libraries/s3/lib/deleteBucketTagging.ml @@ -4,11 +4,12 @@ type input = DeleteBucketTaggingRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteBucketTagging"])] (Util.drop_empty diff --git a/libraries/s3/lib/deleteBucketWebsite.ml b/libraries/s3/lib/deleteBucketWebsite.ml index 8322b2c99..211c75394 100644 --- a/libraries/s3/lib/deleteBucketWebsite.ml +++ b/libraries/s3/lib/deleteBucketWebsite.ml @@ -4,11 +4,12 @@ type input = DeleteBucketWebsiteRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteBucketWebsite"])] (Util.drop_empty diff --git a/libraries/s3/lib/deleteObject.ml b/libraries/s3/lib/deleteObject.ml index 2704979f5..37b2f11f6 100644 --- a/libraries/s3/lib/deleteObject.ml +++ b/libraries/s3/lib/deleteObject.ml @@ -4,11 +4,12 @@ type input = DeleteObjectRequest.t type output = DeleteObjectOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteObject"])] (Util.drop_empty diff --git a/libraries/s3/lib/deleteObjects.ml b/libraries/s3/lib/deleteObjects.ml index 1a3e74600..ab8ba948f 100644 --- a/libraries/s3/lib/deleteObjects.ml +++ b/libraries/s3/lib/deleteObjects.ml @@ -4,11 +4,12 @@ type input = DeleteObjectsRequest.t type output = DeleteObjectsOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["DeleteObjects"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketAcl.ml b/libraries/s3/lib/getBucketAcl.ml index 3f65beef0..3fea032cb 100644 --- a/libraries/s3/lib/getBucketAcl.ml +++ b/libraries/s3/lib/getBucketAcl.ml @@ -4,11 +4,12 @@ type input = GetBucketAclRequest.t type output = GetBucketAclOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketAcl"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketCors.ml b/libraries/s3/lib/getBucketCors.ml index 498dac37d..89e232f50 100644 --- a/libraries/s3/lib/getBucketCors.ml +++ b/libraries/s3/lib/getBucketCors.ml @@ -4,11 +4,12 @@ type input = GetBucketCorsRequest.t type output = GetBucketCorsOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketCors"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketLifecycle.ml b/libraries/s3/lib/getBucketLifecycle.ml index 61e96e6d7..e2ae8368e 100644 --- a/libraries/s3/lib/getBucketLifecycle.ml +++ b/libraries/s3/lib/getBucketLifecycle.ml @@ -4,11 +4,12 @@ type input = GetBucketLifecycleRequest.t type output = GetBucketLifecycleOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketLifecycle"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketLocation.ml b/libraries/s3/lib/getBucketLocation.ml index 43fedcc45..01467bded 100644 --- a/libraries/s3/lib/getBucketLocation.ml +++ b/libraries/s3/lib/getBucketLocation.ml @@ -4,11 +4,12 @@ type input = GetBucketLocationRequest.t type output = GetBucketLocationOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketLocation"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketLogging.ml b/libraries/s3/lib/getBucketLogging.ml index 08794b961..f8299e1d2 100644 --- a/libraries/s3/lib/getBucketLogging.ml +++ b/libraries/s3/lib/getBucketLogging.ml @@ -4,11 +4,12 @@ type input = GetBucketLoggingRequest.t type output = GetBucketLoggingOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketLogging"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketNotification.ml b/libraries/s3/lib/getBucketNotification.ml index 5c70adfe4..41811c1b1 100644 --- a/libraries/s3/lib/getBucketNotification.ml +++ b/libraries/s3/lib/getBucketNotification.ml @@ -4,11 +4,12 @@ type input = GetBucketNotificationConfigurationRequest.t type output = NotificationConfigurationDeprecated.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketNotification"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketNotificationConfiguration.ml b/libraries/s3/lib/getBucketNotificationConfiguration.ml index 1f2255bab..75849f473 100644 --- a/libraries/s3/lib/getBucketNotificationConfiguration.ml +++ b/libraries/s3/lib/getBucketNotificationConfiguration.ml @@ -4,11 +4,12 @@ type input = GetBucketNotificationConfigurationRequest.t type output = NotificationConfiguration.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketNotificationConfiguration"])] diff --git a/libraries/s3/lib/getBucketPolicy.ml b/libraries/s3/lib/getBucketPolicy.ml index eae12dbcd..e8fa458d4 100644 --- a/libraries/s3/lib/getBucketPolicy.ml +++ b/libraries/s3/lib/getBucketPolicy.ml @@ -4,11 +4,12 @@ type input = GetBucketPolicyRequest.t type output = GetBucketPolicyOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketPolicy"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketReplication.ml b/libraries/s3/lib/getBucketReplication.ml index 9c2259375..ca5efdced 100644 --- a/libraries/s3/lib/getBucketReplication.ml +++ b/libraries/s3/lib/getBucketReplication.ml @@ -4,11 +4,12 @@ type input = GetBucketReplicationRequest.t type output = GetBucketReplicationOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketReplication"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketRequestPayment.ml b/libraries/s3/lib/getBucketRequestPayment.ml index 49e4b5930..59718e979 100644 --- a/libraries/s3/lib/getBucketRequestPayment.ml +++ b/libraries/s3/lib/getBucketRequestPayment.ml @@ -4,11 +4,12 @@ type input = GetBucketRequestPaymentRequest.t type output = GetBucketRequestPaymentOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketRequestPayment"])] diff --git a/libraries/s3/lib/getBucketTagging.ml b/libraries/s3/lib/getBucketTagging.ml index 74589ab70..c51cdadb8 100644 --- a/libraries/s3/lib/getBucketTagging.ml +++ b/libraries/s3/lib/getBucketTagging.ml @@ -4,11 +4,12 @@ type input = GetBucketTaggingRequest.t type output = GetBucketTaggingOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketTagging"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketVersioning.ml b/libraries/s3/lib/getBucketVersioning.ml index fd78af890..d661b0195 100644 --- a/libraries/s3/lib/getBucketVersioning.ml +++ b/libraries/s3/lib/getBucketVersioning.ml @@ -4,11 +4,12 @@ type input = GetBucketVersioningRequest.t type output = GetBucketVersioningOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketVersioning"])] (Util.drop_empty diff --git a/libraries/s3/lib/getBucketWebsite.ml b/libraries/s3/lib/getBucketWebsite.ml index c72250740..3d90e320d 100644 --- a/libraries/s3/lib/getBucketWebsite.ml +++ b/libraries/s3/lib/getBucketWebsite.ml @@ -4,11 +4,12 @@ type input = GetBucketWebsiteRequest.t type output = GetBucketWebsiteOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetBucketWebsite"])] (Util.drop_empty diff --git a/libraries/s3/lib/getObject.ml b/libraries/s3/lib/getObject.ml index b699a6fc0..d2d969a37 100644 --- a/libraries/s3/lib/getObject.ml +++ b/libraries/s3/lib/getObject.ml @@ -4,11 +4,12 @@ type input = GetObjectRequest.t type output = GetObjectOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetObject"])] (Util.drop_empty (Uri.query_of_encoded diff --git a/libraries/s3/lib/getObjectAcl.ml b/libraries/s3/lib/getObjectAcl.ml index 591f1c97a..74ef2b75d 100644 --- a/libraries/s3/lib/getObjectAcl.ml +++ b/libraries/s3/lib/getObjectAcl.ml @@ -4,11 +4,12 @@ type input = GetObjectAclRequest.t type output = GetObjectAclOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetObjectAcl"])] (Util.drop_empty diff --git a/libraries/s3/lib/getObjectTorrent.ml b/libraries/s3/lib/getObjectTorrent.ml index b783d6e3d..b536d5a3c 100644 --- a/libraries/s3/lib/getObjectTorrent.ml +++ b/libraries/s3/lib/getObjectTorrent.ml @@ -4,11 +4,12 @@ type input = GetObjectTorrentRequest.t type output = GetObjectTorrentOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["GetObjectTorrent"])] (Util.drop_empty diff --git a/libraries/s3/lib/headBucket.ml b/libraries/s3/lib/headBucket.ml index 506829fb8..b4aa40042 100644 --- a/libraries/s3/lib/headBucket.ml +++ b/libraries/s3/lib/headBucket.ml @@ -4,11 +4,12 @@ type input = HeadBucketRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["HeadBucket"])] (Util.drop_empty (Uri.query_of_encoded diff --git a/libraries/s3/lib/headObject.ml b/libraries/s3/lib/headObject.ml index c50b971f4..689b00377 100644 --- a/libraries/s3/lib/headObject.ml +++ b/libraries/s3/lib/headObject.ml @@ -4,11 +4,12 @@ type input = HeadObjectRequest.t type output = HeadObjectOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["HeadObject"])] (Util.drop_empty (Uri.query_of_encoded diff --git a/libraries/s3/lib/listBuckets.ml b/libraries/s3/lib/listBuckets.ml index ecf71e91b..63d8fc846 100644 --- a/libraries/s3/lib/listBuckets.ml +++ b/libraries/s3/lib/listBuckets.ml @@ -4,10 +4,10 @@ type input = Aws.BaseTypes.Unit.t type output = ListBucketsOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string + (Uri.of_string @@ (Aws.Util.of_option_exn (Endpoints.url_of service region))) (List.append [("Version", ["2006-03-01"]); ("Action", ["ListBuckets"])] (Util.drop_empty diff --git a/libraries/s3/lib/listMultipartUploads.ml b/libraries/s3/lib/listMultipartUploads.ml index 28da98544..eca0d74b3 100644 --- a/libraries/s3/lib/listMultipartUploads.ml +++ b/libraries/s3/lib/listMultipartUploads.ml @@ -4,11 +4,12 @@ type input = ListMultipartUploadsRequest.t type output = ListMultipartUploadsOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["ListMultipartUploads"])] (Util.drop_empty diff --git a/libraries/s3/lib/listObjectVersions.ml b/libraries/s3/lib/listObjectVersions.ml index 4adc0a9b0..9571f08b9 100644 --- a/libraries/s3/lib/listObjectVersions.ml +++ b/libraries/s3/lib/listObjectVersions.ml @@ -4,11 +4,12 @@ type input = ListObjectVersionsRequest.t type output = ListObjectVersionsOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["ListObjectVersions"])] (Util.drop_empty diff --git a/libraries/s3/lib/listObjects.ml b/libraries/s3/lib/listObjects.ml index e77ead791..e8d6ab04f 100644 --- a/libraries/s3/lib/listObjects.ml +++ b/libraries/s3/lib/listObjects.ml @@ -4,11 +4,12 @@ type input = ListObjectsRequest.t type output = ListObjectsOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["ListObjects"])] (Util.drop_empty (Uri.query_of_encoded diff --git a/libraries/s3/lib/listParts.ml b/libraries/s3/lib/listParts.ml index df1642303..5b030d509 100644 --- a/libraries/s3/lib/listParts.ml +++ b/libraries/s3/lib/listParts.ml @@ -4,11 +4,12 @@ type input = ListPartsRequest.t type output = ListPartsOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["ListParts"])] (Util.drop_empty (Uri.query_of_encoded diff --git a/libraries/s3/lib/putBucketAcl.ml b/libraries/s3/lib/putBucketAcl.ml index 255da54ff..bfd3a04e4 100644 --- a/libraries/s3/lib/putBucketAcl.ml +++ b/libraries/s3/lib/putBucketAcl.ml @@ -4,11 +4,12 @@ type input = PutBucketAclRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketAcl"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketCors.ml b/libraries/s3/lib/putBucketCors.ml index c6956db12..2afe0066a 100644 --- a/libraries/s3/lib/putBucketCors.ml +++ b/libraries/s3/lib/putBucketCors.ml @@ -4,11 +4,12 @@ type input = PutBucketCorsRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketCors"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketLifecycle.ml b/libraries/s3/lib/putBucketLifecycle.ml index 8715c55c5..ea1b2b89c 100644 --- a/libraries/s3/lib/putBucketLifecycle.ml +++ b/libraries/s3/lib/putBucketLifecycle.ml @@ -4,11 +4,12 @@ type input = PutBucketLifecycleRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketLifecycle"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketLogging.ml b/libraries/s3/lib/putBucketLogging.ml index 01dff061b..d7966dfe0 100644 --- a/libraries/s3/lib/putBucketLogging.ml +++ b/libraries/s3/lib/putBucketLogging.ml @@ -4,11 +4,12 @@ type input = PutBucketLoggingRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketLogging"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketNotification.ml b/libraries/s3/lib/putBucketNotification.ml index 0a68560a9..9f6b47a91 100644 --- a/libraries/s3/lib/putBucketNotification.ml +++ b/libraries/s3/lib/putBucketNotification.ml @@ -4,11 +4,12 @@ type input = PutBucketNotificationRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketNotification"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketNotificationConfiguration.ml b/libraries/s3/lib/putBucketNotificationConfiguration.ml index 69264ad1f..df480a756 100644 --- a/libraries/s3/lib/putBucketNotificationConfiguration.ml +++ b/libraries/s3/lib/putBucketNotificationConfiguration.ml @@ -4,11 +4,12 @@ type input = PutBucketNotificationConfigurationRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketNotificationConfiguration"])] diff --git a/libraries/s3/lib/putBucketPolicy.ml b/libraries/s3/lib/putBucketPolicy.ml index 45d5e91d6..5b73ab09d 100644 --- a/libraries/s3/lib/putBucketPolicy.ml +++ b/libraries/s3/lib/putBucketPolicy.ml @@ -4,11 +4,12 @@ type input = PutBucketPolicyRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketPolicy"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketReplication.ml b/libraries/s3/lib/putBucketReplication.ml index 5fb501708..4686a486b 100644 --- a/libraries/s3/lib/putBucketReplication.ml +++ b/libraries/s3/lib/putBucketReplication.ml @@ -4,11 +4,12 @@ type input = PutBucketReplicationRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketReplication"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketRequestPayment.ml b/libraries/s3/lib/putBucketRequestPayment.ml index 0f3ca00aa..a74f84aa9 100644 --- a/libraries/s3/lib/putBucketRequestPayment.ml +++ b/libraries/s3/lib/putBucketRequestPayment.ml @@ -4,11 +4,12 @@ type input = PutBucketRequestPaymentRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketRequestPayment"])] diff --git a/libraries/s3/lib/putBucketTagging.ml b/libraries/s3/lib/putBucketTagging.ml index fc1a11272..ca3b18266 100644 --- a/libraries/s3/lib/putBucketTagging.ml +++ b/libraries/s3/lib/putBucketTagging.ml @@ -4,11 +4,12 @@ type input = PutBucketTaggingRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketTagging"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketVersioning.ml b/libraries/s3/lib/putBucketVersioning.ml index 6f298c277..f53b36d1b 100644 --- a/libraries/s3/lib/putBucketVersioning.ml +++ b/libraries/s3/lib/putBucketVersioning.ml @@ -4,11 +4,12 @@ type input = PutBucketVersioningRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketVersioning"])] (Util.drop_empty diff --git a/libraries/s3/lib/putBucketWebsite.ml b/libraries/s3/lib/putBucketWebsite.ml index 120bc629c..2b43366d6 100644 --- a/libraries/s3/lib/putBucketWebsite.ml +++ b/libraries/s3/lib/putBucketWebsite.ml @@ -4,11 +4,12 @@ type input = PutBucketWebsiteRequest.t type output = unit type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutBucketWebsite"])] (Util.drop_empty diff --git a/libraries/s3/lib/putObject.ml b/libraries/s3/lib/putObject.ml index 05662de02..24c341e51 100644 --- a/libraries/s3/lib/putObject.ml +++ b/libraries/s3/lib/putObject.ml @@ -4,11 +4,12 @@ type input = PutObjectRequest.t type output = PutObjectOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutObject"])] (Util.drop_empty (Uri.query_of_encoded diff --git a/libraries/s3/lib/putObjectAcl.ml b/libraries/s3/lib/putObjectAcl.ml index e3607e60a..78e3386d9 100644 --- a/libraries/s3/lib/putObjectAcl.ml +++ b/libraries/s3/lib/putObjectAcl.ml @@ -4,11 +4,12 @@ type input = PutObjectAclRequest.t type output = PutObjectAclOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["PutObjectAcl"])] (Util.drop_empty diff --git a/libraries/s3/lib/restoreObject.ml b/libraries/s3/lib/restoreObject.ml index 7404dcec3..242b9f3f0 100644 --- a/libraries/s3/lib/restoreObject.ml +++ b/libraries/s3/lib/restoreObject.ml @@ -4,11 +4,12 @@ type input = RestoreObjectRequest.t type output = RestoreObjectOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["RestoreObject"])] (Util.drop_empty diff --git a/libraries/s3/lib/uploadPart.ml b/libraries/s3/lib/uploadPart.ml index cd71f52ed..ef7009603 100644 --- a/libraries/s3/lib/uploadPart.ml +++ b/libraries/s3/lib/uploadPart.ml @@ -4,11 +4,12 @@ type input = UploadPartRequest.t type output = UploadPartOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["UploadPart"])] (Util.drop_empty (Uri.query_of_encoded diff --git a/libraries/s3/lib/uploadPartCopy.ml b/libraries/s3/lib/uploadPartCopy.ml index 1bb5ad2c9..bf4289d6e 100644 --- a/libraries/s3/lib/uploadPartCopy.ml +++ b/libraries/s3/lib/uploadPartCopy.ml @@ -4,11 +4,12 @@ type input = UploadPartCopyRequest.t type output = UploadPartCopyOutput.t type error = Errors_internal.t let service = "s3" -let to_http service region req = +let to_http service region (req : input) = let uri = Uri.add_query_params - (Uri.of_string - (Aws.Util.of_option_exn (Endpoints.url_of service region))) + (Uri.of_string @@ + ((^) req.bucket + (Aws.Util.of_option_exn (Endpoints.url_of service region)))) (List.append [("Version", ["2006-03-01"]); ("Action", ["UploadPartCopy"])] (Util.drop_empty