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

 use Aws\Api\Service;
 use Aws\AwsClient;
 use Aws\CacheInterface;
 use Aws\ClientResolver;
 use Aws\Command;
+use Aws\CommandInterface;
+use Aws\Configuration\ConfigurationResolver;
 use Aws\Exception\AwsException;
 use Aws\HandlerList;
+use Aws\Identity\S3\S3ExpressIdentityProvider;
 use Aws\InputValidationMiddleware;
 use Aws\Middleware;
+use Aws\ResultInterface;
 use Aws\Retry\QuotaManager;
 use Aws\RetryMiddleware;
-use Aws\ResultInterface;
-use Aws\CommandInterface;
 use Aws\RetryMiddlewareV2;
+use Aws\S3\Parser\GetBucketLocationResultMutator;
+use Aws\S3\Parser\S3Parser;
+use Aws\S3\Parser\ValidateResponseChecksumResultMutator;
+use Aws\S3\RegionalEndpoint\ConfigurationProvider;
 use Aws\S3\UseArnRegion\Configuration;
 use Aws\S3\UseArnRegion\ConfigurationInterface;
 use Aws\S3\UseArnRegion\ConfigurationProvider as UseArnRegionConfigurationProvider;
-use Aws\S3\RegionalEndpoint\ConfigurationProvider;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\RequestInterface;
 /**
  * @method \GuzzleHttp\Promise\Promise completeMultipartUploadAsync(array $args = [])
  * @method \Aws\Result copyObject(array $args = [])
  * @method \GuzzleHttp\Promise\Promise copyObjectAsync(array $args = [])
  * @method \Aws\Result createBucket(array $args = [])
  * @method \GuzzleHttp\Promise\Promise createBucketAsync(array $args = [])
+ * @method \Aws\Result createBucketMetadataTableConfiguration(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise createBucketMetadataTableConfigurationAsync(array $args = [])
  * @method \Aws\Result createMultipartUpload(array $args = [])
  * @method \GuzzleHttp\Promise\Promise createMultipartUploadAsync(array $args = [])
+ * @method \Aws\Result createSession(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise createSessionAsync(array $args = [])
  * @method \Aws\Result deleteBucket(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteBucketAsync(array $args = [])
  * @method \Aws\Result deleteBucketAnalyticsConfiguration(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteBucketAnalyticsConfigurationAsync(array $args = [])
  * @method \Aws\Result deleteBucketCors(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteBucketIntelligentTieringConfigurationAsync(array $args = [])
  * @method \Aws\Result deleteBucketInventoryConfiguration(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteBucketInventoryConfigurationAsync(array $args = [])
  * @method \Aws\Result deleteBucketLifecycle(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteBucketLifecycleAsync(array $args = [])
+ * @method \Aws\Result deleteBucketMetadataTableConfiguration(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise deleteBucketMetadataTableConfigurationAsync(array $args = [])
  * @method \Aws\Result deleteBucketMetricsConfiguration(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteBucketMetricsConfigurationAsync(array $args = [])
  * @method \Aws\Result deleteBucketOwnershipControls(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteBucketOwnershipControlsAsync(array $args = [])
  * @method \Aws\Result deleteBucketPolicy(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getBucketLifecycleConfigurationAsync(array $args = [])
  * @method \Aws\Result getBucketLocation(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getBucketLocationAsync(array $args = [])
  * @method \Aws\Result getBucketLogging(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getBucketLoggingAsync(array $args = [])
+ * @method \Aws\Result getBucketMetadataTableConfiguration(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise getBucketMetadataTableConfigurationAsync(array $args = [])
  * @method \Aws\Result getBucketMetricsConfiguration(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getBucketMetricsConfigurationAsync(array $args = [])
  * @method \Aws\Result getBucketNotification(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getBucketNotificationAsync(array $args = [])
  * @method \Aws\Result getBucketNotificationConfiguration(array $args = [])
  * @method \GuzzleHttp\Promise\Promise listBucketInventoryConfigurationsAsync(array $args = [])
  * @method \Aws\Result listBucketMetricsConfigurations(array $args = [])
  * @method \GuzzleHttp\Promise\Promise listBucketMetricsConfigurationsAsync(array $args = [])
  * @method \Aws\Result listBuckets(array $args = [])
  * @method \GuzzleHttp\Promise\Promise listBucketsAsync(array $args = [])
+ * @method \Aws\Result listDirectoryBuckets(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise listDirectoryBucketsAsync(array $args = [])
  * @method \Aws\Result listMultipartUploads(array $args = [])
  * @method \GuzzleHttp\Promise\Promise listMultipartUploadsAsync(array $args = [])
  * @method \Aws\Result listObjectVersions(array $args = [])
  * @method \GuzzleHttp\Promise\Promise listObjectVersionsAsync(array $args = [])
  * @method \Aws\Result listObjects(array $args = [])
  * @method \Aws\Result writeGetObjectResponse(array $args = [])
  * @method \GuzzleHttp\Promise\Promise writeGetObjectResponseAsync(array $args = [])
  */
 class S3Client extends AwsClient implements S3ClientInterface
