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.

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

chore(ec2): update WindowsVersions enum #29796

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
38b6cd9
chore: add 1.29 EKS versions
nmussy Apr 11, 2024
f21fd86
chore: add missing deprecated tags
nmussy Apr 11, 2024
cc3e573
chore: update deprecated messages
nmussy Apr 11, 2024
dd70f2b
chore: add unit test
nmussy Apr 11, 2024
686d8d3
fix: match version enum keys and values, add test
nmussy Apr 11, 2024
e71e79d
chore: integ
nmussy Apr 11, 2024
def1245
Revert integ.machine-image.js.snapshot deletion
nmussy Apr 11, 2024
3c1503d
Merge remote-tracking branch 'upstream/main' into chore-ec2-windows-v…
nmussy May 7, 2024
c577d39
chore: deps order
nmussy May 7, 2024
aa0eb44
chore: yarn.lock update
nmussy May 7, 2024
827d6ae
Merge remote-tracking branch 'upstream/main' into chore-ec2-windows-v…
nmussy Jun 21, 2024
5df67ff
Merge remote-tracking branch 'upstream/main' into chore-ec2-windows-v…
nmussy Jun 29, 2024
62cda1f
Merge remote-tracking branch 'upstream/main' into chore-ec2-windows-v…
nmussy Jul 4, 2024
984c74f
Merge remote-tracking branch 'upstream/main' into chore-ec2-windows-v…
nmussy Dec 9, 2024
b1f8d93
chore: deprecate additional WINDOWS_SERVER_2016 versions
nmussy Dec 9, 2024
c2c9a09
feat: add WINDOWS_SERVER_2025 versions
nmussy Dec 9, 2024
f39faaf
feat: add EKS optimized 1.30 and 1.31 versions
nmussy Dec 9, 2024
a08b9ab
chore: upgrade jsii deps
nmussy Dec 9, 2024
90b6375
feat: integ enum change detection, update snapshot
nmussy Dec 9, 2024
d1bd145
chore: revert THIRD_PARTY_LICENSES update
nmussy Dec 9, 2024
1e8b376
Merge remote-tracking branch 'upstream/main' into chore-ec2-windows-v…
nmussy Dec 13, 2024
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
4 changes: 3 additions & 1 deletion packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@
"aws-cdk-lib": "0.0.0",
"cdk8s": "2.69.10",
"cdk8s-plus-27": "2.9.5",
"constructs": "^10.0.0"
"constructs": "^10.0.0",
"jsii": "5.7.1",
"jsii-reflect": "1.105.0"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down

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.

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"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.

Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"Resources": {
"InstanceInstanceSecurityGroupF0E2D5BE": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"GroupDescription": "integ-ec2-windows-instance-Windows-Server-2016-English-Core-Base/Instance/InstanceSecurityGroup",
"SecurityGroupEgress": [
{
"CidrIp": "0.0.0.0/0",
"Description": "Allow all outbound traffic by default",
"IpProtocol": "-1"
}
],
"Tags": [
{
"Key": "Name",
"Value": "integ-ec2-windows-instance-Windows-Server-2016-English-Core-Base/Instance"
}
],
"VpcId": {
"Fn::ImportValue": "integ-ec2-windows-vpc:ExportsOutputRefVpc8378EB38272D6E3A"
}
}
},
"InstanceInstanceRoleE9785DE5": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ec2.amazonaws.com"
}
}
],
"Version": "2012-10-17"
},
"Tags": [
{
"Key": "Name",
"Value": "integ-ec2-windows-instance-Windows-Server-2016-English-Core-Base/Instance"
}
]
}
},
"InstanceInstanceProfileAB5AEF02": {
"Type": "AWS::IAM::InstanceProfile",
"Properties": {
"Roles": [
{
"Ref": "InstanceInstanceRoleE9785DE5"
}
]
}
},
"InstanceC1063A87": {
"Type": "AWS::EC2::Instance",
"Properties": {
"AvailabilityZone": "test-region-1a",
"IamInstanceProfile": {
"Ref": "InstanceInstanceProfileAB5AEF02"
},
"ImageId": {
"Ref": "SsmParameterValueawsserviceamiwindowslatestWindowsServer2016EnglishCoreBaseC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"InstanceType": "t3.nano",
"NetworkInterfaces": [
{
"AssociatePublicIpAddress": false,
"DeviceIndex": "0",
"GroupSet": [
{
"Fn::GetAtt": [
"InstanceInstanceSecurityGroupF0E2D5BE",
"GroupId"
]
}
],
"SubnetId": {
"Fn::ImportValue": "integ-ec2-windows-vpc:ExportsOutputRefVpcPublicSubnet1Subnet5C2D37C4FFA2B456"
}
}
],
"Tags": [
{
"Key": "Name",
"Value": "integ-ec2-windows-instance-Windows-Server-2016-English-Core-Base/Instance"
}
],
"UserData": {
"Fn::Base64": "<powershell></powershell>"
}
},
"DependsOn": [
"InstanceInstanceRoleE9785DE5"
]
}
},
"Parameters": {
"SsmParameterValueawsserviceamiwindowslatestWindowsServer2016EnglishCoreBaseC96584B6F00A464EAD1953AFF4B05118Parameter": {
"Type": "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>",
"Default": "/aws/service/ami-windows-latest/Windows_Server-2016-English-Core-Base"
},
"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."
}
]
}
}
}
Loading
Loading