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 #29435

Merged
merged 4 commits into from
Mar 27, 2024

Conversation

nmussy
Copy link
Contributor

@nmussy nmussy commented Mar 11, 2024

Issue # (if applicable)

Could not find any in the backlog

Reason for this change

Update the CDK EC2 listed Windows versions to match the current availability

Description of changes

  • Added new Windows images
  • Marked as deprecated old Windows images

Description of how you validated changes

Once again, I'm comparing the CDK enumeration to live SDK data, this time using the ec2:DescribeImages API command, with the following parameters:

{
	Owners: ["amazon"],
	Filters: [{ Name: "name", Values: ["Windows_Server*"] }],
}

Images that are no longer listed by this command are marked as @deprecated, and new images are added to the enum

Checklist


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@aws-cdk-automation aws-cdk-automation requested a review from a team March 11, 2024 10:39
@github-actions github-actions bot added p2 distinguished-contributor [Pilot] contributed 50+ PRs to the CDK labels Mar 11, 2024
@nmussy
Copy link
Contributor Author

nmussy commented Mar 11, 2024

I'd accidentally removed some of the previous enum values, I restored them and made sure I didn't miss any:

$ git checkout chore-ec2-windows-versions
$ grep -i '^  WINDOWS' lib/windows-versions.ts | sort > new_versions
$ git checkout main
$ grep -i '^  WINDOWS' lib/windows-versions.ts | sort > old_versions
$ diff old_versions new_versions | grep -i '^<'

@@ -912,7 +912,7 @@ export enum WindowsVersion {
WINDOWS_SERVER_2019_ENGLISH_CORE_BASE_2023_12_13 = 'Windows_Server-2019-English-Core-Base-2023.12.13',
WINDOWS_SERVER_2019_ENGLISH_CORE_BASE_2024_01_16 = 'Windows_Server-2019-English-Core-Base-2024.01.16',
WINDOWS_SERVER_2019_ENGLISH_CORE_BASE_2024_02_14 = 'Windows_Server-2019-English-Core-Base-2024.02.14',
/** @deprecated */
/** @deprecated - no longer supported */
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why or when Windows_Server-2019-English-Core-ContainersLatest and Windows_Server-2019-English-Full-ContainersLatest were removed, see Windows AMI version history, but they are unavaialble:

$ aws ec2 describe-images --owners amazon --filters 'Name=name,Values=Windows_Server-2019-English-Core-ContainersLatest'
{
    "Images": []
}
$ aws ec2 describe-images --owners amazon --filters 'Name=name,Values=Windows_Server-2019-English-Full-ContainersLatest'
{
    "Images": []
}

@@ -932,7 +932,7 @@ export enum WindowsVersion {
WINDOWS_SERVER_2019_ENGLISH_FULL_BASE_2023_12_13 = 'Windows_Server-2019-English-Full-Base-2023.12.13',
WINDOWS_SERVER_2019_ENGLISH_FULL_BASE_2024_01_16 = 'Windows_Server-2019-English-Full-Base-2024.01.16',
WINDOWS_SERVER_2019_ENGLISH_FULL_BASE_2024_02_14 = 'Windows_Server-2019-English-Full-Base-2024.02.14',
/** @deprecated */
/** @deprecated - no longer supported */
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Mar 11, 2024
@msambol
Copy link
Contributor

msambol commented Mar 12, 2024

What Region did you use? us-east-1? Could there be any differences by Region?

@nmussy
Copy link
Contributor Author

nmussy commented Mar 12, 2024

@msambol Yes, I'm using us-east-1, and I'm not seeing any differences between regions. I assume the AWS Windows images are deployed globally

Copy link
Contributor

@TheRealAmazonKendra TheRealAmazonKendra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is... so many. Thanks for taking the time to get these added!

Copy link
Contributor

mergify bot commented Mar 27, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation aws-cdk-automation removed the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Mar 27, 2024
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 9a4dac6
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit b54f959 into aws:main Mar 27, 2024
12 checks passed
Copy link
Contributor

mergify bot commented Mar 27, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@scanlonp
Copy link
Contributor

scanlonp commented Apr 5, 2024

Hey @nmussy, we got this issue reported #29737. It looks like the new enum versions do not play well with certain ways to define the Windows image. Going to revert this for now.

@nmussy nmussy mentioned this pull request Apr 5, 2024
1 task
mergify bot pushed a commit that referenced this pull request Apr 9, 2024
scanlonp added a commit that referenced this pull request Apr 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
distinguished-contributor [Pilot] contributed 50+ PRs to the CDK p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants