Change to v3 sdk paginator and exceptions

mcfedr · Sep 29, 2015 · 1059d93 · 1059d93
1 parent bb75f15
commit 1059d93
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 32 deletions.
diff --git a/src/Mcfedr/AwsPushBundle/Command/EnableAllCommand.php b/src/Mcfedr/AwsPushBundle/Command/EnableAllCommand.php
@@ -61,11 +61,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     private function enablePlatform($platform)
     {
-        foreach ($this->sns->getListEndpointsByPlatformApplicationIterator(
-            [
-                'PlatformApplicationArn' => $this->arns[$platform]
-            ]
-        ) as $endpoint) {
+        foreach ($this->sns->getPaginator('ListEndpointsByPlatformApplication', [
+            'PlatformApplicationArn' => $this->arns[$platform]
+        ]) as $endpoint) {
             if ($endpoint['Attributes']['Enabled'] == "false") {
                 try {
                     $this->sns->setEndpointAttributes(

diff --git a/src/Mcfedr/AwsPushBundle/Command/RemoveDisabledCommand.php b/src/Mcfedr/AwsPushBundle/Command/RemoveDisabledCommand.php
@@ -61,11 +61,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     private function removeFromPlatform($platform)
     {
-        foreach ($this->sns->getListEndpointsByPlatformApplicationIterator(
-            [
-                'PlatformApplicationArn' => $this->arns[$platform]
-            ]
-        ) as $endpoint) {
+        foreach ($this->sns->getPaginator('ListEndpointsByPlatformApplication', [
+            'PlatformApplicationArn' => $this->arns[$platform]
+        ]) as $endpoint) {
             if ($endpoint['Attributes']['Enabled'] == "false") {
                 try {
                     $this->sns->deleteEndpoint(

diff --git a/src/Mcfedr/AwsPushBundle/Command/SubscribeTopicsCommand.php b/src/Mcfedr/AwsPushBundle/Command/SubscribeTopicsCommand.php
@@ -1,8 +1,7 @@
 <?php
 namespace Mcfedr\AwsPushBundle\Command;
 
-use Aws\Sns\Exception\SubscriptionLimitExceededException;
-use Aws\Sns\Exception\TopicLimitExceededException;
+use Aws\Sns\Exception\SnsException;
 use Aws\Sns\SnsClient;
 use Mcfedr\AwsPushBundle\Service\Topics;
 use Psr\Log\LoggerInterface;
@@ -77,14 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             foreach ($this->arns as $platform => $arn) {
                 $this->subscribePlatform($platform, $input->getOption('topic'));
             }
-        } catch (SubscriptionLimitExceededException $e) {
-            $this->logger && $this->logger->error(
-                'Failed to subscription to topic',
-                [
-                    'exception' => $e
-                ]
-            );
-        } catch (TopicLimitExceededException $e) {
+        } catch (SnsException $e) {
             $this->logger && $this->logger->error(
                 'Failed to create topic',
                 [
@@ -96,11 +88,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     private function subscribePlatform($platform, $topic)
     {
-        foreach ($this->sns->getListEndpointsByPlatformApplicationIterator(
-            [
-                'PlatformApplicationArn' => $this->arns[$platform]
-            ]
-        ) as $endpoint) {
+        foreach ($this->sns->getPaginator('ListEndpointsByPlatformApplication', [
+            'PlatformApplicationArn' => $this->arns[$platform]
+        ]) as $endpoint) {
             $this->logger && $this->logger->info(
                 'Subscribing device to topic',
                 [

diff --git a/src/Mcfedr/AwsPushBundle/Service/Devices.php b/src/Mcfedr/AwsPushBundle/Service/Devices.php
@@ -2,7 +2,7 @@
 
 namespace Mcfedr\AwsPushBundle\Service;
 
-use Aws\Sns\Exception\InvalidParameterException;
+use Aws\Sns\Exception\SnsException;
 use Aws\Sns\SnsClient;
 use Mcfedr\AwsPushBundle\Exception\PlatformNotConfiguredException;
 
@@ -53,7 +53,7 @@ public function registerDevice($deviceId, $platform)
                     ]
                 ]
             );
-        } catch (InvalidParameterException $e) {
+        } catch (SnsException $e) {
             preg_match('/Endpoint (.+?) already/', $e->getMessage(), $matches);
             if (isset($matches[1])) {
                 $this->sns->setEndpointAttributes(

diff --git a/src/Mcfedr/AwsPushBundle/Service/Messages.php b/src/Mcfedr/AwsPushBundle/Service/Messages.php
@@ -136,11 +136,9 @@ private function broadcastToPlatform($message, $platform)
             return;
         }
 
-        foreach ($this->sns->getListEndpointsByPlatformApplicationIterator(
-            [
-                'PlatformApplicationArn' => $this->arns[$platform]
-            ]
-        ) as $endpoint) {
+        foreach ($this->sns->getPaginator('ListEndpointsByPlatformApplication', [
+            'PlatformApplicationArn' => $this->arns[$platform]
+        ]) as $endpoint) {
             if ($endpoint['Attributes']['Enabled'] == "true") {
                 try {
                     $this->send($message, $endpoint['EndpointArn']);