Skip to content

chore: add schema types to Application #2619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2022
Merged

chore: add schema types to Application #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 47 additions & 2 deletions samtranslator/schema/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,12 +843,53 @@
],
"additionalProperties": false
},
"ApplicationLocation": {
"title": "ApplicationLocation",
"type": "object",
"properties": {
"ApplicationId": {
"title": "Applicationid",
"anyOf": [
{
"type": "string"
},
{
"type": "object"
}
]
},
"SemanticVersion": {
"title": "Semanticversion",
"anyOf": [
{
"type": "string"
},
{
"type": "object"
}
]
}
},
"required": [
"ApplicationId",
"SemanticVersion"
],
"additionalProperties": false
},
"ApplicationProperties": {
"title": "ApplicationProperties",
"type": "object",
"properties": {
"Location": {
"title": "Location"
"title": "Location",
"anyOf": [
{
"type": "string"
},
{
"$ref": "#/definitions/ApplicationLocation"
}
]
},
"NotificationARNs": {
"title": "Notificationarns"
Expand All @@ -857,12 +898,16 @@
"title": "Parameters"
},
"Tags": {
"title": "Tags"
"title": "Tags",
"type": "object"
},
"TimeoutInMinutes": {
"title": "Timeoutinminutes"
}
},
"required": [
"Location"
],
"additionalProperties": false
},
"AwsServerlessApplication": {
Expand Down
18 changes: 13 additions & 5 deletions samtranslator/schema/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
# Value passed directly to CloudFormation; not used by SAM
PassThrough = Any

# Intrinsic resolvable by the SAM transform
SamIntrinsic = Dict[str, Any]

# By default strict
# https://pydantic-docs.helpmanual.io/usage/model_config/#change-behaviour-globally
class BaseModel(LenientBaseModel):
Expand Down Expand Up @@ -209,12 +212,17 @@ class AwsServerlessHttpApi(BaseModel):
Condition: Unknown


class ApplicationLocation(BaseModel):
ApplicationId: Union[str, SamIntrinsic]
SemanticVersion: Union[str, SamIntrinsic]


class ApplicationProperties(BaseModel):
Location: Unknown
NotificationARNs: Unknown
Parameters: Unknown
Tags: Unknown
TimeoutInMinutes: Unknown
Location: Union[str, ApplicationLocation]
NotificationARNs: Optional[PassThrough]
Parameters: Optional[PassThrough]
Tags: Optional[Dict[str, Any]]
TimeoutInMinutes: Optional[PassThrough]


class AwsServerlessApplication(BaseModel):
Expand Down