WebSVN – Moodle – Diff – /lib/aws-sdk/src/Middleware.php

 use Aws\Api\Service;
 use Aws\Api\Validator;
 use Aws\Credentials\CredentialsInterface;
 use Aws\EndpointV2\EndpointProviderV2;
 use Aws\Exception\AwsException;
+use Aws\Signature\S3ExpressSignature;
 use Aws\Token\TokenAuthorization;
 use Aws\Token\TokenInterface;
 use GuzzleHttp\Promise;
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\LazyOpenStream;
             $bodyParameter,
             $sourceParameter
         ) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null)
+                ?RequestInterface $request = null)
             use (
                 $handler,
                 $api,
                 $bodyParameter,
                 $sourceParameter
                 $source = $command[$sourceParameter];
                 if ($source !== null
                     && $operation->getInput()->hasMember($bodyParameter)
                 ) {
+                    $lazyOpenStream = new LazyOpenStream($source, 'r');
-                    $command[$bodyParameter] = new LazyOpenStream($source, 'r');
+                    $command[$bodyParameter] = $lazyOpenStream;
+                    unset($command[$sourceParameter]);
+                    $next = $handler($command, $request);
+                    // To avoid failures in some tests cases
+                    if ($next !== null && method_exists($next, 'then')) {
+                        return $next->then(
+                            function ($result) use ($lazyOpenStream) {
+                                // To make sure the resource is closed.
+                                $lazyOpenStream->close();
+                                return $result;
+                            }
+                        )->otherwise(function (\Throwable $e) use ($lazyOpenStream) {
+                            $lazyOpenStream->close();
+                            throw $e;
+                        });
+                    }
-                    unset($command[$sourceParameter]);
+                    return $next;
+                }
                 return $handler($command, $request);
+     *
      * @param Service $api API being accessed.
+     *
      * @return callable
      */
-    public static function validation(Service $api, Validator $validator = null)
+    public static function validation(Service $api, ?Validator $validator = null)
+    {
         $validator = $validator ?: new Validator();
         return function (callable $handler) use ($api, $validator) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($api, $validator, $handler) {
                 if ($api->isModifiedModel()) {
                     $api = new Service(
                         $api->getDefinition(),
                         $api->getProvider()
      *                             command.
      * @param EndpointProviderV2 | null $endpointProvider
      * @param array $providerArgs
      * @return callable
      */
-    public static function requestBuilder(
+    public static function requestBuilder($serializer)
-        $serializer,
-        $endpointProvider = null,
-        array $providerArgs = null
-    )
     {
-        return function (callable $handler) use ($serializer, $endpointProvider, $providerArgs) {
+        return function (callable $handler) use ($serializer) {
-            return function (CommandInterface $command) use ($serializer, $handler, $endpointProvider, $providerArgs) {
+            return function (CommandInterface $command, $endpoint = null) use ($serializer, $handler) {
-                return $handler($command, $serializer($command, $endpointProvider, $providerArgs));
+                return $handler($command, $serializer($command, $endpoint));
             };
         };
+    }
      *                                    object and returns a
      *                                    SignatureInterface.
+     *
      * @return callable
      */
-    public static function signer(callable $credProvider, callable $signatureFunction, $tokenProvider = null)
+    public static function signer(callable $credProvider, callable $signatureFunction, $tokenProvider = null, $config = [])
+    {
-        return function (callable $handler) use ($signatureFunction, $credProvider, $tokenProvider) {
+        return function (callable $handler) use ($signatureFunction, $credProvider, $tokenProvider, $config) {
             return function (
                 CommandInterface $command,
                 RequestInterface $request
-            ) use ($handler, $signatureFunction, $credProvider, $tokenProvider) {
+            ) use ($handler, $signatureFunction, $credProvider, $tokenProvider, $config) {
                 $signer = $signatureFunction($command);
                 if ($signer instanceof TokenAuthorization) {
                     return $tokenProvider()->then(
                         function (TokenInterface $token)
                         use ($handler, $command, $signer, $request) {
                                 $command,
                                 $signer->authorizeRequest($request, $token)
                             );
+                        }
                     );
+                }
+                if ($signer instanceof S3ExpressSignature) {
+                    $credentialPromise = $config['s3_express_identity_provider']($command);
                 } else {
-                    return $credProvider()->then(
+                    $credentialPromise = $credProvider();
-                        function (CredentialsInterface $creds)
-                        use ($handler, $command, $signer, $request) {
-                            return $handler(
-                                $command,
-                                $signer->signRequest($request, $creds)
-                            );
-                        }
-                    );
+                }
+                return $credentialPromise->then(
+                    function (CredentialsInterface $creds)
+                    use ($handler, $command, $signer, $request) {
+                        // Capture credentials metric
+                        $command->getMetricsBuilder()->identifyMetricByValueAndAppend(
+                            'credentials',
+                            $creds
+                        );
+                        return $handler(
+                            $command,
+                            $signer->signRequest($request, $creds)
+                        );
+                    }
+                );
             };
         };
+    }
     public static function tap(callable $fn)
+    {
         return function (callable $handler) use ($fn) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($handler, $fn) {
                 $fn($command, $request);
                 return $handler($command, $request);
             };
         };
      *                          associated delay.
+     *
      * @return callable
      */
     public static function retry(
-        callable $decider = null,
+        ?callable $decider = null,
-        callable $delay = null,
+        ?callable $delay = null,
         $stats = false
     ) {
         $decider = $decider ?: RetryMiddleware::createDefaultDecider();
         $delay = $delay ?: [RetryMiddleware::class, 'exponentialDelay'];
     public static function contentType(array $operations)
+    {
         return function (callable $handler) use ($operations) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($handler, $operations) {
                 if (!$request->hasHeader('Content-Type')
                     && in_array($command->getName(), $operations, true)
                     && ($uri = $request->getBody()->getMetadata('uri'))
                 ) {
     public static function history(History $history)
+    {
         return function (callable $handler) use ($history) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($handler, $history) {
                 $ticket = $history->start($command, $request);
                 return $handler($command, $request)
                     ->then(
                         function ($result) use ($history, $ticket) {
     public static function mapRequest(callable $f)
+    {
         return function (callable $handler) use ($f) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($handler, $f) {
                 return $handler($command, $f($request));
             };
         };
+    }
     public static function mapCommand(callable $f)
+    {
         return function (callable $handler) use ($f) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($handler, $f) {
                 return $handler($f($command), $request);
             };
         };
+    }
     public static function mapResult(callable $f)
+    {
         return function (callable $handler) use ($f) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($handler, $f) {
                 return $handler($command, $request)->then($f);
             };
         };
+    }
     public static function timer()
+    {
         return function (callable $handler) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($handler) {
                 $start = microtime(true);
                 return $handler($command, $request)
                     ->then(
                         function (ResultInterface $res) use ($start) {

Proyectos de Subversion Moodle

(root)/lib/aws-sdk/src/Middleware.php – Rev 1 → 1441