+{
+    private const DIRECTORY_BUCKET_REGEX = '/^[a-zA-Z0-9_-]+--[a-z0-9]+-az\d+--x-s3'
+                                            .'(?!.*(?:-s3alias|--ol-s3|\.mrap))$/';
     use S3ClientTrait;
     /** @var array */
+    private static $mandatoryAttributes = ['Bucket', 'Key'];
+    /** @var array */
+    private static $checksumOptionEnum = [
+        'when_supported' => true,
+        'when_required' => true
-    private static $mandatoryAttributes = ['Bucket', 'Key'];
+    ];
     public static function getArguments()
+    {
         $args = parent::getArguments();
         $args['retries']['fn'] = [__CLASS__, '_applyRetryConfig'];
+        $args['api_provider']['fn'] = [__CLASS__, '_applyApiProvider'];
-        $args['api_provider']['fn'] = [__CLASS__, '_applyApiProvider'];
+        return
-        return $args + [
+            [
-            'bucket_endpoint' => [
+                'request_checksum_calculation' => [
-                'type'    => 'config',
+                    'type' => 'config',
-                'valid'   => ['bool'],
+                    'valid' => ['string'],
-                'doc'     => 'Set to true to send requests to a hardcoded '
+                    'doc' => 'Valid values are `when_supported` and `when_required`. Default is `when_supported`.'
-                    . 'bucket endpoint rather than create an endpoint as a '
-                    . 'result of injecting the bucket into the URL. This '
-                    . 'option is useful for interacting with CNAME endpoints.',
-            ],
-            'use_arn_region' => [
-                'type'    => 'config',
+                        . ' `when_supported` results in checksum calculation when an operation has modeled checksum support.'
-                'valid'   => [
+                        . ' `when_required` results in checksum calculation when an operation has modeled checksum support and'
-                    'bool',
-                    Configuration::class,
+                        . ' request checksums are modeled as required.',
+                    'fn' => [__CLASS__, '_apply_request_checksum_calculation'],
+                    'default' => [__CLASS__, '_default_request_checksum_calculation'],
+                ],
+                'response_checksum_validation' => [
+                    'type' => 'config',
+                    'valid' => ['string'],
+                    'doc' => 'Valid values are `when_supported` and `when_required`. Default is `when_supported`.'
+                        . ' `when_supported` results in checksum validation when an operation has modeled checksum support.'
+                        . ' `when_required` results in checksum validation when an operation has modeled checksum support and'
+                        . ' `CheckSumMode` is set to `enabled`.',
+                    'fn' => [__CLASS__, '_apply_response_checksum_validation'],
+                    'default' => [__CLASS__, '_default_response_checksum_validation'],
+                ]
+            ]
+            + $args + [
+                'bucket_endpoint' => [
+                    'type'    => 'config',
+                    'valid'   => ['bool'],
+                    'doc'     => 'Set to true to send requests to a hardcoded '
+                        . 'bucket endpoint rather than create an endpoint as a '
+                        . 'result of injecting the bucket into the URL. This '
+                        . 'option is useful for interacting with CNAME endpoints.',
+                ],
+                'use_arn_region' => [
+                    'type'    => 'config',
+                    'valid'   => [
+                        'bool',
+                        Configuration::class,
-                    CacheInterface::class,
+                        CacheInterface::class,
-                    'callable'
+                        'callable'
-                ],
+                    ],
-                'doc'     => 'Set to true to allow passed in ARNs to override'
+                    'doc'     => 'Set to true to allow passed in ARNs to override'
-                    . ' client region. Accepts...',
+                        . ' client region. Accepts...',
-                'fn' => [__CLASS__, '_apply_use_arn_region'],
+                    'fn' => [__CLASS__, '_apply_use_arn_region'],
-                'default' => [UseArnRegionConfigurationProvider::class, 'defaultProvider'],
+                    'default' => [UseArnRegionConfigurationProvider::class, 'defaultProvider'],
-            ],
+                ],
-            'use_accelerate_endpoint' => [
+                'use_accelerate_endpoint' => [
-                'type' => 'config',
+                    'type' => 'config',
-                'valid' => ['bool'],
+                    'valid' => ['bool'],
-                'doc' => 'Set to true to send requests to an S3 Accelerate'
+                    'doc' => 'Set to true to send requests to an S3 Accelerate'
-                    . ' endpoint by default. Can be enabled or disabled on'
+                        . ' endpoint by default. Can be enabled or disabled on'
-                    . ' individual operations by setting'
+                        . ' individual operations by setting'
-                    . ' \'@use_accelerate_endpoint\' to true or false. Note:'
+                        . ' \'@use_accelerate_endpoint\' to true or false. Note:'
-                    . ' you must enable S3 Accelerate on a bucket before it can'
+                        . ' you must enable S3 Accelerate on a bucket before it can'
-                    . ' be accessed via an Accelerate endpoint.',
+                        . ' be accessed via an Accelerate endpoint.',
-                'default' => false,
+                    'default' => false,
-            ],
+                ],
-            'use_path_style_endpoint' => [
+                'use_path_style_endpoint' => [
-                'type' => 'config',
+                    'type' => 'config',
-                'valid' => ['bool'],
+                    'valid' => ['bool'],
-                'doc' => 'Set to true to send requests to an S3 path style'
+                    'doc' => 'Set to true to send requests to an S3 path style'
-                    . ' endpoint by default.'
+                        . ' endpoint by default.'
-                    . ' Can be enabled or disabled on individual operations by setting'
+                        . ' Can be enabled or disabled on individual operations by setting'
-                    . ' \'@use_path_style_endpoint\' to true or false.',
+                        . ' \'@use_path_style_endpoint\' to true or false.',
-                'default' => false,
+                    'default' => false,
-            ],
+                ],
-            'disable_multiregion_access_points' => [
+                'disable_multiregion_access_points' => [
-                'type' => 'config',
+                    'type' => 'config',
-                'valid' => ['bool'],
+                    'valid' => ['bool'],
-                'doc' => 'Set to true to disable the usage of'
+                    'doc' => 'Set to true to disable the usage of'
-                    . ' multi region access points. These are enabled by default.'
+                        . ' multi region access points. These are enabled by default.'
+                        . ' Can be enabled or disabled on individual operations by setting'
+                        . ' \'@disable_multiregion_access_points\' to true or false.',
+                    'default' => false,
+                ],
+                'disable_express_session_auth' => [
+                    'type' => 'config',
+                    'valid' => ['bool'],
+                    'doc' => 'Set to true to disable the usage of'
+                        . ' s3 express session authentication. This is enabled by default.',
+                    'default' => [__CLASS__, '_default_disable_express_session_auth'],
+                ],
+                's3_express_identity_provider' => [
+                    'type'    => 'config',
+                    'valid'   => [
+                        'bool',
+                        'callable'
+                    ],
+                    'doc'     => 'Specifies the provider used to generate identities to sign s3 express requests.  '
-                    . ' Can be enabled or disabled on individual operations by setting'
+                        . 'Set to `false` to disable s3 express auth, or a callable provider used to create s3 express '
-                    . ' \'@disable_multiregion_access_points\' to true or false.',
+                        . 'identities or return null.',
-                'default' => false,
+                    'default' => [__CLASS__, '_default_s3_express_identity_provider'],
             ],
+        }
         $this->addBuiltIns($args);
         parent::__construct($args);
         $stack = $this->getHandlerList();
         $stack->appendInit(SSECMiddleware::wrap($this->getEndpoint()->getScheme()), 's3.ssec');
+        $stack->appendBuild(
-        $stack->appendBuild(ApplyChecksumMiddleware::wrap($this->getApi()), 's3.checksum');
+            ApplyChecksumMiddleware::wrap($this->getApi(), $this->getConfig()),
+            's3.checksum'
+        );
         $stack->appendBuild(
             Middleware::contentType(['PutObject', 'UploadPart']),
             's3.content_type'
         );
                     'dual_stack' =>
                         $this->getConfig('use_dual_stack_endpoint')->isUseDualStackEndpoint(),
                     'use_fips_endpoint' => $this->getConfig('use_fips_endpoint'),
                     'disable_multiregion_access_points' =>
                         $this->getConfig('disable_multiregion_access_points'),
-                    'endpoint' => isset($args['endpoint'])
+                    'endpoint' => $args['endpoint'] ?? null
-                        ? $args['endpoint']
-                        : null
                 ],
                 $this->isUseEndpointV2()
             ),
             's3.bucket_endpoint_arn'
         );
+        if ($this->getConfig('disable_express_session_auth')) {
+            $stack->prependSign(
+                $this->getDisableExpressSessionAuthMiddleware(),
+                's3.disable_express_session_auth'
+            );
+        }
         $stack->appendValidate(
             InputValidationMiddleware::wrap($this->getApi(), self::$mandatoryAttributes),
             'input_validation_middleware'
+        );
-        );
+        $stack->appendSign(ExpiresParsingMiddleware::wrap(), 's3.expires_parsing');
         $stack->appendSign(PutObjectUrlMiddleware::wrap(), 's3.put_object_url');
         $stack->appendSign(PermanentRedirectMiddleware::wrap(), 's3.permanent_redirect');
         $stack->appendInit(Middleware::sourceFile($this->getApi()), 's3.source_file');
         $stack->appendInit($this->getSaveAsParameter(), 's3.save_as');
         $stack->appendInit($this->getLocationConstraintMiddleware(), 's3.location');
         $stack->appendInit($this->getEncodingTypeMiddleware(), 's3.auto_encode');
