This output shape has been deprecated. Please refer to ExpiresString instead.
Expires output member.';
+ $api['shapes']['Expires']['type'] = 'timestamp';
+
return [
new Service($api, ApiProvider::defaultProvider()),
new DocModel($docs)
diff --git a/tests/Api/ServiceTest.php b/tests/Api/ServiceTest.php
index 78c9b67bd6..08c9b187c6 100644
--- a/tests/Api/ServiceTest.php
+++ b/tests/Api/ServiceTest.php
@@ -269,14 +269,40 @@ public function testModifyModel()
'signingName' => 'qux',
'protocol' => 'yak',
'uid' => 'foo-2016-12-09'
+ ],
+ 'operations' => [
+ 'FooOperation' => [
+ 'name' => 'FooOperation',
+ 'output' => [
+ 'shape' => 'FooOperationOutput'
+ ]
+ ]
+ ],
+ 'shapes' => [
+ 'FooOperationOutput' => [
+ 'type' => 'structure',
+ 'members' => [
+ 'Expires' => [
+ 'shape' => 'Expires',
+ ]
+ ]
+ ],
+ 'Expires' => [
+ 'type' => 'string'
+ ]
]
],
function () { return []; }
);
$definition = $s->getDefinition();
$definition['metadata']['serviceId'] = 'bar';
+ $definition['shapes']['Expires']['type'] = 'timestamp';
$s->setDefinition($definition);
$this->assertTrue($s->isModifiedModel());
$this->assertEquals( 'bar', $s->getMetadata('serviceId'));
+ $this->assertEquals(
+ 'timestamp',
+ $s->getOperation('FooOperation')->getOutput()->getMember('Expires')->getType()
+ );
}
}
diff --git a/tests/S3/ExpiresParsingMiddlewareTest.php b/tests/S3/ExpiresParsingMiddlewareTest.php
new file mode 100644
index 0000000000..6b1aaa6e99
--- /dev/null
+++ b/tests/S3/ExpiresParsingMiddlewareTest.php
@@ -0,0 +1,56 @@
+expectWarning();
+ $this->expectWarningMessage(
+ "Failed to parse the `expires` header as a timestamp due to "
+ . " an invalid timestamp format.\nPlease refer to `ExpiresString` "
+ . "for the unparsed string format of this header.\n"
+ );
+
+ $command = $this->getMockBuilder(CommandInterface::class)->getMock();
+ $request = $this->getMockBuilder(RequestInterface::class)->getMock();
+ $nextHandler = function ($cmd, $request) {
+ return Promise\Create::promiseFor(new Result([
+ 'ExpiresString' => 'not-a-timestamp'
+ ]));
+ };
+
+ $mw = new ExpiresParsingMiddleware($nextHandler);
+ $mw($command, $request)->wait();
+ }
+
+ public function testDoesNotEmitWarningWhenExpiresPresent()
+ {
+ $command = $this->getMockBuilder(CommandInterface::class)->getMock();
+ $request = $this->getMockBuilder(RequestInterface::class)->getMock();
+ $nextHandler = function ($cmd, $request) {
+ return Promise\Create::promiseFor(new Result([
+ 'ExpiresString' => 'test',
+ 'Expires' => 'test'
+ ]));
+ };
+
+ $mw = new ExpiresParsingMiddleware($nextHandler);
+ $result = $mw($command, $request)->wait();
+ $this->assertEquals('test', $result['Expires']);
+ $this->assertEquals('test', $result['ExpiresString']);
+ }
+}
diff --git a/tests/S3/S3ClientTest.php b/tests/S3/S3ClientTest.php
index 7eddeebfc6..d78ca73250 100644
--- a/tests/S3/S3ClientTest.php
+++ b/tests/S3/S3ClientTest.php
@@ -1,6 +1,7 @@
'us-east-1',
+ 'http_handler' => function (RequestInterface $request) {
+ return Promise\Create::promiseFor(new Response(
+ 200,
+ ['expires' => '1989-08-05']
+ ));
+ },
+ ]);
+ $result = $client->headObject(['Bucket' => 'foo', 'Key' => 'bar']);
+ $this->assertInstanceOf(DateTimeResult::class, $result['Expires']);
+ $this->assertEquals('1989-08-05', $result['ExpiresString']);
+ }
+
+ public function testEmitsWarningWhenExpiresUnparseable()
+ {
+ $this->expectWarning();
+ $this->expectWarningMessage(
+ "Failed to parse the `expires` header as a timestamp due to "
+ . " an invalid timestamp format.\nPlease refer to `ExpiresString` "
+ . "for the unparsed string format of this header.\n"
+ );
+
+ $client = new S3Client([
+ 'region' => 'us-east-1',
+ 'http_handler' => function (RequestInterface $request) {
+ return Promise\Create::promiseFor(new Response(
+ 200,
+ ['expires' => 'this-is-not-a-timestamp']
+ ));
+ },
+ ]);
+
+ $client->headObject(['Bucket' => 'foo', 'Key' => 'bar']);
+ }
+
+ public function testExpiresRemainsTimestamp() {
+ //S3 will be changing `Expires` type from `timestamp` to `string`
+ // soon. This test ensures backward compatibility
+ $apiProvider = static function () {
+ return [
+ 'metadata' => [
+ 'signatureVersion' => 'v4',
+ 'protocol' => 'rest-xml'
+ ],
+ 'shapes' => [
+ 'Expires' => [
+ 'type' => 'string'
+ ],
+ ],
+ ];
+ };
+
+ $s3Client = new S3Client([
+ 'region' => 'us-west-2',
+ 'api_provider' => $apiProvider
+ ]);
+
+ $api = $s3Client->getApi();
+ $expiresType = $api->getDefinition()['shapes']['Expires']['type'];
+ $this->assertEquals('timestamp', $expiresType);
+ }
+
+ public function testBucketNotModifiedWithLegacyEndpointProvider()
+ {
+ $client = new S3Client([
+ 'region' => 'us-west-2',
+ 'endpoint_provider' => PartitionEndpointProvider::defaultProvider()
+ ]);
+
+ $operations = $client->getApi()->getDefinition()['operations'];
+ $this->assertEquals('/{Bucket}', $operations['ListObjects']['http']['requestUri']);
+ $this->assertEquals(
+ '/{Bucket}?versions',
+ $operations['ListObjectVersions']['http']['requestUri']
+ );
+ }
+
public function builtinRegionProvider()
{
return [