Merge pull request #327 from rebuy-de/change-error-handling

filter SNS errors if operation is not supported in given region
rebuy-de · Feb 11, 2019 · 4eb457b · 4eb457b
2 parents 5a08cc7 + f6b25e5
commit 4eb457b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/resources/sns-endpoints.go b/resources/sns-endpoints.go
@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sns"
 )
@@ -24,6 +25,13 @@ func ListSNSEndpoints(sess *session.Session) ([]Resource, error) {
 	for {
 		resp, err := svc.ListPlatformApplications(platformParams)
 		if err != nil {
+			awsErr, ok := err.(awserr.Error)
+			if ok && awsErr.Code() == "InvalidAction" && awsErr.Message() == "Operation (ListPlatformApplications) is not supported in this region" {
+				// AWS answers with InvalidAction on regions that do not
+				// support ListPlatformApplications.
+				break
+			}
+
 			return nil, err
 		}
 

diff --git a/resources/sns-platformapplications.go b/resources/sns-platformapplications.go
@@ -1,6 +1,7 @@
 package resources
 
 import (
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sns"
 )
@@ -23,6 +24,13 @@ func ListSNSPlatformApplications(sess *session.Session) ([]Resource, error) {
 	for {
 		resp, err := svc.ListPlatformApplications(params)
 		if err != nil {
+			awsErr, ok := err.(awserr.Error)
+			if ok && awsErr.Code() == "InvalidAction" && awsErr.Message() == "Operation (ListPlatformApplications) is not supported in this region" {
+				// AWS answers with InvalidAction on regions that do not
+				// support ListPlatformApplications.
+				break
+			}
+
 			return nil, err
 		}