From 3c1e642c702a75f45fbaa1075e18636d9b41e07f Mon Sep 17 00:00:00 2001
From: Niels van Amstel <niels@newsroomie.com>
Date: Tue, 22 Dec 2020 22:01:40 +0100
Subject: [PATCH] Serverless awsProvider.d.ts fix + addition (#49104)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixed filterPolicty alternative type

* Allow AwsFunction layers property to be defined as key with string so Ref can be used.

* Added optional type to Stream interface

* Update types/serverless/plugins/aws/provider/awsProvider.d.ts

Co-authored-by: Frédéric Barthelet <fredericb@theodo.fr>

* Update types/serverless/plugins/aws/provider/awsProvider.d.ts

Co-authored-by: Frédéric Barthelet <fredericb@theodo.fr>

* Update types/serverless/plugins/aws/provider/awsProvider.d.ts

* Update awsProvider.d.ts

Added missing semicolon

* awsProvider.d.ts
Formatted document
Used Array<> syntax for AwsFunction.layers

* Fixed SNS filterPolicy test

Co-authored-by: Frédéric Barthelet <fredericb@theodo.fr>
---
 types/serverless/plugins/aws/provider/awsProvider.d.ts | 5 +++--
 types/serverless/serverless-tests.ts                   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/serverless/plugins/aws/provider/awsProvider.d.ts b/types/serverless/plugins/aws/provider/awsProvider.d.ts
index 41b74ce569c176..1d4b16c66463fe 100644
--- a/types/serverless/plugins/aws/provider/awsProvider.d.ts
+++ b/types/serverless/plugins/aws/provider/awsProvider.d.ts
@@ -372,7 +372,7 @@ declare namespace Aws {
         arn?: string;
         topicName?: string;
         displayName?: string;
-        filterPolicy?: string[] | { [key: string]: string };
+        filterPolicy?: Record<string, unknown>;
         redrivePolicy?: RedrivePolicy;
     }
 
@@ -388,6 +388,7 @@ declare namespace Aws {
         batchSize?: number | string;
         startingPosition?: number | string;
         enabled?: boolean;
+        type?: 'dynamodb' | 'kinesis';
     }
 
     interface Msk {
@@ -526,7 +527,7 @@ declare namespace Aws {
         tags?: Tags;
         vpc?: Vpc;
         package?: Package;
-        layers?: string[];
+        layers?: Array<string | Record<string, string>>;
         tracing?: string;
         condition?: string;
         dependsOn?: string[];
diff --git a/types/serverless/serverless-tests.ts b/types/serverless/serverless-tests.ts
index b3a5040aa0c541..35d21d3bbc23fa 100644
--- a/types/serverless/serverless-tests.ts
+++ b/types/serverless/serverless-tests.ts
@@ -467,7 +467,7 @@ const awsServerless: Aws.Serverless = {
                         arn: 'testarn',
                         topicName: 'testtopicName',
                         displayName: 'testdisplayName',
-                        filterPolicy: ['testfilterpolicy'],
+                        filterPolicy: { testFilterPolicy: 'testfilterpolicy' },
                         redrivePolicy: {
                             deadLetterTargetArn: 'testdeadLetterTargetArn',
                             deadLetterTargetRef: 'testdeadLetterTargetRef',