+        $stack->appendInit($this->getHeadObjectMiddleware(), 's3.head_object');
-        $stack->appendInit($this->getHeadObjectMiddleware(), 's3.head_object');
+        $this->processModel($this->isUseEndpointV2());
-        if ($this->isUseEndpointV2()) {
-            $this->processEndpointV2Model();
+        if ($this->isUseEndpointV2()) {
-            $stack->after('builderV2',
+            $stack->after('builder',
                 's3.check_empty_path_with_query',
                 $this->getEmptyPathWithQuery());
+        }
             // The Configuration class itself will validate other inputs
             $args['use_arn_region'] = new Configuration($value);
+        }
+    }
+    public static function _default_request_checksum_calculation(array $args): string
+    {
+        return ConfigurationResolver::resolve(
+            'request_checksum_calculation',
+            ApplyChecksumMiddleware::DEFAULT_CALCULATION_MODE,
+            'string',
+            $args
+        );
+    }
+    public static function _apply_request_checksum_calculation(
+        string $value,
+        array &$args
+    ): void
+    {
+        $value = strtolower($value);
+        if (array_key_exists($value, self::$checksumOptionEnum)) {
+            $args['request_checksum_calculation'] = $value;
+        } else {
+            $validValues = implode(' | ', array_keys(self::$checksumOptionEnum));
+            throw new \InvalidArgumentException(
+                'invalid value provided for `request_checksum_calculation`.'
+                . ' valid values are: ' . $validValues . '.'
+            );
+        }
+    }
+    public static function _default_response_checksum_validation(array $args): string
+    {
+        return ConfigurationResolver::resolve(
+            'response_checksum_validation',
+            ValidateResponseChecksumResultMutator::DEFAULT_VALIDATION_MODE,
+            'string',
+            $args
+        );
+    }
+    public static function _apply_response_checksum_validation(
+        $value,
+        array &$args
+    ): void
+    {
+        $value = strtolower($value);
+        if (array_key_exists($value, self::$checksumOptionEnum)) {
+            $args['response_checksum_validation'] = $value;
+        } else {
+            $validValues = implode(' | ', array_keys(self::$checksumOptionEnum));
+            throw new \InvalidArgumentException(
+                'invalid value provided for `response_checksum_validation`.'
+                . ' valid values are: ' . $validValues . '.'
+            );
+        }
+    }
+    public static function _default_disable_express_session_auth(array &$args)
+    {
+        return ConfigurationResolver::resolve(
+            's3_disable_express_session_auth',
+            false,
+            'bool',
+            $args
+        );
+    }
+    public static function _default_s3_express_identity_provider(array $args)
+    {
+        if ($args['config']['disable_express_session_auth']) {
+            return false;
+        }
+        return new S3ExpressIdentityProvider($args['region']);
+    }
     public function createPresignedRequest(CommandInterface $command, $expires, array $options = [])
