From d2cab566bbd7f4c314917eeae1681e6ffbf1b488 Mon Sep 17 00:00:00 2001
From: Andrii Romanenko <andrejjrom@gmail.com>
Date: Tue, 31 May 2022 16:52:23 +0300
Subject: [PATCH] fix: Fixed `NotFound` errors exceptions for some resources
 (#965)

---
 resources/services/apigateway/rest_apis.go  | 3 +++
 resources/services/elbv2/listeners.go       | 3 +++
 resources/services/kms/keys.go              | 3 +++
 resources/services/lambda/functions.go      | 3 +++
 resources/services/rds/cluster_snapshots.go | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/resources/services/apigateway/rest_apis.go b/resources/services/apigateway/rest_apis.go
index f71df4a5b..923a6b8a8 100644
--- a/resources/services/apigateway/rest_apis.go
+++ b/resources/services/apigateway/rest_apis.go
@@ -868,6 +868,9 @@ func fetchApigatewayRestApiModels(ctx context.Context, meta schema.ClientMeta, p
 			options.Region = c.Region
 		})
 		if err != nil {
+			if c.IsNotFoundError(err) {
+				return nil
+			}
 			return diag.WrapError(err)
 		}
 		res <- response.Items
diff --git a/resources/services/elbv2/listeners.go b/resources/services/elbv2/listeners.go
index 3fd52028e..b8369b3e0 100644
--- a/resources/services/elbv2/listeners.go
+++ b/resources/services/elbv2/listeners.go
@@ -359,6 +359,9 @@ func fetchElbv2Listeners(ctx context.Context, meta schema.ClientMeta, parent *sc
 			options.Region = c.Region
 		})
 		if err != nil {
+			if c.IsNotFoundError(err) {
+				return nil
+			}
 			return diag.WrapError(err)
 		}
 		res <- response.Listeners
diff --git a/resources/services/kms/keys.go b/resources/services/kms/keys.go
index bf3018844..7bc190ffe 100644
--- a/resources/services/kms/keys.go
+++ b/resources/services/kms/keys.go
@@ -213,6 +213,9 @@ func fetchKmsKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Re
 				options.Region = c.Region
 			})
 			if err != nil {
+				if c.IsNotFoundError(err) {
+					continue
+				}
 				return diag.WrapError(err)
 			}
 			if d.KeyMetadata != nil {
diff --git a/resources/services/lambda/functions.go b/resources/services/lambda/functions.go
index 3331b18d6..8d2643120 100644
--- a/resources/services/lambda/functions.go
+++ b/resources/services/lambda/functions.go
@@ -1324,6 +1324,9 @@ func fetchLambdaFunctionVersions(ctx context.Context, meta schema.ClientMeta, pa
 	for {
 		output, err := svc.ListVersionsByFunction(ctx, &config)
 		if err != nil {
+			if meta.(*client.Client).IsNotFoundError(err) {
+				return nil
+			}
 			return diag.WrapError(err)
 		}
 		res <- output.Versions
diff --git a/resources/services/rds/cluster_snapshots.go b/resources/services/rds/cluster_snapshots.go
index 675d98b5d..64808df91 100644
--- a/resources/services/rds/cluster_snapshots.go
+++ b/resources/services/rds/cluster_snapshots.go
@@ -205,6 +205,9 @@ func resolveRDSClusterSnapshotAttributes(ctx context.Context, meta schema.Client
 		},
 	)
 	if err != nil {
+		if c.IsNotFoundError(err) {
+			return nil
+		}
 		return diag.WrapError(err)
 	}
 	if out.DBClusterSnapshotAttributesResult == nil {