Skip to content

Commit

Permalink
Merge pull request #1797 from howardlopez/streaming_request_payloads
Browse files Browse the repository at this point in the history
Streaming request payloads
  • Loading branch information
howardlopez committed May 24, 2019
2 parents 402a7e3 + a187ca4 commit 0f157db
Show file tree
Hide file tree
Showing 5 changed files with 410 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .changes/nextrelease/streaming_request_payloads.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"type": "feature",
"category": "",
"description": "Adds support for 'requiresLength' trait, adding headers as necessary for streaming operations."
}
]
13 changes: 13 additions & 0 deletions src/AwsClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ public function __construct(array $args)
$this->addClientSideMonitoring($args);
$this->addEndpointParameterMiddleware($args);
$this->addEndpointDiscoveryMiddleware($config, $args);
$this->addStreamRequestPayload();

if (isset($args['with_resolved'])) {
$args['with_resolved']($config);
Expand Down Expand Up @@ -371,6 +372,18 @@ private function addClientSideMonitoring($args)
);
}

private function addStreamRequestPayload()
{
$streamRequestPayloadMiddleware = StreamRequestPayloadMiddleware::wrap(
$this->api
);

$this->handlerList->prependSign(
$streamRequestPayloadMiddleware,
'StreamRequestPayloadMiddleware'
);
}

/**
* Returns a service model and doc model with any necessary changes
* applied.
Expand Down
11 changes: 11 additions & 0 deletions src/Exception/IncalculablePayloadException.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php
namespace Aws\Exception;

use Aws\HasMonitoringEventsTrait;
use Aws\MonitoringEventsInterface;

class IncalculablePayloadException extends \RuntimeException implements
MonitoringEventsInterface
{
use HasMonitoringEventsTrait;
}
85 changes: 85 additions & 0 deletions src/StreamRequestPayloadMiddleware.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?php
namespace Aws;

use Aws\Api\Service;
use Aws\Exception\IncalculablePayloadException;
use Psr\Http\Message\RequestInterface;

/**
* @internal
*/
class StreamRequestPayloadMiddleware
{
private $nextHandler;
private $service;

/**
* Create a middleware wrapper function
*
* @param Service $service
* @return \Closure
*/
public static function wrap(Service $service)
{
return function (callable $handler) use ($service) {
return new self($handler, $service);
};
}

public function __construct(callable $nextHandler, Service $service)
{
$this->nextHandler = $nextHandler;
$this->service = $service;
}

public function __invoke(CommandInterface $command, RequestInterface $request)
{
$nextHandler = $this->nextHandler;

$operation = $this->service->getOperation($command->getName());
$contentLength = $request->getHeader('content-length');
$hasStreaming = false;
$requiresLength = false;

// Check if any present input member is a stream and requires the
// content length
foreach ($operation->getInput()->getMembers() as $name => $member) {
if (!empty($member['streaming']) && isset($command[$name])) {
$hasStreaming = true;
if (!empty($member['requiresLength'])) {
$requiresLength = true;
}
}
}

if ($hasStreaming) {

// Add 'transfer-encoding' header if payload size not required to
// to be calculated and not already known
if (empty($requiresLength)
&& empty($contentLength)
&& isset($operation['authtype'])
&& $operation['authtype'] == 'v4-unsigned-body'
) {
$request = $request->withHeader('transfer-encoding', 'chunked');

// Otherwise, make sure 'content-length' header is added
} else {
if (empty($contentLength)) {
$size = $request->getBody()->getSize();
if (is_null($size)) {
throw new IncalculablePayloadException('Payload'
. ' content length is required and can not be'
. ' calculated.');
}
$request = $request->withHeader(
'content-length',
$size
);
}
}
}

return $nextHandler($command, $request);
}
}
Loading

0 comments on commit 0f157db

Please sign in to comment.