Skip to content

Commit

Permalink
Merge branch 'main' into ec2-key-pair
Browse files Browse the repository at this point in the history
  • Loading branch information
ayush-shah-1501 authored Jan 3, 2024
2 parents fc4090b + 999c01a commit 7800f86
Show file tree
Hide file tree
Showing 146 changed files with 982 additions and 187 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ Shout out to our top contributors!
- [rix0rrr](https://github.com/rix0rrr)
- [skinny85](https://github.com/skinny85)
- [RomainMuller](https://github.com/RomainMuller)
- [njlynch](https://github.com/njlynch)
- [kaizencc](https://github.com/kaizencc)
- [njlynch](https://github.com/njlynch)
- [jogold](https://github.com/jogold)
- [iliapolo](https://github.com/iliapolo)
- [corymhall](https://github.com/corymhall)
- [shivlaks](https://github.com/shivlaks)
- [otaviomacedo](https://github.com/otaviomacedo)
- [madeline-k](https://github.com/madeline-k)
- [NetaNir](https://github.com/NetaNir)
- [mrgrain](https://github.com/mrgrain)
- [NetaNir](https://github.com/NetaNir)
- [comcalvi](https://github.com/comcalvi)
- [robertd](https://github.com/robertd)
- [pahud](https://github.com/pahud)
Expand All @@ -22,11 +22,11 @@ Shout out to our top contributors!
- [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
- [lpizzinidev](https://github.com/lpizzinidev)
- [colifran](https://github.com/colifran)
- [go-to-k](https://github.com/go-to-k)
- [nija-at](https://github.com/nija-at)
- [hoegertn](https://github.com/hoegertn)
- [watany-dev](https://github.com/watany-dev)
- [jumic](https://github.com/jumic)
- [SoManyHs](https://github.com/SoManyHs)


_Last updated: Fri, 01 Dec 23 00:09:47 +0000_
_Last updated: Mon, 01 Jan 24 00:09:50 +0000_
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWS Cloud Development Kit (AWS CDK)
Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/framework-integ/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/framework-integ/NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWS Cloud Development Kit (AWS CDK)
Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"Resources": {
"TaskDefinitionTaskRoleFD40A61D": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ecs-tasks.amazonaws.com"
}
}
],
"Version": "2012-10-17"
}
}
},
"TaskDefinitionB36D86D9": {
"Type": "AWS::ECS::TaskDefinition",
"Properties": {
"ContainerDefinitions": [
{
"Essential": true,
"Image": "amazon/amazon-ecs-sample",
"Interactive": true,
"Name": "Container"
}
],
"Cpu": "256",
"Family": "awsecsintegTaskDefinition11DF163D",
"Memory": "512",
"NetworkMode": "awsvpc",
"RequiresCompatibilities": [
"FARGATE"
],
"TaskRoleArn": {
"Fn::GetAtt": [
"TaskDefinitionTaskRoleFD40A61D",
"Arn"
]
}
}
}
},
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7800f86

Please sign in to comment.