mantle/aws: rework AWS Windows LI image creation #4237

marmijo · 2025-07-22T21:08:36Z

partially revert and rework d3688be, 0791319, a1f8d97. and 1834b07.

Rework the aws-winli creation logic to use aws ec2 register-image --billing-product to create the AMI with the Windows License Included billing code metadata. This simplifies the creation logic and removes the need for swapping the root volume of an instance. Instead, add a an ore argument --billing-product-code to set the billing product code during image creation. Setting billing product codes is limited to approved AWS accounts, so this will only be used to create the RHCOS aws-winli image.

See: #4069

To build an aws-winli AMI, run the following command:

cosa imageupload-aws --upload \
    --winli \
    --winli-billing-product ${winli_billing_product} \
    --region ${region} \
    --arch=x86_64 \
    --credentials-file ${aws_config_file}

gemini-code-assist

Code Review

This pull request simplifies the AWS Windows LI image creation process by using the register-image API with the BillingProducts parameter. The changes remove code and potential points of failure. There is one critical correctness issue and one medium-severity usability issue in the command-line argument validation that should be addressed.

mantle/cmd/ore/aws/upload.go

marmijo · 2025-07-22T21:16:21Z

This should be ready for review, but I'm keeping this in draft until our account is approved and I can confirm this builds the image correctly.

dustymabe

The easiest way I found to review this was to diff with the code from before we added winli support to begin with:

git difftool d3688be^ mantle/cmd/ore/aws/upload.go mantle/platform/api/aws/ mantle/platform/machine/aws/ src/cosalib/aws.py

One simplification I noticed while reviewing I opened a PR for in #4243

dustymabe · 2025-07-30T14:48:05Z

mantle/platform/api/aws/network.go

@@ -57,15 +57,9 @@ func (a *API) createSecurityGroup(name string) (string, error) {
 		return "", err
 	}



delete line 59 (if you want zero diff between this file here and 1739f0b)

mantle/cmd/ore/aws/upload.go

dustymabe

Looking good!

src/cosalib/aws.py

dustymabe · 2025-08-04T16:20:05Z

src/cosalib/aws.py

+    if args.winli_billing_product:
+        ore_args.extend(['--billing-product-code', f"{args.winli_billing_product}"])


I'm feeling a bit like we should include this in the if args.winli branch above and also assert args.winli_billing_product. i.e. it's invalid to specify winli but not provide a billing code, correct?

That's a good point, yes that would be invalid. I'll make that change.

dustymabe · 2025-08-08T20:13:30Z

src/cosalib/aws.py

-
-    if args.winli_instance_type:
-        ore_args.extend(['--winli-instance-type', f"{args.winli_instance_type}"])
+    if args.winli_billing_product:


src/cosalib/aws.py

dustymabe · 2025-08-08T21:41:44Z

mantle/cmd/ore/aws/upload.go

+	// The Windows License Included (winli) image is built using a source snapshot, but the disk size is not known.
+	// Allow setting uploadDIskSIzeInspect when using a source snapshot to discover the size of the disk from the
+	// aws upload file that was used to create the snapshot.


hmm. I'm not the biggest fan of this change.

Why not just query to get the size of the source snapshot?

i.e. we can pass a blank value for uploadDiskSizeGiB to API.CreateHVMImage if we're providing sourceSnapshot and have CreateHVMImage figure it out (if it's even required in the first place).

uploadDiskSizeGiB is never blank. I suppose we could change the default to 16, or we could query the source snapshot.

I wound up querying directly in upload.go in the latest push. I'll squash the commits before merging.

dustymabe

Nice work! LGTM

partially revert and rework d3688be, 0791319, a1f8d97. and 1834b07. Rework the aws-winli creation logic to use `aws ec2 register-image --billing-product` to create the AMI with the Windows License Included billing code metadata. This simplifies the creation logic and removes the need for swapping the root volume of an instance. Instead, add an ore argument `--billing-product-code` to set the billing product code during image creation. Setting billing product codes is limited to approved AWS accounts, so this will only be used to create the RHCOS aws-winli image. Also add `FindSnapshotDiskSizeGiB` to retrieve the volume size for a given snapshot ID, to be used when a snapshot is provided for AMI creation.

The Windows License Included (winli) AMI creation logic was reworked in coreos assembler [1] to append the winli billing code to an already-created RHCOS AMI, instead of creating an AMI based on a modified Windows instance. Update the winli build closure to use the new imageupload-aws option. We no longer need to discover and use the latest windows server 2022 AMI ID. [1]: coreos/coreos-assembler#4237

marmijo marked this pull request as draft July 22, 2025 21:08

openshift-ci bot added the do-not-merge/work-in-progress label Jul 22, 2025

gemini-code-assist bot reviewed Jul 22, 2025

View reviewed changes

mantle/cmd/ore/aws/upload.go Outdated Show resolved Hide resolved

mantle/cmd/ore/aws/upload.go Outdated Show resolved Hide resolved

marmijo force-pushed the rework-aws-winli branch from 8558322 to 04de405 Compare July 22, 2025 21:13

dustymabe reviewed Jul 30, 2025

View reviewed changes

marmijo force-pushed the rework-aws-winli branch 4 times, most recently from 0c2726a to 7fe6ca8 Compare August 1, 2025 22:36

dustymabe reviewed Aug 4, 2025

View reviewed changes

marmijo force-pushed the rework-aws-winli branch from 7fe6ca8 to 2ed666f Compare August 8, 2025 18:51

dustymabe reviewed Aug 8, 2025

View reviewed changes

marmijo force-pushed the rework-aws-winli branch from 2ed666f to 4bc0380 Compare August 8, 2025 21:31

dustymabe reviewed Aug 8, 2025

View reviewed changes

marmijo force-pushed the rework-aws-winli branch from 4bc0380 to c8b819a Compare August 8, 2025 23:14

dustymabe approved these changes Aug 9, 2025

View reviewed changes

marmijo marked this pull request as ready for review August 9, 2025 03:08

openshift-ci bot removed the do-not-merge/work-in-progress label Aug 9, 2025

marmijo force-pushed the rework-aws-winli branch from c8b819a to 3ca8be9 Compare August 11, 2025 04:07

marmijo merged commit 9394939 into coreos:main Aug 11, 2025
6 checks passed

		@@ -57,15 +57,9 @@ func (a *API) createSecurityGroup(name string) (string, error) {
		return "", err
		}

		if args.winli_billing_product:
		ore_args.extend(['--billing-product-code', f"{args.winli_billing_product}"])

mantle/aws: rework AWS Windows LI image creation #4237

mantle/aws: rework AWS Windows LI image creation #4237

Uh oh!

Conversation

marmijo commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

marmijo commented Jul 22, 2025

Uh oh!

dustymabe left a comment

Choose a reason for hiding this comment

Uh oh!

dustymabe Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dustymabe left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dustymabe Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marmijo Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

dustymabe Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dustymabe Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

dustymabe Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

marmijo Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

marmijo Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

dustymabe Aug 9, 2025

Choose a reason for hiding this comment

Uh oh!

dustymabe left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

marmijo commented Jul 22, 2025 •

edited

Loading

dustymabe Jul 30, 2025 •

edited

Loading

dustymabe Aug 4, 2025 •

edited

Loading