Skip to content
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

Add schema types to global section #2641

Merged
merged 4 commits into from
Nov 22, 2022
Merged

Add schema types to global section #2641

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76bec7d
Add schema types to global section
GavinZZ Nov 22, 2022
a562465
Format file
GavinZZ Nov 22, 2022
8dfb5c6
Unify types
GavinZZ Nov 22, 2022
0481165
Format file
GavinZZ Nov 22, 2022
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
3 changes: 3 additions & 0 deletions bin/validate_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ def get_templates() -> Iterator[Path]:
"api_with_authorizers_max_openapi", # 'UserPoolArn' expects to be a string, but received list
"api_with_authorizers_max", # 'UserPoolArn' expects to be a string, but received list
"api_with_any_method_in_swagger", # Missing required field 'FunctionArn'
"api_with_cors_and_only_headers", # 'AllowOrigins' is required field
"api_with_cors_and_only_methods", # 'AllowOrigins' is required field
"implicit_api_with_auth_and_conditions_max", # 'UserPoolArn' expects to be a string, but received list
]

def should_skip(s: str) -> bool:
Expand Down
40 changes: 20 additions & 20 deletions samtranslator/schema/aws_serverless_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from typing_extensions import Literal

from samtranslator.schema.common import PassThrough, BaseModel, SamIntrinsic, Unknown
from samtranslator.schema.common import PassThrough, BaseModel, SamIntrinsic


class ResourcePolicy(BaseModel):
Expand Down Expand Up @@ -64,7 +64,7 @@ class LambdaRequestAuthorizer(BaseModel):


class UsagePlan(BaseModel):
CreateUsagePlan: Literal["PER_API", "SHARED", "NONE"]
CreateUsagePlan: Union[Literal["PER_API", "SHARED", "NONE"], SamIntrinsic]
Description: Optional[PassThrough]
Quota: Optional[PassThrough]
Tags: Optional[PassThrough]
Expand Down Expand Up @@ -126,7 +126,7 @@ class Properties(BaseModel):
CacheClusterEnabled: Optional[PassThrough]
CacheClusterSize: Optional[PassThrough]
CanarySetting: Optional[PassThrough]
Cors: Optional[Union[str, Cors]]
Cors: Optional[Union[str, SamIntrinsic, Cors]]
DefinitionBody: Optional[PassThrough]
DefinitionUri: Optional[PassThrough]
Description: Optional[PassThrough]
Expand All @@ -148,23 +148,23 @@ class Properties(BaseModel):


class Globals(BaseModel):
Auth: Unknown
Name: Unknown
DefinitionUri: Unknown
CacheClusterEnabled: Unknown
CacheClusterSize: Unknown
Variables: Unknown
EndpointConfiguration: Unknown
MethodSettings: Unknown
BinaryMediaTypes: Unknown
MinimumCompressionSize: Unknown
Cors: Unknown
GatewayResponses: Unknown
AccessLogSetting: Unknown
CanarySetting: Unknown
TracingEnabled: Unknown
OpenApiVersion: Unknown
Domain: Unknown
Auth: Optional[Auth]
Name: Optional[PassThrough]
DefinitionUri: Optional[PassThrough]
CacheClusterEnabled: Optional[PassThrough]
CacheClusterSize: Optional[PassThrough]
Variables: Optional[PassThrough]
EndpointConfiguration: Optional[PassThrough]
MethodSettings: Optional[PassThrough]
BinaryMediaTypes: Optional[PassThrough]
MinimumCompressionSize: Optional[PassThrough]
Cors: Optional[Union[str, SamIntrinsic, Cors]]
GatewayResponses: Optional[PassThrough]
AccessLogSetting: Optional[PassThrough]
CanarySetting: Optional[PassThrough]
TracingEnabled: Optional[PassThrough]
OpenApiVersion: Optional[Union[float, str]] # TODO: float doesn't exist in documentation
GavinZZ marked this conversation as resolved.
Show resolved Hide resolved
Domain: Optional[Domain]


class Resource(BaseModel):
Expand Down
46 changes: 23 additions & 23 deletions samtranslator/schema/aws_serverless_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from typing_extensions import Literal

