Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions .cfnlintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,3 @@ ignore_checks:
- W2001 # Parameter not used
- E3006 # Resource type check; we have some Foo Bar resources
- W3037 # Ignore cfn-lint check for non existing IAM permissions
- E1041 # Ref/GetAtt format mismatch; test fixtures use refs that resolve correctly at deploy time
- E1156 # Invalid IAM Role ARN format; test fixtures use placeholder values
- E1157 # Invalid KMS Key ARN format; test fixtures use placeholder values
- E1159 # Invalid ACM Certificate ARN format; test fixtures use placeholder values
- W1031 # Fn::Sub resolved value format mismatch; test fixtures use simplified ARN patterns
4 changes: 2 additions & 2 deletions tests/translator/input/api_with_basic_custom_domain.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Parameters:

MyDomainCert:
Type: String
Default: another-api-arn
Default: arn:aws:acm:us-east-1:123456789012:certificate/another-api-cert

Globals:
Api:
Expand Down Expand Up @@ -59,7 +59,7 @@ Resources:
StageName: Prod
Domain:
DomainName: api-example.com
CertificateArn: my-api-cert-arn
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/my-api-cert
EndpointConfiguration: EDGE
BasePath: [/get, /fetch]
MutualTlsAuthentication:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Conditions:
Parameters:
MyDomainCert:
Type: String
Default: another-api-arn
Default: arn:aws:acm:us-east-1:123456789012:certificate/another-api-cert

EndpointConf:
Type: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Conditions:
Parameters:
MyDomainCert:
Type: String
Default: another-api-arn
Default: arn:aws:acm:us-east-1:123456789012:certificate/another-api-cert

EndpointConf:
Type: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Parameters:
Default: example.com
ACMCertificateArn:
Type: String
Default: cert-arn-in-us-east-1
Default: arn:aws:acm:us-east-1:123456789012:certificate/abc123
Resources:
MyFunction:
Type: AWS::Serverless::Function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Parameters:
Default: example.com
ACMCertificateArn:
Type: String
Default: cert-arn-in-us-east-1
Default: arn:aws:acm:us-east-1:123456789012:certificate/abc123
Resources:
MyFunction:
Type: AWS::Serverless::Function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Parameters:
Default: example.com
ACMCertificateArn:
Type: String
Default: cert-arn-in-us-east-1
Default: arn:aws:acm:us-east-1:123456789012:certificate/abc123
Globals:
HttpApi:
Domain:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Parameters:
Default: example.com
ACMCertificateArn:
Type: String
Default: cert-arn-in-us-east-1
Default: arn:aws:acm:us-east-1:123456789012:certificate/abc123
Resources:
MyFunction:
Type: AWS::Serverless::Function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.one.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand All @@ -38,7 +38,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.two.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand All @@ -58,7 +58,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.three.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.one.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: !Ref MyHostedZoneId
Expand All @@ -42,7 +42,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.two.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: !Sub "{{MyHostedZoneId}}"
Expand All @@ -62,7 +62,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.three.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: !Ref MyHostedZoneId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Parameters:

CertificateArn:
Type: String
Default: another-api-arn
Default: arn:aws:acm:us-east-1:123456789012:certificate/another-api-cert
Description: ARN of the ACM certificate for the domain

VpcEndpointId:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Parameters:

CertificateArn:
Type: String
Default: another-api-arn
Default: arn:aws:acm:us-east-1:123456789012:certificate/another-api-cert
Description: ARN of the ACM certificate for the domain

VpcEndpointId:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Globals:
InstanceRequirements:
Architectures:
- x86_64
KmsKeyArn: some-kms-arn
KmsKeyArn: arn:aws:kms:us-east-1:123456789012:key/some-kms-key

Function:
Runtime: python3.12
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Resources:
StageName: Prod
Domain:
DomainName: api-example.com
CertificateArn: my-api-cert-arn
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/my-api-cert
EndpointConfiguration: EDGE
BasePath: [/get, /fetch]
MutualTlsAuthentication:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Resources:
StageName: Prod
Domain:
DomainName: api-example.com
CertificateArn: my-api-cert-arn
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/my-api-cert
EndpointConfiguration: EDGE
BasePath: [/get, /fetch]
MutualTlsAuthentication:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Parameters:

MyDomainCert:
Type: String
Default: another-api-arn
Default: arn:aws:acm:us-east-1:123456789012:certificate/another-api-cert

Globals:
Api:
Expand Down Expand Up @@ -58,7 +58,7 @@ Resources:
StageName: Prod
Domain:
DomainName: api-example.com
CertificateArn: my-api-cert-arn
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/my-api-cert
EndpointConfiguration: Invalid
BasePath: [/get, /fetch]

