chore(tests): Adding any tests (aws#2053)

* Adding api_request_model any tests * Add any to api_request_model_openapi_3 cases * Add rest of relevant any test cases * Fix hashing to match python2 * add api_with_swagger_authorizer_none to be run * fix py2 hashes in api_with_swagger_authorizer_none tests Co-authored-by: Jacob Fuss <[email protected]>
c2tarun · Jul 7, 2021 · ee26c43 · ee26c43
1 parent 240f820
commit ee26c43
Show file tree

Hide file tree

Showing 117 changed files with 20,383 additions and 13,068 deletions.
diff --git a/tests/translator/input/api_request_model.yaml b/tests/translator/input/api_request_model.yaml
@@ -15,6 +15,15 @@ Resources:
             RequestModel:
               Model: User
               Required: true
+        AnyPath:
+          Type: Api
+          Properties:
+            RestApiId: HtmlApi
+            Path: /any
+            Method: any
+            RequestModel:
+              Model: User
+              Required: true
 
   HtmlApi:
     Type: AWS::Serverless::Api

diff --git a/tests/translator/input/api_request_model_openapi_3.yaml b/tests/translator/input/api_request_model_openapi_3.yaml
@@ -27,6 +27,18 @@ Resources:
             Path: /iam
             Auth:
               Authorizer: AWS_IAM
+        AnyIam:
+          Type: Api
+          Properties:
+            RequestModel:
+              Model: User
+              Required: true
+            RestApiId:
+              Ref: HtmlApi
+            Method: any
+            Path: /any/iam
+            Auth:
+              Authorizer: AWS_IAM
 
 
   HtmlApi:

diff --git a/tests/translator/input/api_with_apikey_required.yaml b/tests/translator/input/api_with_apikey_required.yaml
@@ -19,3 +19,11 @@ Resources:
             Method: get
             Auth:
               ApiKeyRequired: true
+        MyApiWithApiKeyRequiredAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithoutAuth
+            Path: /any/ApiKeyRequiredTrue
+            Method: any
+            Auth:
+              ApiKeyRequired: true
diff --git a/tests/translator/input/api_with_apikey_required_openapi_3.yaml b/tests/translator/input/api_with_apikey_required_openapi_3.yaml
@@ -20,3 +20,11 @@ Resources:
             Method: get
             Auth:
               ApiKeyRequired: true
+        MyApiWithApiKeyRequiredAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithoutAuth
+            Path: /any/ApiKeyRequiredTrue
+            Method: any
+            Auth:
+              ApiKeyRequired: true
diff --git a/tests/translator/input/api_with_auth_all_maximum.yaml b/tests/translator/input/api_with_auth_all_maximum.yaml
@@ -50,7 +50,7 @@ Resources:
               Context:
                 - Authorization4
               ReauthorizeEvery: 0
-  
+
   MyFunction:
     Type: AWS::Serverless::Function
     Properties:
@@ -66,6 +66,14 @@ Resources:
             Method: get
             Auth:
               Authorizer: NONE
+        WithNoAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/noauth
+            Method: any
+            Auth:
+              Authorizer: NONE
         WithCognitoMultipleUserPoolsAuthorizer:
           Type: Api
           Properties:
@@ -74,6 +82,14 @@ Resources:
             Method: post
             Auth:
               Authorizer: MyCognitoAuthMultipleUserPools
+        WithCognitoMultipleUserPoolsAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/cognitomultiple
+            Method: any
+            Auth:
+              Authorizer: MyCognitoAuthMultipleUserPools
         WithLambdaTokenAuthorizer:
           Type: Api
           Properties:
@@ -82,14 +98,30 @@ Resources:
             Method: get
             Auth:
               Authorizer: MyLambdaTokenAuth
-        WithLambdaTokenAuthorizer:
+        WithLambdaTokenAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/lambdatoken
+            Method: any
+            Auth:
+              Authorizer: MyLambdaTokenAuth
+        WithLambdaTokenNoneAuthorizer:
           Type: Api
           Properties:
             RestApiId: !Ref MyApi
             Path: /users
             Method: patch
             Auth:
               Authorizer: MyLambdaTokenAuthNoneFunctionInvokeRole
+        WithLambdaTokenNoneAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/lambdatokennone
+            Method: any
+            Auth:
+              Authorizer: MyLambdaTokenAuthNoneFunctionInvokeRole
         WithLambdaRequestAuthorizer:
           Type: Api
           Properties:
@@ -98,9 +130,23 @@ Resources:
             Method: delete
             Auth:
               Authorizer: MyLambdaRequestAuth
+        WithLambdaRequestAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/lambdarequest
+            Method: any
+            Auth:
+              Authorizer: MyLambdaRequestAuth
         WithDefaultAuthorizer:
           Type: Api
           Properties:
             RestApiId: !Ref MyApi
             Path: /users
-            Method: put
+            Method: put
+        WithDefaultAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/default
+            Method: any
diff --git a/tests/translator/input/api_with_auth_all_maximum_openapi_3.yaml b/tests/translator/input/api_with_auth_all_maximum_openapi_3.yaml
@@ -51,7 +51,7 @@ Resources:
               Context:
                 - Authorization4
               ReauthorizeEvery: 0
-  
+
   MyFunction:
     Type: AWS::Serverless::Function
     Properties:
@@ -67,6 +67,14 @@ Resources:
             Method: get
             Auth:
               Authorizer: NONE
+        WithNoAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/noauth
+            Method: any
+            Auth:
+              Authorizer: NONE
         WithCognitoMultipleUserPoolsAuthorizer:
           Type: Api
           Properties:
@@ -75,6 +83,14 @@ Resources:
             Method: post
             Auth:
               Authorizer: MyCognitoAuthMultipleUserPools
+        WithCognitoMultipleUserPoolsAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/cognitomultiple
+            Method: any
+            Auth:
+              Authorizer: MyCognitoAuthMultipleUserPools
         WithLambdaTokenAuthorizer:
           Type: Api
           Properties:
@@ -83,14 +99,30 @@ Resources:
             Method: get
             Auth:
               Authorizer: MyLambdaTokenAuth
-        WithLambdaTokenAuthorizer:
+        WithLambdaTokenAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/lambdatoken
+            Method: any
+            Auth:
+              Authorizer: MyLambdaTokenAuth
+        WithLambdaTokenNoneAuthorizer:
           Type: Api
           Properties:
             RestApiId: !Ref MyApi
             Path: /users
             Method: patch
             Auth:
               Authorizer: MyLambdaTokenAuthNoneFunctionInvokeRole
+        WithLambdaTokenNoneAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/lambdatokennone
+            Method: any
+            Auth:
+              Authorizer: MyLambdaTokenAuthNoneFunctionInvokeRole
         WithLambdaRequestAuthorizer:
           Type: Api
           Properties:
@@ -99,9 +131,23 @@ Resources:
             Method: delete
             Auth:
               Authorizer: MyLambdaRequestAuth
+        WithLambdaRequestAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/lambdarequest
+            Method: any
+            Auth:
+              Authorizer: MyLambdaRequestAuth
         WithDefaultAuthorizer:
           Type: Api
           Properties:
             RestApiId: !Ref MyApi
             Path: /users
-            Method: put
+            Method: put
+        WithDefaultAuthorizerAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApi
+            Path: /any/default
+            Method: any
diff --git a/tests/translator/input/api_with_auth_all_minimum.yaml b/tests/translator/input/api_with_auth_all_minimum.yaml
@@ -51,18 +51,36 @@ Resources:
             RestApiId: !Ref MyApiWithCognitoAuth
             Method: get
             Path: /cognito
+        CognitoAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithCognitoAuth
+            Method: any
+            Path: /any/cognito
         LambdaToken:
           Type: Api
           Properties:
             RestApiId: !Ref MyApiWithLambdaTokenAuth
             Method: get
             Path: /lambda-token
+        LambdaTokenAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithLambdaTokenAuth
+            Method: any
+            Path: /any/lambda-token
         LambdaRequest:
           Type: Api
           Properties:
             RestApiId: !Ref MyApiWithLambdaRequestAuth
             Method: get
             Path: /lambda-request
+        LambdaRequestAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithLambdaRequestAuth
+            Method: any
+            Path: /any/lambda-request
   MyUserPool:
     Type: AWS::Cognito::UserPool
     Properties:

diff --git a/tests/translator/input/api_with_auth_all_minimum_openapi.yaml b/tests/translator/input/api_with_auth_all_minimum_openapi.yaml
@@ -54,18 +54,36 @@ Resources:
             RestApiId: !Ref MyApiWithCognitoAuth
             Method: get
             Path: /cognito
+        CognitoAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithCognitoAuth
+            Method: any
+            Path: /any/cognito
         LambdaToken:
           Type: Api
           Properties:
             RestApiId: !Ref MyApiWithLambdaTokenAuth
             Method: get
             Path: /lambda-token
+        LambdaTokenAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithLambdaTokenAuth
+            Method: any
+            Path: /any/lambda-token
         LambdaRequest:
           Type: Api
           Properties:
             RestApiId: !Ref MyApiWithLambdaRequestAuth
             Method: get
             Path: /lambda-request
+        LambdaRequestAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithLambdaRequestAuth
+            Method: any
+            Path: /any/lambda-request
   MyUserPool:
     Type: AWS::Cognito::UserPool
     Properties:

diff --git a/tests/translator/input/api_with_auth_no_default.yaml b/tests/translator/input/api_with_auth_no_default.yaml
@@ -48,18 +48,36 @@ Resources:
             RestApiId: !Ref MyApiWithCognitoAuth
             Method: get
             Path: /cognito
+        CognitoAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithCognitoAuth
+            Method: any
+            Path: /any/cognito
         LambdaToken:
           Type: Api
           Properties:
             RestApiId: !Ref MyApiWithLambdaTokenAuth
             Method: get
             Path: /lambda-token
+        LambdaTokenAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithLambdaTokenAuth
+            Method: any
+            Path: /any/lambda-token
         LambdaRequest:
           Type: Api
           Properties:
             RestApiId: !Ref MyApiWithLambdaRequestAuth
             Method: get
             Path: /lambda-request
+        LambdaRequestAnyMethod:
+          Type: Api
+          Properties:
+            RestApiId: !Ref MyApiWithLambdaRequestAuth
+            Method: any
+            Path: /any/lambda-request
   MyUserPool:
     Type: AWS::Cognito::UserPool
     Properties:

diff --git a/tests/translator/input/api_with_aws_account_blacklist.yaml b/tests/translator/input/api_with_aws_account_blacklist.yaml
@@ -23,3 +23,9 @@ Resources:
           Properties:
             Method: Put
             Path: /get
+        Any:
+          Type: Api
+          Properties:
+            Method: any
+            Path: /any
+
diff --git a/tests/translator/input/api_with_aws_account_whitelist.yaml b/tests/translator/input/api_with_aws_account_whitelist.yaml
@@ -26,3 +26,16 @@ Resources:
                 ]
             Method: Put
             Path: /get
+        Any:
+          Type: Api
+          Properties:
+            Auth:
+              ResourcePolicy:
+                AwsAccountWhitelist: [
+                  "12345"
+                ]
+                AwsAccountBlacklist: [
+                  "67890"
+                ]
+            Method: any
+            Path: /any