from samtranslator.schema.common import PassThrough, BaseModel, SamIntrinsic, Unknown
from samtranslator.schema.common import PassThrough, BaseModel, SamIntrinsic


class ResourcePolicy(BaseModel):
Expand Down Expand Up @@ -421,28 +421,28 @@ class Properties(BaseModel):


class Globals(BaseModel):
Handler: Unknown
Runtime: Unknown
CodeUri: Unknown
DeadLetterQueue: Unknown
Description: Unknown
MemorySize: Unknown
Timeout: Unknown
VpcConfig: Unknown
Environment: Unknown
Tags: Unknown
Tracing: Unknown
KmsKeyArn: Unknown
Layers: Unknown
AutoPublishAlias: Unknown
DeploymentPreference: Unknown
PermissionsBoundary: Unknown
ReservedConcurrentExecutions: Unknown
ProvisionedConcurrencyConfig: Unknown
AssumeRolePolicyDocument: Unknown
EventInvokeConfig: Unknown
Architectures: Unknown
EphemeralStorage: Unknown
Handler: Optional[PassThrough]
Runtime: Optional[PassThrough]
CodeUri: Optional[Union[str, CodeUri]]
DeadLetterQueue: Optional[Union[SamIntrinsic, DeadLetterQueue]]
Description: Optional[PassThrough]
MemorySize: Optional[PassThrough]
Timeout: Optional[PassThrough]
VpcConfig: Optional[PassThrough]
Environment: Optional[PassThrough]
Tags: Optional[Dict[str, Any]]
Tracing: Optional[Union[str, SamIntrinsic]]
KmsKeyArn: Optional[PassThrough]
Layers: Optional[PassThrough]
AutoPublishAlias: Optional[Union[str, SamIntrinsic]]
DeploymentPreference: Optional[DeploymentPreference]
PermissionsBoundary: Optional[PassThrough]
ReservedConcurrentExecutions: Optional[PassThrough]
ProvisionedConcurrencyConfig: Optional[PassThrough]
AssumeRolePolicyDocument: Optional[Dict[str, Any]]
EventInvokeConfig: Optional[EventInvokeConfig]
Architectures: Optional[PassThrough]
EphemeralStorage: Optional[PassThrough]


class Resource(BaseModel):
Expand Down
20 changes: 10 additions & 10 deletions samtranslator/schema/aws_serverless_httpapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from typing_extensions import Literal

from samtranslator.schema.common import PassThrough, BaseModel, SamIntrinsic, Unknown
from samtranslator.schema.common import PassThrough, BaseModel, SamIntrinsic


class OAuth2Authorizer(BaseModel):
Expand Down Expand Up @@ -97,15 +97,15 @@ class Properties(BaseModel):


class Globals(BaseModel):
Auth: Unknown
AccessLogSettings: Unknown
StageVariables: Unknown
Tags: Unknown
RouteSettings: Unknown
FailOnWarnings: Unknown
Domain: Unknown
CorsConfiguration: Unknown
DefaultRouteSettings: Unknown
Auth: Optional[Auth]
AccessLogSettings: Optional[PassThrough]
StageVariables: Optional[PassThrough]
Tags: Optional[Dict[str, Any]]
RouteSettings: Optional[PassThrough]
FailOnWarnings: Optional[PassThrough]
Domain: Optional[Domain]
CorsConfiguration: Optional[PassThrough]
DefaultRouteSettings: Optional[PassThrough]


class Resource(BaseModel):
Expand Down
4 changes: 2 additions & 2 deletions samtranslator/schema/aws_serverless_simpletable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from typing_extensions import Literal

from samtranslator.schema.common import PassThrough, BaseModel, Unknown
from samtranslator.schema.common import PassThrough, BaseModel


class PrimaryKey(BaseModel):
Expand All @@ -19,7 +19,7 @@ class Properties(BaseModel):


class Globals(BaseModel):
SSESpecification: Unknown
SSESpecification: Optional[PassThrough]


class Resource(BaseModel):
Expand Down
Loading