Expand All @@ -85,6 +85,6 @@ Resources:
StageName: Prod
Domain:
DomainName: api-example.com
CertificateArn: my-api-cert-arn
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/my-api-cert
BasePath:
- 3 # this should not be a number
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Resources:
StageName: Prod
Domain:
DomainName: api-example.com
CertificateArn: my-api-cert-arn
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/my-api-cert
EndpointConfiguration: EDGE
BasePath: [/get, /fetch]
Route53:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Resources:
StageName: Prod
Domain:
DomainName: api-example.com
CertificateArn: my-api-cert-arn
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/my-api-cert
EndpointConfiguration: EDGE
BasePath: [/get]
Route53: InvalidString
4 changes: 2 additions & 2 deletions tests/translator/input/error_graphqlapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Resources:
key1: value1
key2: value2
Logging:
CloudWatchLogsRoleArn: some-arn
CloudWatchLogsRoleArn: arn:aws:iam::123456789012:role/some-role
FieldLogLevel: ERROR
ExcludeVerboseContent: true
NotSupposedToBeHere: yo
Expand Down Expand Up @@ -137,7 +137,7 @@ Resources:
DynamoDb:
InternalDataSource:
TableName: SomeTable
ServiceRoleArn: SomeRoleArn
ServiceRoleArn: arn:aws:iam::123456789012:role/SomeRole
Functions:
UnknownDataSource:
CodeUri: my-code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.one.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand All @@ -52,7 +52,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.two.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand All @@ -73,7 +73,7 @@ Resources:
HttpMethod: '*'
Domain:
DomainName: admin.three.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Resources:
EphemeralStorage:
Size: 1024
Role: !Sub arn:${AWS::Partition}:iam::${AWS::AccountId}:role/role1
KmsKeyArn: !Sub arn:${AWS::Partition}:key:key
KmsKeyArn: !Sub arn:${AWS::Partition}:kms:us-east-1:123456789012:key/my-key
FileSystemConfigs:
- Arn: !GetAtt AccessPoint.Arn
LocalMountPath: /mnt/EFS
Expand Down Expand Up @@ -73,7 +73,7 @@ Resources:
EphemeralStorage:
Size: 1024
Role: !Sub arn:${AWS::Partition}:iam::${AWS::AccountId}:role/role1
KmsKeyArn: !Sub arn:${AWS::Partition}:key:key
KmsKeyArn: !Sub arn:${AWS::Partition}:kms:us-east-1:123456789012:key/my-key
FileSystemConfigs:
- Arn: !GetAtt AccessPoint.Arn
LocalMountPath: /mnt/EFS
Expand Down
6 changes: 4 additions & 2 deletions tests/translator/input/function_with_kmskeyarn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Resources:
CodeUri: s3://sam-demo-bucket/hello.zip
Handler: hello.handler
Runtime: python2.7
KmsKeyArn: thisIsaKey
KmsKeyArn: arn:aws:kms:us-east-1:123456789012:key/this-is-a-key

FunctionWithReferenceToKeyArn:
Type: AWS::Serverless::Function
Expand All @@ -14,7 +14,9 @@ Resources:
Handler: hello.handler
Runtime: python2.7
KmsKeyArn:
Ref: myKey
Fn::GetAtt:
- myKey
- Arn

myKey:
Type: AWS::KMS::Key
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Resources:
DynamoDb:
MyDataSource:
TableName: some-table
ServiceRoleArn: some-arn
ServiceRoleArn: arn:aws:iam::123456789012:role/some-role
Name: AwesomeDataSourceName
Description: This data source is special to me
Region: na-west-2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Resources:
DynamoDb:
InternalDataSource:
TableName: SomeTable
ServiceRoleArn: SomeRoleArn
ServiceRoleArn: arn:aws:iam::123456789012:role/SomeRole
Functions:
UseInternal:
InlineCode: this is my epic code
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/input/graphqlapi_intrinsical_names.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Resources:
Lambda:
MyDataSource:
FunctionArn: my-lambda-arn
ServiceRoleArn: some-role-arn
ServiceRoleArn: arn:aws:iam::123456789012:role/some-role
Name: !Ref LambdaDSName
DynamoDb:
DDB1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Resources:
Lambda:
MyDataSource:
FunctionArn: blah
ServiceRoleArn: my-lambda-role
ServiceRoleArn: arn:aws:iam::123456789012:role/my-lambda-role
DynamoDb:
MyDataSource:
TableName: some-table
TableArn: big-arn
ServiceRoleArn: my-ddb-role
ServiceRoleArn: arn:aws:iam::123456789012:role/my-ddb-role
2 changes: 1 addition & 1 deletion tests/translator/input/graphqlapi_logging_defined.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Resources:
key1: value1
key2: value2
Logging:
CloudWatchLogsRoleArn: some-arn
CloudWatchLogsRoleArn: arn:aws:iam::123456789012:role/some-role
FieldLogLevel: ERROR
ExcludeVerboseContent: true
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Resources:
Lambda:
MyDataSource:
FunctionArn: my-lambda-arn
ServiceRoleArn: some-role-arn
ServiceRoleArn: arn:aws:iam::123456789012:role/some-role
Name: PradsLambdaDataSource
Description: lambda datasources are nice
Resolvers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Resources:
Properties:
Domain:
DomainName: admin.one.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand All @@ -14,7 +14,7 @@ Resources:
Properties:
Domain:
DomainName: admin.two.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand All @@ -24,7 +24,7 @@ Resources:
Properties:
Domain:
DomainName: admin.three.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
2 changes: 1 addition & 1 deletion tests/translator/input/httpapi_with_propagate_tags.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Resources:
PropagateTags: true
Domain:
DomainName: admin.one.amazon.com
CertificateArn: arn::cert::abc
CertificateArn: arn:aws:acm:us-east-1:123456789012:certificate/abc
EndpointConfiguration: REGIONAL
Route53:
HostedZoneId: abc123456
Expand Down
Loading
Loading