cosalib/aws: add support for windows li image creation

Add command line options to support building aws windows li images.

Author: marmijo

src/cosalib/aws.py

@@ -132,15 +132,44 @@ def aws_run_ore(build, args):
     if 'aws-x86-boot-mode' in image_json:
         ore_args.extend(['--x86-boot-mode', image_json['aws-x86-boot-mode']])
 
+    if args.winli:
+        ore_args.extend(["--winli"])
+        winli_name = "-winli"
+        winli_description = " Windows License Included"
+        buildmeta_key = "aws-winli"
+        buildmeta = build.meta
+        source_snapshot = None
+        for a in buildmeta['amis']:
+            if a['name'] == region:
+                source_snapshot = a['snapshot']
+                break
+
+        if source_snapshot is None:
+            raise Exception(("Unable to find AMI source snapshot for "
+                            f"{region} region"))
+        ore_args.extend(['--source-snapshot', f"{source_snapshot}"])
+    else:
+        ore_args.extend([
+            '--file', f"{build.image_path}",
+            '--disk-size-inspect'
+        ])
+        winli_name = ""
+        winli_description = ""
+        buildmeta_key = "amis"
+
+    if args.windows_ami:
+        ore_args.extend(['--windows-ami', f"{args.windows_ami}"])
+
+    if args.winli_instance_type:
+        ore_args.extend(['--winli-instance-type', f"{args.winli_instance_type}"])
+
     ore_args.extend([
         '--region', f"{region}",
         '--bucket', f"{args.bucket}",
-        '--ami-name', f"{build.build_name}-{build.build_id}-{build.basearch}",
-        '--name', f"{build.build_name}-{build.build_id}-{build.basearch}",
-        '--ami-description', f"{build.summary} {build.build_id} {build.basearch}",
-        '--file', f"{build.image_path}",
+        '--ami-name', f"{build.build_name}{winli_name}-{build.build_id}-{build.basearch}",
+        '--name', f"{build.build_name}{winli_name}-{build.build_id}-{build.basearch}",
+        '--ami-description', f"{build.summary} {build.build_id} {build.basearch}{winli_description}",
         '--arch', f"{build.basearch}",
-        '--disk-size-inspect',
         '--delete-object'
     ])
     for user in args.grant_user:
@@ -157,7 +186,7 @@ def aws_run_ore(build, args):
 
     # This matches the Container Linux schema:
     # https://stable.release.core-os.net/amd64-usr/current/coreos_production_ami_all.json
-    ami_data = build.meta.get("amis", [])
+    ami_data = build.meta.get(buildmeta_key, [])
     # filter out (remove) existing entries (can happen if --force is used) from the
     # ami list that match this region.
     ami_data = [ami for ami in ami_data if ami.get('name') != region]
@@ -172,7 +201,7 @@ def aws_run_ore(build, args):
     if ore_data.get("SnapshotID") is None:
         raise Exception(f"Upload to {args.region} failed: no SnapshotID")
 
-    build.meta['amis'] = ami_data
+    build.meta[buildmeta_key] = ami_data
     build.meta_write()
 
 
@@ -188,4 +217,7 @@ def aws_cli(parser):
     parser.add_argument("--public", action="store_true", help="Mark images as publicly available")
     parser.add_argument("--tags", help="list of key=value tags to attach to the AMI",
                         action='append', default=[])
+    parser.add_argument("--winli", action="store_true", help="create an AWS Windows LI Ami")
+    parser.add_argument("--windows-ami", help="Windows Server AMI ID used to create AWS Windows LI image")
+    parser.add_argument("--winli-instance-type", help="ec2 instance type used to create AWS Windows LI image")
     return parser