Merge pull request #770 from jeskew/fix-iterator-without-token

Fix iterator without token
aws · Sep 18, 2015 · a415f98 · a415f98
2 parents f09d297 + a6bde53
commit a415f98
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/AwsClient.php b/src/AwsClient.php
@@ -245,7 +245,7 @@ public function getIterator($name, array $args = [])
             return $this->getPaginator($name, $args)->search($key);
         }
 
-        $result = $this->getCommand($name, $args)->search($key);
+        $result = $this->execute($this->getCommand($name, $args))->search($key);
 
         return new \ArrayIterator((array) $result);
     }

diff --git a/tests/AwsClientTest.php b/tests/AwsClientTest.php
@@ -141,6 +141,20 @@ public function testCanGetIterator()
         );
     }
 
+    public function testCanGetIteratorWithoutDefinedPaginator()
+    {
+        $client = $this->getTestClient('ec2');
+        $data = ['foo', 'bar', 'baz'];
+        $this->addMockResults($client, [new Result([
+            'Subnets' => [$data],
+        ])]);
+        $iterator = $client->getIterator('DescribeSubnets');
+        $this->assertInstanceOf('Traversable', $iterator);
+        foreach ($iterator as $iterated) {
+            $this->assertSame($data, $iterated);
+        }
+    }
+
     /**
      * @expectedException \UnexpectedValueException
      */