-
Notifications
You must be signed in to change notification settings - Fork 122
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
Fixes varios issues with rebuilding CI Docker images #2077
Merged
+134
−70
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
965b3a8
Fix SDE Image Builds because why not
skmcgrail 03cca43
Ok look al2023 ssm agent setup is borked too
skmcgrail 6abbfad
CentOS 7 Docker Image Build is Borked Too
skmcgrail 14e2992
Retrieve cryptofuzz from CloudFront Distribution
skmcgrail 9ff1c6c
Update CDK Dependencies
skmcgrail 856cee3
Fully Automate Windows Docker Image Build
skmcgrail 5303f0a
Merge branch 'main' into rawr-ci
skmcgrail File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,124 @@ | ||
| # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 OR ISC | ||
|
|
||
| from aws_cdk import Stack, Tags, aws_ec2 as ec2, aws_s3 as s3, aws_iam as iam, aws_ssm as ssm | ||
| from aws_cdk import ( | ||
| Stack, | ||
| Tags, | ||
| aws_ec2 as ec2, | ||
| aws_s3 as s3, | ||
| aws_iam as iam, | ||
| aws_ssm as ssm, | ||
| ) | ||
| from constructs import Construct | ||
| from util.iam_policies import ecr_power_user_policy_in_json, s3_read_write_policy_in_json | ||
| from util.metadata import AWS_ACCOUNT, AWS_REGION, WINDOWS_X86_ECR_REPO, S3_BUCKET_NAME, GITHUB_REPO_OWNER, WIN_EC2_TAG_KEY, \ | ||
| WIN_EC2_TAG_VALUE, SSM_DOCUMENT_NAME, GITHUB_SOURCE_VERSION | ||
| from util.iam_policies import ( | ||
| ecr_power_user_policy_in_json, | ||
| s3_read_write_policy_in_json, | ||
| ) | ||
| from util.metadata import ( | ||
| AWS_ACCOUNT, | ||
| AWS_REGION, | ||
| WINDOWS_X86_ECR_REPO, | ||
| S3_BUCKET_NAME, | ||
| GITHUB_REPO_OWNER, | ||
| WIN_EC2_TAG_KEY, | ||
| WIN_EC2_TAG_VALUE, | ||
| SSM_DOCUMENT_NAME, | ||
| GITHUB_SOURCE_VERSION, | ||
| ) | ||
| from util.yml_loader import YmlLoader | ||
|
|
||
|
|
||
| class WindowsDockerImageBuildStack(Stack): | ||
| """Define a temporary stack used to build Windows Docker images. After build, this stack will be destroyed.""" | ||
|
|
||
| def __init__(self, | ||
| scope: Construct, | ||
| id: str, | ||
| **kwargs) -> None: | ||
| def __init__(self, scope: Construct, id: str, **kwargs) -> None: | ||
| super().__init__(scope, id, **kwargs) | ||
|
|
||
| # Define SSM command document. | ||
| ecr_repo = "{}.dkr.ecr.{}.amazonaws.com/{}".format(AWS_ACCOUNT, AWS_REGION, WINDOWS_X86_ECR_REPO) | ||
| placeholder_map = {"ECR_PLACEHOLDER": ecr_repo, "GITHUB_OWNER_PLACEHOLDER": GITHUB_REPO_OWNER, | ||
| "REGION_PLACEHOLDER": AWS_REGION, "GITHUB_SOURCE_VERSION_PLACEHOLDER": GITHUB_SOURCE_VERSION} | ||
| content = YmlLoader.load("./cdk/ssm/windows_docker_build_ssm_document.yaml", placeholder_map) | ||
| ssm.CfnDocument(scope=self, | ||
| id="{}-ssm-document".format(id), | ||
| name=SSM_DOCUMENT_NAME, | ||
| content=content, | ||
| document_type="Command") | ||
| ecr_repo = "{}.dkr.ecr.{}.amazonaws.com/{}".format( | ||
| AWS_ACCOUNT, AWS_REGION, WINDOWS_X86_ECR_REPO | ||
| ) | ||
| placeholder_map = { | ||
| "ECR_PLACEHOLDER": ecr_repo, | ||
| "GITHUB_OWNER_PLACEHOLDER": GITHUB_REPO_OWNER, | ||
| "REGION_PLACEHOLDER": AWS_REGION, | ||
| "GITHUB_SOURCE_VERSION_PLACEHOLDER": GITHUB_SOURCE_VERSION, | ||
| } | ||
| content = YmlLoader.load( | ||
| "./cdk/ssm/windows_docker_build_ssm_document.yaml", placeholder_map | ||
| ) | ||
| ssm.CfnDocument( | ||
| scope=self, | ||
| id="{}-ssm-document".format(id), | ||
| name=SSM_DOCUMENT_NAME, | ||
| content=content, | ||
| document_type="Command", | ||
| ) | ||
|
|
||
| # Define a S3 bucket to store windows docker files and build scripts. | ||
| s3.Bucket(scope=self, | ||
| id="{}-s3".format(id), | ||
| bucket_name=S3_BUCKET_NAME, | ||
| block_public_access=s3.BlockPublicAccess.BLOCK_ALL) | ||
| s3.Bucket( | ||
| scope=self, | ||
| id="{}-s3".format(id), | ||
| bucket_name=S3_BUCKET_NAME, | ||
| block_public_access=s3.BlockPublicAccess.BLOCK_ALL, | ||
| ) | ||
|
|
||
| # Define a role for EC2. | ||
| ecr_power_user_policy = iam.PolicyDocument.from_json(ecr_power_user_policy_in_json([WINDOWS_X86_ECR_REPO])) | ||
| s3_read_write_policy = iam.PolicyDocument.from_json(s3_read_write_policy_in_json(S3_BUCKET_NAME)) | ||
| inline_policies = {"ecr_power_user_policy": ecr_power_user_policy, "s3_read_write_policy": s3_read_write_policy} | ||
| role = iam.Role(scope=self, id="{}-role".format(id), | ||
| assumed_by=iam.ServicePrincipal("ec2.amazonaws.com"), | ||
| inline_policies=inline_policies, | ||
| managed_policies=[ | ||
| iam.ManagedPolicy.from_aws_managed_policy_name("AmazonSSMManagedInstanceCore") | ||
| ]) | ||
| ecr_power_user_policy = iam.PolicyDocument.from_json( | ||
| ecr_power_user_policy_in_json([WINDOWS_X86_ECR_REPO]) | ||
| ) | ||
| s3_read_write_policy = iam.PolicyDocument.from_json( | ||
| s3_read_write_policy_in_json(S3_BUCKET_NAME) | ||
| ) | ||
| inline_policies = { | ||
| "ecr_power_user_policy": ecr_power_user_policy, | ||
| "s3_read_write_policy": s3_read_write_policy, | ||
| } | ||
| role = iam.Role( | ||
| scope=self, | ||
| id="{}-role".format(id), | ||
| assumed_by=iam.ServicePrincipal("ec2.amazonaws.com"), | ||
| inline_policies=inline_policies, | ||
| managed_policies=[ | ||
| iam.ManagedPolicy.from_aws_managed_policy_name( | ||
| "AmazonSSMManagedInstanceCore" | ||
| ) | ||
| ], | ||
| ) | ||
|
|
||
| # Define Windows EC2 instance, where the SSM document will be executed. | ||
| # TODO: This AMI does not have docker installed by default anymore. Find another Windows machine | ||
| # that has docker by default or update the ssm document to properly install docker. | ||
| machine_image = ec2.MachineImage.latest_windows( | ||
| ec2.WindowsVersion.WINDOWS_SERVER_2019_ENGLISH_FULL_BASE) | ||
| ec2.WindowsVersion.WINDOWS_SERVER_2019_ENGLISH_FULL_BASE | ||
| ) | ||
| vpc = ec2.Vpc(scope=self, id="{}-vpc".format(id)) | ||
| block_device_volume = ec2.BlockDeviceVolume.ebs(volume_size=200, delete_on_termination=True) | ||
| block_device = ec2.BlockDevice(device_name="/dev/sda1", volume=block_device_volume) | ||
| instance = ec2.Instance(scope=self, | ||
| id="{}-instance".format(id), | ||
| instance_type=ec2.InstanceType(instance_type_identifier="m5d.xlarge"), | ||
| vpc=vpc, | ||
| role=role, | ||
| block_devices=[block_device], | ||
| vpc_subnets=ec2.SubnetSelection(subnet_type=ec2.SubnetType.PUBLIC), | ||
| machine_image=machine_image) | ||
| block_device_volume = ec2.BlockDeviceVolume.ebs( | ||
| volume_size=200, delete_on_termination=True | ||
| ) | ||
| block_device = ec2.BlockDevice( | ||
| device_name="/dev/sda1", volume=block_device_volume | ||
| ) | ||
|
|
||
| setup_user_data = ec2.UserData.for_windows() | ||
| setup_user_data.add_commands( | ||
| "Install-WindowsFeature -Name Containers -IncludeAllSubFeature -IncludeManagementTools", | ||
| "Set-ExecutionPolicy Bypass -Scope Process -Force; [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; $env:chocolateyUseWindowsCompression = 'true'; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) | Out-Null", | ||
| "choco install docker-cli -y", | ||
| "choco install docker-engine -y", | ||
| "choco install git --version 2.23.0 -y", | ||
| "Set-Service -Name docker -StartupType Automatic", | ||
| "Restart-Computer -Force", | ||
| ) | ||
|
|
||
| instance = ec2.Instance( | ||
| scope=self, | ||
| id="{}-instance".format(id), | ||
| instance_type=ec2.InstanceType(instance_type_identifier="m5d.xlarge"), | ||
| vpc=vpc, | ||
| role=role, | ||
| block_devices=[block_device], | ||
| vpc_subnets=ec2.SubnetSelection(subnet_type=ec2.SubnetType.PUBLIC), | ||
| machine_image=machine_image, | ||
| user_data=setup_user_data, | ||
| ) | ||
|
|
||
| Tags.of(instance).add(WIN_EC2_TAG_KEY, WIN_EC2_TAG_VALUE) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are there any gotchas or things to know about "user data"? This seems like something really useful I could steal for the ec2 test framework.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe the biggest gotcha is that the script are only ran on the first instance launch. So if you stop the instance, update the data, and start the instance again they won't automatically run. https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html has more details.