+    {
+        $command = clone $command;
-        $command = clone $command;
+        $list = $command->getHandlerList();
+        $list->remove('signer');
+        //Removes checksum calculation behavior by default
+        if (empty($command['ChecksumAlgorithm'])
+            && empty($command['AddContentMD5'])
+        ) {
+            $list->remove('s3.checksum');
+        }
         $command->getHandlerList()->remove('signer');
+        $request = \Aws\serialize($command);
+        //Applies ContentSHA256 parameter, if provided and not applied
-        $request = \Aws\serialize($command);
+        // by middleware
+        $commandName = $command->getName();
+        if (!empty($command['ContentSHA256']
+            && isset(ApplyChecksumMiddleware::$sha256[$commandName])
+            && !$request->hasHeader('X-Amz-Content-Sha256')
-        $signing_name = empty($command->getAuthSchemes())
+        )) {
+            $request = $request->withHeader(
-            ? $this->getSigningName($request->getUri()->getHost())
+                'X-Amz-Content-Sha256',
+                $command['ContentSHA256']
+            );
+        }
-            : $command->getAuthSchemes()['name'];
-        $signature_version = empty($command->getAuthSchemes())
+        $signing_name = $command['@context']['signing_service']
-            ? $this->getConfig('signature_version')
+            ?? $this->getSigningName($request->getUri()->getHost());
-            : $command->getAuthSchemes()['version'];
+        $signature_version = $this->getSignatureVersionFromCommand($command);
         /** @var \Aws\Signature\SignatureInterface $signer */
         $signer = call_user_func(
             $this->getSignatureProvider(),
             $signature_version,
             $signing_name,
+            $this->getConfig('signing_region')
+        );
+        if ($signature_version == 'v4-s3express') {
+            $provider = $this->getConfig('s3_express_identity_provider');
+            $credentials = $provider($command)->wait();
-            $this->getConfig('signing_region')
+        } else {
-        );
+            $credentials = $this->getCredentials()->wait();
+        }
         return $signer->presign(
             $request,
-            $this->getCredentials()->wait(),
+            $credentials,
             $expires,
             $options
     private function getLocationConstraintMiddleware()
+    {
         $region = $this->getRegion();
         return static function (callable $handler) use ($region) {
             return function (Command $command, $request = null) use ($handler, $region) {
-                if ($command->getName() === 'CreateBucket') {
+                if ($command->getName() === 'CreateBucket'
-                    $locationConstraint = isset($command['CreateBucketConfiguration']['LocationConstraint'])
+                    && !self::isDirectoryBucket($command['Bucket'])
+                ) {
-                        ? $command['CreateBucketConfiguration']['LocationConstraint']
+                    $locationConstraint = $command['CreateBucketConfiguration']['LocationConstraint']
-                        : null;
+                        ?? null;
                     if ($locationConstraint === 'us-east-1') {
                         unset($command['CreateBucketConfiguration']);
+                    } elseif ('us-east-1' !== $region && empty($locationConstraint)) {
+                        if (isset($command['CreateBucketConfiguration'])) {
+                            $command['CreateBucketConfiguration']['LocationConstraint'] = $region;
-                    } elseif ('us-east-1' !== $region && empty($locationConstraint)) {
+                        } else {
+                            $command['CreateBucketConfiguration'] = ['LocationConstraint' => $region];
                         $command['CreateBucketConfiguration'] = ['LocationConstraint' => $region];
+                    }
+                }
     private function getHeadObjectMiddleware()
+    {
         return static function (callable $handler) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                ?RequestInterface $request = null
             ) use ($handler) {
                 if ($command->getName() === 'HeadObject'
                     && !isset($command['@http']['decode_content'])
                 ) {
                     $command['@http']['decode_content'] = false;
             };
         };
+    }
+    /**
+     * Provides a middleware that disables express session auth when
+     * customers opt out of it.
+     *
+     * @return \Closure
+     */
+    private function getDisableExpressSessionAuthMiddleware()
+    {
+        return function (callable $handler) {
+            return function (
+                CommandInterface $command,
+                ?RequestInterface $request = null
+            ) use ($handler) {
+                if (!empty($command['@context']['signature_version'])
+                    && $command['@context']['signature_version'] === 'v4-s3express'
+                ) {
+                    $command['@context']['signature_version'] = 's3v4';
+                }
+                return $handler($command, $request);
+            };
+        };
+    }
     /**
      * Special handling for when the service name is s3-object-lambda.
      * So, if the host contains s3-object-lambda, then the service name
      * returned is s3-object-lambda, otherwise the default signing service is returned.
      * @param string $host The host to validate if is a s3-object-lambda URL.
         return $this->getConfig('signing_name');
+    }
     /**
-     * Modifies API definition to remove `Bucket` from request URIs.
+     * If EndpointProviderV2 is used, removes `Bucket` from request URIs.
+     * This is now handled by the endpoint ruleset.
+     *
+     * Additionally adds a synthetic shape `ExpiresString` and modifies
+     * `Expires` type to ensure it remains set to `timestamp`.
      * This is now handled by the endpoint ruleset.
      * @param array $args
      * @return void
+     *
      * @internal
      */
-    private function processEndpointV2Model()
+    private function processModel(bool $isUseEndpointV2): void
+    {
-    {
+        $definition = $this->getApi()->getDefinition();
-        $definition = $this->getApi()->getDefinition();
+        if ($isUseEndpointV2) {
-        foreach($definition['operations'] as &$operation) {
+            foreach($definition['operations'] as &$operation) {
-            if (isset($operation['http']['requestUri'])) {
+                if (isset($operation['http']['requestUri'])) {
-                $requestUri = $operation['http']['requestUri'];
+                    $requestUri = $operation['http']['requestUri'];
-                if ($requestUri === "/{Bucket}") {
+                    if ($requestUri === "/{Bucket}") {
+                        $requestUri = str_replace('/{Bucket}', '/', $requestUri);
+                    } else {
+                        $requestUri = str_replace('/{Bucket}', '', $requestUri);
+                    }
+                    $operation['http']['requestUri'] = $requestUri;
+                }
+            }
+        }
+        foreach ($definition['shapes'] as $key => &$value) {
+            $suffix = 'Output';
+            if (substr($key, -strlen($suffix)) === $suffix) {
+                if (isset($value['members']['Expires'])) {
+                    $value['members']['Expires']['deprecated'] = true;
+                    $value['members']['ExpiresString'] = [
+                        'shape' => 'ExpiresString',
-                    $requestUri = str_replace('/{Bucket}', '/', $requestUri);
+                        'location' => 'header',
-                } else {
-                    $requestUri = str_replace('/{Bucket}', '', $requestUri);
+                        'locationName' => 'Expires'
                     ];
+                }
+            }
+        }
-                $operation['http']['requestUri'] = $requestUri;
+        $definition['shapes']['ExpiresString']['type'] = 'string';
         $definition['shapes']['Expires']['type'] = 'timestamp';
         $this->getApi()->setDefinition($definition);
+    }
     /**
      * Adds service-specific client built-in values
+     *
+     * @return void
-     * @return void
+     */
+    private function addBuiltIns($args)
+    {
+        if (isset($args['region'])
+            && $args['region'] !== 'us-east-1'
+        ) {
+            return false;
+        }
      */
-    private function addBuiltIns($args)
+        if (!isset($args['region'])
+            && ConfigurationResolver::resolve('region', '', 'string') !== 'us-east-1'
         ) {
-        if ($args['region'] !== 'us-east-1') {
+            return false;
             return false;
+            }
+        }
         $this->clientBuiltIns[$key] = $value;
+    }
+    /**
+     * Determines whether a bucket is a directory bucket.
+     * Only considers the availability zone/suffix format
+     *
+     * @param string $bucket
+     * @return bool
+     */
+    public static function isDirectoryBucket(string $bucket): bool
+    {
+        return preg_match(self::DIRECTORY_BUCKET_REGEX, $bucket) === 1;
+    }
     /** @internal */
     public static function _applyRetryConfig($value, $args, HandlerList $list)
+    {
         if ($value) {
             $config = \Aws\Retry\ConfigurationProvider::unwrap($value);
             if ($config->getMode() === 'legacy') {
                 $maxRetries = $config->getMaxAttempts() - 1;
                 $decider = RetryMiddleware::createDefaultDecider($maxRetries);
-                $decider = function ($retries, $command, $request, $result, $error) use ($decider, $maxRetries) {
-                    $maxRetries = null !== $command['@retries']
-                        ? $command['@retries']
+                $decider = function ($retries, $command, $request, $result, $error) use ($decider, $maxRetries) {
-                        : $maxRetries;
+                    $maxRetries = $command['@retries'] ?? $maxRetries;
     /** @internal */
     public static function _applyApiProvider($value, array &$args, HandlerList $list)
+    {
         ClientResolver::_apply_api_provider($value, $args);
-        $args['parser'] = new GetBucketLocationParser(
+        $s3Parser = new S3Parser(
-            new ValidateResponseChecksumParser(
+            $args['parser'],
-                new AmbiguousSuccessParser(
-                    new RetryableMalformedResponseParser(
+            $args['error_parser'],
-                        $args['parser'],
+            $args['api'],
-                        $args['exception_class']
+            $args['exception_class']
+        );
-                    ),
+        $s3Parser->addS3ResultMutator(
-                    $args['error_parser'],
+            'get-bucket-location',
-                    $args['exception_class']
+            new GetBucketLocationResultMutator()
+        );
+        $s3Parser->addS3ResultMutator(
+            'validate-response-checksum',
-                ),
+            new ValidateResponseChecksumResultMutator(
+                $args['api'],
-                $args['api']
+                ['response_checksum_validation' => $args['response_checksum_validation']]
+            )
+        );
-        );
+        $args['parser'] = $s3Parser;
+    }
     /**
         $docs['shapes']['ContentMD5']['appendOnly'] = [
             'message' => $objectLock,
             'shapes' => ['PutObjectRequest', 'UploadPartRequest']
         ];
+        // Add `ExpiresString` shape to output structures which contain `Expires`
+        // Deprecate existing `Expires` shapes in output structures
+        // Add/Update documentation for both `ExpiresString` and `Expires`
+        // Ensure `Expires` type remains timestamp
+        foreach ($api['shapes'] as $key => &$value) {
+            $suffix = 'Output';
+            if (substr($key, -strlen($suffix)) === $suffix) {
+                if (isset($value['members']['Expires'])) {
+                    $value['members']['Expires']['deprecated'] = true;
+                    $value['members']['ExpiresString'] = [
+                        'shape' => 'ExpiresString',
+                        'location' => 'header',
+                        'locationName' => 'Expires'
+                    ];
+                    $docs['shapes']['Expires']['refs'][$key . '$Expires']
+                        .= '<p>This output shape has been deprecated. Please refer to <code>ExpiresString</code> instead.</p>.';
+                }
+            }
+        }
+        $api['shapes']['ExpiresString']['type'] = 'string';
+        $docs['shapes']['ExpiresString']['base'] = 'The unparsed string value of the <code>Expires</code> output member.';
+        $api['shapes']['Expires']['type'] = 'timestamp';
         return [
             new Service($api, ApiProvider::defaultProvider()),
             new DocModel($docs)
         ];
             $examples['PutObject'] = [$putObjectExample];
+        }
         return $examples;
+    }
+    /**
+     * @param CommandInterface $command
+     * @return array|mixed|null
+     */
+    private function getSignatureVersionFromCommand(CommandInterface $command)
+    {
+        return $command['@context']['signature_version']
+            ?? $this->getConfig('signature_version');
+    }

Proyectos de Subversion Moodle

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