chore: bump SamTranslator version (#4672)

* chore: Bump SamTranslator version to 1.59.0 * remove old runtimes --------- Co-authored-by: Jacob Fuss <[email protected]> Co-authored-by: Mehmet Nuri Deveci <[email protected]>
aws · Feb 8, 2023 · 6caefc9 · 6caefc9
1 parent 4de254c
commit 6caefc9
Show file tree

Hide file tree

Showing 14 changed files with 664 additions and 5 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -9,7 +9,7 @@ jmespath~=0.10.0
 ruamel_yaml==0.17.21
 PyYAML>=5.4.1,==5.*
 cookiecutter~=2.1.1
-aws-sam-translator==1.58.1
+aws-sam-translator==1.59.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=4.2.0
 dateparser~=1.0

diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
@@ -19,10 +19,9 @@ aws-lambda-builders==1.26.0 \
     --hash=sha256:511a3be80511b3cedbc223504fef9366063c45f8fff94d2acb270de92e9efb02 \
     --hash=sha256:d316837180d3ed5a04a40584e25c318fb97a7d0ab987c0f21bd07e421fd4d1d8
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.58.1 \
-    --hash=sha256:c4e261e450d574572d389edcafab04d1fe337615f867610410390c2435cb1f26 \
-    --hash=sha256:ca47d6eb04d8cf358bea9160411193da40a80dc3e79bb0c5bace0c21f0e4c888 \
-    --hash=sha256:cd60a19085d432bc00769b597bc2e6854f546ff9928f8067fc5fbcb5a1ed74ff
+aws-sam-translator==1.59.0 \
+    --hash=sha256:6761293a21bd1cb0e19f168926ebfc4a3a6c9011aca67bd448ef485a55d6f658 \
+    --hash=sha256:9b8f23a5754cba92677d334ece5c5d9dc9b1f1a327a650fc8939ae3fc6da4141
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint

diff --git a/tests/functional/commands/validate/lib/models/connector_hardcoded_props.yaml b/tests/functional/commands/validate/lib/models/connector_hardcoded_props.yaml
@@ -75,6 +75,28 @@ Resources:
       Permissions:
       - Write
 
+  ApiV1ToLambdaWithId:
+    Type: AWS::Serverless::Connector
+    Properties:
+      Source:
+        Id: MyApiV1
+        Qualifier: Prod/GET/foobar
+      Destination:
+        Id: MyFunction
+      Permissions:
+      - Write
+
+  ApiV2ToLambdaWithId:
+    Type: AWS::Serverless::Connector
+    Properties:
+      Source:
+        Id: MyApiV2
+        Qualifier: '*'
+      Destination:
+        Id: MyFunction
+      Permissions:
+      - Write
+
   SfnToSfn:
     Type: AWS::Serverless::Connector
     Properties:

diff --git a/tests/functional/commands/validate/lib/models/embedded_connectors_api_to_function.yaml b/tests/functional/commands/validate/lib/models/embedded_connectors_api_to_function.yaml
@@ -0,0 +1,83 @@
+Resources:
+  MyHttpApi:
+    Type: AWS::Serverless::HttpApi
+    Connectors:
+      MyConnectorServerlessHttpApiToLambda:
+        Properties:
+          Destination:
+            Id: MyFunction
+          Permissions:
+          - Write
+      MyConnectorApigwToLambda:
+        Properties:
+          Destination:
+            Id: MyServerlessFunction
+          Permissions:
+          - Write
+    Properties:
+      StageName: Prod
+
+  MyApiGateway:
+    Type: AWS::ApiGateway::RestApi
+    Properties:
+      Description: A test API
+      Name: MyRestAPI
+
+  MyApiGatewayRootMethod:
+    Type: AWS::ApiGateway::Method
+    Properties:
+      AuthorizationType: NONE
+      HttpMethod: POST
+      Integration:
+        Type: MOCK
+      ResourceId: !GetAtt MyApiGateway.RootResourceId
+      RestApiId: !Ref MyApiGateway
+
+  MyApiGatewayV2:
+    Type: AWS::ApiGatewayV2::Api
+    Connectors:
+      MyConnectorApiV2ToLambda:
+        Properties:
+          Destination:
+            Id: MyServerlessFunction
+          Permissions:
+          - Write
+    Properties:
+      Name: MyApi
+      ProtocolType: WEBSOCKET
+
+  MyServerlessFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs14.x
+      Handler: index.handler
+      InlineCode: |
+        const AWS = require('aws-sdk');
+        exports.handler = async (event) => {
+          console.log(JSON.stringify(event));
+        };
+
+  MyRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Statement:
+        - Effect: Allow
+          Action: sts:AssumeRole
+          Principal:
+            Service: lambda.amazonaws.com
+      ManagedPolicyArns:
+      - !Sub arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
+
+  MyFunction:
+    Type: AWS::Lambda::Function
+    Properties:
+      Role: !GetAtt MyRole.Arn
+      Runtime: nodejs14.x
+      Handler: index.handler
+      Code:
+        ZipFile: |-
+          const AWS = require('aws-sdk');
+          exports.handler = async (event) => {
+            console.log(JSON.stringify(event));
+          };
diff --git a/tests/functional/commands/validate/lib/models/embedded_connectors_depends_on_connector.yaml b/tests/functional/commands/validate/lib/models/embedded_connectors_depends_on_connector.yaml
@@ -0,0 +1,28 @@
+Resources:
+  MyFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs16.x
+      Handler: index.handler
+      InlineCode: |
+        exports.handler = async (event) => {
+          console.log(event);
+        };
+
+  MyQueue:
+    Type: AWS::SQS::Queue
+    Connectors:
+      MyConnector:
+        Properties:
+          Destination:
+            Id: MyFunction
+          Permissions:
+          - Read
+          - Write
+
+  MyEventSourceMapping:
+    DependsOn: MyQueueMyConnector
+    Type: AWS::Lambda::EventSourceMapping
+    Properties:
+      FunctionName: !Ref MyFunction
+      EventSourceArn: !GetAtt MyQueue.Arn
diff --git a/tests/functional/commands/validate/lib/models/embedded_connectors_esm_depends_on.yaml b/tests/functional/commands/validate/lib/models/embedded_connectors_esm_depends_on.yaml
@@ -0,0 +1,28 @@
+Resources:
+  MyFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs16.x
+      Handler: index.handler
+      InlineCode: |
+        exports.handler = async (event) => {
+          console.log(event);
+        };
+
+  MyQueue:
+    Type: AWS::SQS::Queue
+    Connectors:
+      MyConnector:
+        Properties:
+          Destination:
+            Id: MyFunction
+          Permissions:
+          - Read
+          - Write
+
+  MyEventSourceMapping:
+    DependsOn: MyQueueMyConnectorPolicy
+    Type: AWS::Lambda::EventSourceMapping
+    Properties:
+      FunctionName: !Ref MyFunction
+      EventSourceArn: !GetAtt MyQueue.Arn
diff --git a/tests/functional/commands/validate/lib/models/embedded_connectors_function_to.yaml b/tests/functional/commands/validate/lib/models/embedded_connectors_function_to.yaml
@@ -0,0 +1,124 @@
+Resources:
+  MyServerlessFunction:
+    Type: AWS::Serverless::Function
+    Connectors:
+      BucketConnector:
+        Properties:
+          Destination:
+            Id: MyBucket
+          Permissions:
+          - Read
+          - Write
+      SQSConnector:
+        Properties:
+          Destination:
+            Id: MyQueue
+          Permissions:
+          - Read
+          - Write
+      TableConnector:
+        Properties:
+          Destination:
+            Id: MyTable
+          Permissions:
+          - Read
+          - Write
+      TableConnectorWithTableArn:
+        Properties:
+          Destination:
+            Type: AWS::DynamoDB::Table
+            Arn: !GetAtt MyTable.Arn
+          Permissions:
+          - Read
+          - Write
+      SNSConnector:
+        Properties:
+          Destination:
+            Id: MySNSTopic
+          Permissions:
+          - Write
+      SFNConnector:
+        Properties:
+          Destination:
+            Id: MyStateMachine
+          Permissions:
+          - Read
+          - Write
+    Properties:
+      Runtime: nodejs14.x
+      Handler: index.handler
+      InlineCode: |
+        const AWS = require('aws-sdk');
+        exports.handler = async (event) => {
+          console.log(JSON.stringify(event));
+        };
+
+  MyLambdaFunction:
+    Type: AWS::Lambda::Function
+    Connectors:
+      LambdaSQSConnector:
+        Properties:
+          Destination:
+            Id: MyQueue
+          Permissions:
+          - Read
+      LambdaTableConnector:
+        Properties:
+          Destination:
+            Id: MyTable
+          Permissions:
+          - Read
+          - Write
+      LambdaTableConnectorWithTableArn:
+        Properties:
+          Destination:
+            Type: AWS::DynamoDB::Table
+            Arn: !GetAtt MyTable.Arn
+          Permissions:
+          - Read
+          - Write
+    Properties:
+      Role: !GetAtt MyRole.Arn
+      Runtime: nodejs14.x
+      Handler: index.handler
+      Code:
+        ZipFile: |
+          const AWS = require('aws-sdk');
+          exports.handler = async (event) => {
+            console.log(JSON.stringify(event));
+          };
+      Environment:
+        Variables:
+          TABLE_NAME: !Ref MyTable
+
+  MyRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Statement:
+        - Effect: Allow
+          Action: sts:AssumeRole
+          Principal:
+            Service: lambda.amazonaws.com
+
+  MyBucket:
+    Type: AWS::S3::Bucket
+  MyQueue:
+    Type: AWS::SQS::Queue
+  MySNSTopic:
+    Type: AWS::SNS::Topic
+  MyStateMachine:
+    Type: AWS::Serverless::StateMachine
+    Properties:
+      Definition:
+        StartAt: MyLambdaState
+  MyTable:
+    Type: AWS::DynamoDB::Table
+    Properties:
+      BillingMode: PAY_PER_REQUEST
+      AttributeDefinitions:
+      - AttributeName: Id
+        AttributeType: S
+      KeySchema:
+      - AttributeName: Id
+        KeyType: HASH
diff --git a/tests/functional/commands/validate/lib/models/embedded_connectors_hardcoded_props.yaml b/tests/functional/commands/validate/lib/models/embedded_connectors_hardcoded_props.yaml
@@ -0,0 +1,67 @@
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  MyFunction:
+    Type: AWS::Lambda::Function
+
+  MyRule:
+    Type: AWS::Events::Rule
+    Connectors:
+      RuleToTopic:
+        Properties:
+          Destination:
+            Type: AWS::SNS::Topic
+            Arn: !Ref MyTopic
+          Permissions:
+          - Write
+
+  MyQueue:
+    Type: AWS::SQS::Queue
+  MyQueue2:
+    Type: AWS::SQS::Queue
+
+  MyTopic:
+    Type: AWS::SNS::Topic
+    Connectors:
+      TopicToQueue:
+        Properties:
+          Destination:
+            Type: AWS::SQS::Queue
+            Arn: !Ref MyQueue
+            QueueUrl: sqs.us.amazonaws.com/1234567890/test
+          Permissions:
+          - Write
+
+  MyApiV1:
+    Type: AWS::ApiGateway::RestApi
+    Connectors:
+      ApiV1ToLambda:
+        Properties:
+          SourceReference:
+            Qualifier: Prod/GET/foobar
+          Destination:
+            Id: MyFunction
+          Permissions:
+          - Write
+
+  MyApiV2:
+    Type: AWS::ApiGatewayV2::Api
+    Connectors:
+      ApiV2ToLambda:
+        Properties:
+          SourceReference:
+            Qualifier: '*'
+          Destination:
+            Id: MyFunction
+          Permissions:
+          - Write
+
+  MySNSTopic:
+    Type: AWS::SNS::Topic
+    Connectors:
+      TopicToLambdaHardcoded:
+        Properties:
+          Destination:
+            Type: AWS::Lambda::Function
+            Arn: !GetAtt MyFunction.Arn
+          Permissions:
+          - Write