Merge pull request #3723 from aws/release-v1.95.0

vicheey · web-flow · commit a7da20c09ef0 · 2025-02-20T14:30:52.000-08:00
Release 1.95.0 (to main)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,4 +10,5 @@ updates:
       include: scope
     reviewers:
       - aws/sae-enterprise
+      - aws/aws-lambda-tooling
     open-pull-requests-limit: 10
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,3 +1,4 @@
  # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
 * @aws/sae-enterprise
+* @aws/aws-lambda-tooling
diff --git a/integration/resources/templates/combination/function_with_alias_all_properties_and_layer_version.yaml b/integration/resources/templates/combination/function_with_alias_all_properties_and_layer_version.yaml
@@ -4,7 +4,7 @@ Resources:
     Properties:
       CodeUri: ${codeuri}
       Handler: index.handler
-      Runtime: nodejs20.x
+      Runtime: nodejs18.x
       AutoPublishAlias: Live
       AutoPublishAliasAllProperties: true
       Layers:
diff --git a/samtranslator/__init__.py b/samtranslator/__init__.py
@@ -1 +1 @@
-__version__ = "1.94.0"
+__version__ = "1.95.0"
diff --git a/samtranslator/compat.py b/samtranslator/compat.py
@@ -1,8 +1,15 @@
 try:
     from pydantic import v1 as pydantic
+
+    # Starting Pydantic v1.10.17, pydantic import v1 will success,
+    # adding the following line to make Pydantic v1 should fall back to v1 import correctly.
+    pydantic.error_wrappers.ValidationError  # noqa
 except ImportError:
     # Unfortunately mypy cannot handle this try/expect pattern, and "type: ignore"
     # is the simplest work-around. See: https://github.com/python/mypy/issues/1153
     import pydantic  # type: ignore
+except AttributeError:
+    # Pydantic v1.10.17+
+    import pydantic  # type: ignore
 
 __all__ = ["pydantic"]
diff --git a/samtranslator/internal/schema_source/aws_serverless_api.py b/samtranslator/internal/schema_source/aws_serverless_api.py
@@ -77,7 +77,6 @@ class LambdaRequestAuthorizerIdentity(BaseModel):
 
 
 class LambdaTokenAuthorizer(BaseModel):
-    AuthorizationScopes: Optional[List[str]] = lambdatokenauthorizer("AuthorizationScopes")
     FunctionArn: SamIntrinsicable[str] = lambdatokenauthorizer("FunctionArn")
     FunctionInvokeRole: Optional[str] = lambdatokenauthorizer("FunctionInvokeRole")
     FunctionPayloadType: Optional[Literal["TOKEN"]] = lambdatokenauthorizer("FunctionPayloadType")
@@ -86,7 +85,6 @@ class LambdaTokenAuthorizer(BaseModel):
 
 
 class LambdaRequestAuthorizer(BaseModel):
-    AuthorizationScopes: Optional[List[str]] = lambdarequestauthorizer("AuthorizationScopes")
     FunctionArn: SamIntrinsicable[str] = lambdarequestauthorizer("FunctionArn")
     FunctionInvokeRole: Optional[str] = lambdarequestauthorizer("FunctionInvokeRole")
     FunctionPayloadType: Optional[Literal["REQUEST"]] = lambdarequestauthorizer("FunctionPayloadType")
diff --git a/samtranslator/internal/schema_source/sam-docs.json b/samtranslator/internal/schema_source/sam-docs.json
diff --git a/samtranslator/schema/schema.json b/samtranslator/schema/schema.json
diff --git a/schema_source/cloudformation-docs.json b/schema_source/cloudformation-docs.json
diff --git a/schema_source/cloudformation.schema.json b/schema_source/cloudformation.schema.json
diff --git a/schema_source/sam.schema.json b/schema_source/sam.schema.json
diff --git a/tests/translator/input/basic_application.yaml b/tests/translator/input/basic_application.yaml
@@ -1,8 +1,8 @@
 Conditions:
   TestCondition:
     Fn::Equals:
-    - true
-    - false
+    - !Ref AWS::AccountId
+    - myAccountId
 Resources:
   BasicApplication:
     Type: AWS::Serverless::Application
diff --git a/tests/translator/input/definition_body_intrinsics_support.yaml b/tests/translator/input/definition_body_intrinsics_support.yaml
@@ -13,8 +13,8 @@ Description: >
 Conditions:
   FalseCondition:
     Fn::Equals:
-    - true
-    - false
+    - !Ref AWS::AccountId
+    - myAccountId
 
 Resources:
   # Rest Api with DefinitionBody under If intrinsic, SwaggerEditor not used
diff --git a/tests/translator/input/function_with_deployment_preference_alarms_intrinsic_if.yaml b/tests/translator/input/function_with_deployment_preference_alarms_intrinsic_if.yaml
@@ -1,8 +1,8 @@
 Conditions:
   MyCondition:
     Fn::Equals:
-    - true
-    - false
+    - !Ref AWS::AccountId
+    - myAccountId
 Resources:
   MinimalFunction:
     Type: AWS::Serverless::Function
diff --git a/tests/translator/input/s3_with_condition.yaml b/tests/translator/input/s3_with_condition.yaml
@@ -1,8 +1,8 @@
 Conditions:
   MyCondition:
     Fn::Equals:
-    - true
-    - false
+    - !Ref AWS::AccountId
+    - myAccountId
 Resources:
   ThumbnailFunction:
     Type: AWS::Serverless::Function
diff --git a/tests/translator/input/sns_intrinsics.yaml b/tests/translator/input/sns_intrinsics.yaml
@@ -6,8 +6,8 @@ Parameters:
 Conditions:
   MyCondition:
     Fn::Equals:
-    - true
-    - false
+    - !Ref AWS::AccountId
+    - myAccountId
 
 Resources:
   SaveNotificationFunction:
diff --git a/tests/translator/output/aws-cn/basic_application.json b/tests/translator/output/aws-cn/basic_application.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "TestCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-cn/definition_body_intrinsics_support.json b/tests/translator/output/aws-cn/definition_body_intrinsics_support.json
@@ -3,8 +3,10 @@
   "Conditions": {
     "FalseCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-cn/function_with_deployment_preference_alarms_intrinsic_if.json b/tests/translator/output/aws-cn/function_with_deployment_preference_alarms_intrinsic_if.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-cn/s3_with_condition.json b/tests/translator/output/aws-cn/s3_with_condition.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-cn/sns_intrinsics.json b/tests/translator/output/aws-cn/sns_intrinsics.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-us-gov/basic_application.json b/tests/translator/output/aws-us-gov/basic_application.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "TestCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-us-gov/definition_body_intrinsics_support.json b/tests/translator/output/aws-us-gov/definition_body_intrinsics_support.json
@@ -3,8 +3,10 @@
   "Conditions": {
     "FalseCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-us-gov/function_with_deployment_preference_alarms_intrinsic_if.json b/tests/translator/output/aws-us-gov/function_with_deployment_preference_alarms_intrinsic_if.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-us-gov/s3_with_condition.json b/tests/translator/output/aws-us-gov/s3_with_condition.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/aws-us-gov/sns_intrinsics.json b/tests/translator/output/aws-us-gov/sns_intrinsics.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/basic_application.json b/tests/translator/output/basic_application.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "TestCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/definition_body_intrinsics_support.json b/tests/translator/output/definition_body_intrinsics_support.json
@@ -3,8 +3,10 @@
   "Conditions": {
     "FalseCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/function_with_deployment_preference_alarms_intrinsic_if.json b/tests/translator/output/function_with_deployment_preference_alarms_intrinsic_if.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/s3_with_condition.json b/tests/translator/output/s3_with_condition.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },
diff --git a/tests/translator/output/sns_intrinsics.json b/tests/translator/output/sns_intrinsics.json
@@ -2,8 +2,10 @@
   "Conditions": {
     "MyCondition": {
       "Fn::Equals": [
-        true,
-        false
+        {
+          "Ref": "AWS::AccountId"
+        },
+        "myAccountId"
       ]
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners`
`2`	`2`
`3`	`3`	`* @aws/sae-enterprise`
	`4`	`+* @aws/aws-lambda-tooling`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "1.94.0"`
	`1`	`+__version__ = "1.95.0"`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`	`"Conditions": {`
`3`	`3`	`"TestCondition": {`
`4`	`4`	`"Fn::Equals": [`
`5`		`- true,`
`6`		`- false`
	`5`	`+ {`
	`6`	`+ "Ref": "AWS::AccountId"`
	`7`	`+ },`
	`8`	`+ "myAccountId"`
`7`	`9`	`]`
`8`	`10`	`}`
`9`	`11`	`},`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,10 @@`
`3`	`3`	`"Conditions": {`
`4`	`4`	`"FalseCondition": {`
`5`	`5`	`"Fn::Equals": [`
`6`		`- true,`
`7`		`- false`
	`6`	`+ {`
	`7`	`+ "Ref": "AWS::AccountId"`
	`8`	`+ },`
	`9`	`+ "myAccountId"`
`8`	`10`	`]`
`9`	`11`	`}`
`10`	`12`	`},`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`	`"Conditions": {`
`3`	`3`	`"MyCondition": {`
`4`	`4`	`"Fn::Equals": [`
`5`		`- true,`
`6`		`- false`
	`5`	`+ {`
	`6`	`+ "Ref": "AWS::AccountId"`
	`7`	`+ },`
	`8`	`+ "myAccountId"`
`7`	`9`	`]`
`8`	`10`	`}`
`9`	`11`	`},`